From 32f0e2ed5d417ce6fe2c664737aacd9d1e067909 Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Sun, 24 Jul 2016 18:37:52 +0300
Subject: [PATCH] minor cleanup work

---
 apache-cxf/cxf-spring/pom.xml                 | 175 +++++++++---------
 .../com/baeldung/cxf/spring/Baeldung.java     |   1 +
 .../cxf/spring/ClientConfiguration.java       |   2 +-
 .../cxf/spring/ServiceConfiguration.java      |   2 +-
 .../com/baeldung/cxf/spring/StudentTest.java  |   2 +-
 5 files changed, 95 insertions(+), 87 deletions(-)

diff --git a/apache-cxf/cxf-spring/pom.xml b/apache-cxf/cxf-spring/pom.xml
index aa72edb739..b9dbda7c11 100644
--- a/apache-cxf/cxf-spring/pom.xml
+++ b/apache-cxf/cxf-spring/pom.xml
@@ -8,90 +8,7 @@
         <artifactId>apache-cxf</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <properties>
-        <cxf.version>3.1.6</cxf.version>
-        <spring.version>4.3.1.RELEASE</spring.version>
-        <surefire.version>2.19.1</surefire.version>
-    </properties>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
-                <configuration>
-                    <excludes>
-                        <exclude>StudentTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>integration</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.cargo</groupId>
-                        <artifactId>cargo-maven2-plugin</artifactId>
-                        <version>1.5.0</version>
-                        <configuration>
-                            <container>
-                                <containerId>jetty9x</containerId>
-                                <type>embedded</type>
-                            </container>
-                            <configuration>
-                                <properties>
-                                    <cargo.hostname>localhost</cargo.hostname>
-                                    <cargo.servlet.port>8080</cargo.servlet.port>
-                                </properties>
-                            </configuration>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>start-server</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>start</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>stop-server</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>stop</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${surefire.version}</version>
-                        <executions>
-                            <execution>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>none</exclude>
-                                    </excludes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -119,4 +36,94 @@
             <version>3.1.0</version>
         </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.version}</version>
+                <configuration>
+                    <excludes>
+                        <exclude>StudentTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <profiles>
+        <profile>
+            <id>integration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven2-plugin</artifactId>
+                        <version>1.5.0</version>
+                        <configuration>
+                            <container>
+                                <containerId>jetty9x</containerId>
+                                <type>embedded</type>
+                            </container>
+                            <configuration>
+                                <properties>
+                                    <cargo.hostname>localhost</cargo.hostname>
+                                    <cargo.servlet.port>8081</cargo.servlet.port>
+                                </properties>
+                            </configuration>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>start-server</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>stop-server</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${surefire.version}</version>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>none</exclude>
+                                    </excludes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
+    </profiles>
+    
+    <properties>
+        <cxf.version>3.1.6</cxf.version>
+        <spring.version>4.3.1.RELEASE</spring.version>
+        <surefire.version>2.19.1</surefire.version>
+    </properties>
+    
 </project>
diff --git a/apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/Baeldung.java b/apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/Baeldung.java
index 4f880e6ada..b66e4c2fbf 100644
--- a/apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/Baeldung.java
+++ b/apache-cxf/cxf-spring/src/main/java/com/baeldung/cxf/spring/Baeldung.java
@@ -5,5 +5,6 @@ import javax.jws.WebService;
 @WebService
 public interface Baeldung {
     String hello(String name);
+
     String register(Student student);
 }
\ 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
index a2f124705b..021bcc6f66 100644
--- 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
@@ -15,7 +15,7 @@ public class ClientConfiguration {
     public JaxWsProxyFactoryBean proxyFactoryBean() {
         JaxWsProxyFactoryBean proxyFactory = new JaxWsProxyFactoryBean();
         proxyFactory.setServiceClass(Baeldung.class);
-        proxyFactory.setAddress("http://localhost:8080/services/baeldung");
+        proxyFactory.setAddress("http://localhost:8081/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
index f1fac579ab..0bc60fb790 100644
--- 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
@@ -18,7 +18,7 @@ public class ServiceConfiguration {
     @Bean
     public Endpoint endpoint() {
         EndpointImpl endpoint = new EndpointImpl(springBus(), new BaeldungImpl());
-        endpoint.publish("http://localhost:8080/services/baeldung");
+        endpoint.publish("http://localhost:8081/services/baeldung");
         return endpoint;
     }
 }
\ No newline at end of file
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 794275b4d6..7466944e04 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
@@ -22,7 +22,7 @@ public class StudentTest {
         Student student2 = new Student("Eve");
         String student1Response = baeldungProxy.register(student1);
         String student2Response = baeldungProxy.register(student2);
-        
+
         assertEquals("Adam is registered student number 1", student1Response);
         assertEquals("Eve is registered student number 2", student2Response);
     }