From 9c7debefa4fdcdb9daa6cd8e32c4123c5b2d780a Mon Sep 17 00:00:00 2001
From: Thai Nguyen <namthainguyen@gmail.com>
Date: Tue, 19 Jul 2016 14:25:36 +0700
Subject: [PATCH] Changes configuration from XML to Java for the cxf-spring
 module

---
 apache-cxf/cxf-spring/.gitignore              |  1 +
 apache-cxf/cxf-spring/pom.xml                 |  9 ++++++--
 .../baeldung/cxf/spring/AppInitializer.java   | 21 +++++++++++++++++
 .../cxf/spring/ClientConfiguration.java       | 21 +++++++++++++++++
 .../cxf/spring/ServiceConfiguration.java      | 23 +++++++++++++++++++
 .../src/main/resources/client-beans.xml       | 10 --------
 .../src/main/webapp/WEB-INF/cxf-servlet.xml   |  7 ------
 .../src/main/webapp/WEB-INF/web.xml           | 14 -----------
 .../com/baeldung/cxf/spring/StudentTest.java  | 11 ++++-----
 9 files changed, 77 insertions(+), 40 deletions(-)
 create mode 100644 apache-cxf/cxf-spring/.gitignore
 create mode 100644 apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/AppInitializer.java
 create mode 100644 apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/ClientConfiguration.java
 create mode 100644 apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/ServiceConfiguration.java
 delete mode 100644 apache-cxf/cxf-spring/src/main/resources/client-beans.xml
 delete mode 100644 apache-cxf/cxf-spring/src/main/webapp/WEB-INF/cxf-servlet.xml
 delete mode 100644 apache-cxf/cxf-spring/src/main/webapp/WEB-INF/web.xml

diff --git a/apache-cxf/cxf-spring/.gitignore b/apache-cxf/cxf-spring/.gitignore
new file mode 100644
index 0000000000..2f7896d1d1
--- /dev/null
+++ b/apache-cxf/cxf-spring/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/apache-cxf/cxf-spring/pom.xml b/apache-cxf/cxf-spring/pom.xml
index 431c35c51d..aa72edb739 100644
--- a/apache-cxf/cxf-spring/pom.xml
+++ b/apache-cxf/cxf-spring/pom.xml
@@ -19,7 +19,7 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.6</version>
                 <configuration>
-                    <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>
             <plugin>
@@ -110,8 +110,13 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <artifactId>spring-webmvc</artifactId>
             <version>${spring.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/AppInitializer.java b/apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/AppInitializer.java
new file mode 100644
index 0000000000..036bf66a52
--- /dev/null
+++ b/apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/AppInitializer.java
@@ -0,0 +1,21 @@
+package com.baeldung.cxf.spring;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRegistration;
+
+import org.apache.cxf.transport.servlet.CXFServlet;
+import org.springframework.web.WebApplicationInitializer;
+import org.springframework.web.context.ContextLoaderListener;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+
+public class AppInitializer implements WebApplicationInitializer {
+    @Override
+    public void onStartup(ServletContext container) {
+        AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
+        context.register(ServiceConfiguration.class);
+        container.addListener(new ContextLoaderListener(context));
+
+        ServletRegistration.Dynamic dispatcher = container.addServlet("dispatcher", new CXFServlet());
+        dispatcher.addMapping("/services");
+    }
+}
\ No newline at end of file
diff --git a/apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/ClientConfiguration.java b/apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/ClientConfiguration.java
new file mode 100644
index 0000000000..a2f124705b
--- /dev/null
+++ b/apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/ClientConfiguration.java
@@ -0,0 +1,21 @@
+package com.baeldung.cxf.spring;
+
+import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ClientConfiguration {
+    @Bean(name = "client")
+    public Object generateProxy() {
+        return proxyFactoryBean().create();
+    }
+
+    @Bean
+    public JaxWsProxyFactoryBean proxyFactoryBean() {
+        JaxWsProxyFactoryBean proxyFactory = new JaxWsProxyFactoryBean();
+        proxyFactory.setServiceClass(Baeldung.class);
+        proxyFactory.setAddress("http://localhost:8080/services/baeldung");
+        return proxyFactory;
+    }
+}
\ No newline at end of file
diff --git a/apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/ServiceConfiguration.java b/apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/ServiceConfiguration.java
new file mode 100644
index 0000000000..0d150532bf
--- /dev/null
+++ b/apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/ServiceConfiguration.java
@@ -0,0 +1,23 @@
+package com.baeldung.cxf.spring;
+
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.bus.spring.SpringBus;
+import org.apache.cxf.jaxws.EndpointImpl;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ServiceConfiguration {
+    @Bean
+    public SpringBus springBus() {
+        return new SpringBus();
+    }    
+
+    @Bean
+    public Endpoint endpoint() {
+        EndpointImpl endpoint = new EndpointImpl(springBus(), new BaeldungImpl());
+        endpoint.publish("http://localhost:8080/services/baeldung");
+        return endpoint;
+    }
+}
\ No newline at end of file
diff --git a/apache-cxf/cxf-spring/src/main/resources/client-beans.xml b/apache-cxf/cxf-spring/src/main/resources/client-beans.xml
deleted file mode 100644
index 626252b565..0000000000
--- a/apache-cxf/cxf-spring/src/main/resources/client-beans.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd">
-    <bean id="client" factory-bean="clientFactory" factory-method="create" />
-    <bean id="clientFactory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean">
-        <property name="serviceClass" value="com.baeldung.cxf.spring.Baeldung" />
-        <property name="address" value="http://localhost:8080/services/baeldung" />
-    </bean>
-</beans>
diff --git a/apache-cxf/cxf-spring/src/main/webapp/WEB-INF/cxf-servlet.xml b/apache-cxf/cxf-spring/src/main/webapp/WEB-INF/cxf-servlet.xml
deleted file mode 100644
index 9fe87ba9ee..0000000000
--- a/apache-cxf/cxf-spring/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
-    xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
-    <jaxws:endpoint id="baeldung"
-        implementor="com.baeldung.cxf.spring.BaeldungImpl" address="http://localhost:8080/services/baeldung" />
-</beans>
diff --git a/apache-cxf/cxf-spring/src/main/webapp/WEB-INF/web.xml b/apache-cxf/cxf-spring/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 43a03b1d8b..0000000000
--- a/apache-cxf/cxf-spring/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    version="3.0"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-    <servlet>
-        <servlet-name>cxf</servlet-name>
-        <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>cxf</servlet-name>
-        <url-pattern>/services/*</url-pattern>
-    </servlet-mapping>
-</web-app>
diff --git a/apache-cxf/cxf-spring/src/test/java/com/baeldung/cxf/spring/StudentTest.java b/apache-cxf/cxf-spring/src/test/java/com/baeldung/cxf/spring/StudentTest.java
index 44a9d11687..794275b4d6 100644
--- a/apache-cxf/cxf-spring/src/test/java/com/baeldung/cxf/spring/StudentTest.java
+++ b/apache-cxf/cxf-spring/src/test/java/com/baeldung/cxf/spring/StudentTest.java
@@ -3,15 +3,12 @@ package com.baeldung.cxf.spring;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 public class StudentTest {
-    private ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] { "client-beans.xml" });
-    private Baeldung baeldungProxy;
-
-    {
-        baeldungProxy = (Baeldung) context.getBean("client");
-    }
+    private ApplicationContext context = new AnnotationConfigApplicationContext(ClientConfiguration.class);
+    private Baeldung baeldungProxy = (Baeldung) context.getBean("client");
 
     @Test
     public void whenUsingHelloMethod_thenCorrect() {