cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject [3/4] cxf git commit: Review comments incorporated
Date Tue, 19 May 2015 16:26:49 GMT
Review comments incorporated

1) organization removed
2) proper parent inherited and added as needed in pom.xml


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4bdbdf6c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4bdbdf6c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4bdbdf6c

Branch: refs/heads/master
Commit: 4bdbdf6cd2f15560a950aa6f1aebc8aa8f78ac2c
Parents: a3347f0
Author: elans3 <elans3.java@gmail.com>
Authored: Tue May 19 10:15:12 2015 -0500
Committer: elans3 <elans3.java@gmail.com>
Committed: Tue May 19 10:15:12 2015 -0500

----------------------------------------------------------------------
 .../release/samples/jaxws_spring_boot/pom.xml   | 25 +++++++++-----------
 .../java/sample/ws/service/HelloPortImpl.java   | 17 ++++++++++++-
 .../ws/service/SampleWsApplicationTests.java    |  2 +-
 3 files changed, 28 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/4bdbdf6c/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
index b6e2193..1526af7 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -1,27 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<!-- Your own application should inherit from spring-boot-starter-parent -->
-		<artifactId>spring-boot-samples</artifactId>
+	 <parent>
 		<groupId>org.springframework.boot</groupId>
-		<version>1.3.0.BUILD-SNAPSHOT</version>
-	</parent>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>1.2.3.RELEASE</version>
+	</parent> 
 	<artifactId>spring-boot-sample-ws-cxf</artifactId>
 	<name>Spring Boot CXF Web Services Sample</name>
 	<description>Spring Boot CXF Web Services Sample</description>
-	<url>http://projects.spring.io/spring-boot/</url>
-	<organization>
-		<name>Elan Thangamani</name>
-		<url>NA</url>
-	</organization>
-	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
-	</properties>
+	<groupId>org.apache.cxf.spring.boot</groupId>
+	<version>1.0.0</version>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
+			<version>1.2.3.RELEASE</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -39,22 +33,25 @@
 			<artifactId>jetty-webapp</artifactId>
 			<version>9.3.0.M2</version>
 		</dependency>
-		
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-ws</artifactId>
+			<version>1.2.3.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>jaxen</groupId>
 			<artifactId>jaxen</artifactId>
+			<version>1.1.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jdom</groupId>
 			<artifactId>jdom2</artifactId>
+			<version>2.0.6</version>
 		</dependency>
 		<dependency>
 			<groupId>wsdl4j</groupId>
 			<artifactId>wsdl4j</artifactId>
+			<version>1.6.3</version>
 		</dependency>
 	</dependencies>
 	<build>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4bdbdf6c/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
index cdea783..e721698 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2012-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package sample.ws.service;
 
 import java.util.logging.Logger;
@@ -27,7 +42,7 @@ public class HelloPortImpl implements Hello {
 	public java.lang.String sayHello(java.lang.String myname) {
 		LOG.info("Executing operation sayHello" + myname);
 		try {
-			return "Welcome to CXF Spring boot " + myname + "!!!";
+			return "Hello, Welcome to CXF Spring boot " + myname + "!!!";
 
 		} catch (java.lang.Exception ex) {
 			ex.printStackTrace();

http://git-wip-us.apache.org/repos/asf/cxf/blob/4bdbdf6c/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTests.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTests.java
b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTests.java
index acb058a..6e195b5 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTests.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTests.java
@@ -67,7 +67,7 @@ public class SampleWsApplicationTests {
 		StreamResult result = new StreamResult(System.out);
 
 		this.webServiceTemplate.sendSourceAndReceiveToResult(source, result);
-		assertThat(this.output.toString(), containsString("<?xml version=\"1.0\" encoding=\"UTF-8\"?><ns2:sayHelloResponse
xmlns:ns2=\"http://service.ws.sample/\"><return>Welcome to CXF Spring boot Elan!!!</return></ns2:sayHelloResponse>"));
+		assertThat(this.output.toString(), containsString("<?xml version=\"1.0\" encoding=\"UTF-8\"?><ns2:sayHelloResponse
xmlns:ns2=\"http://service.ws.sample/\"><return>Hello, Welcome to CXF Spring boot
Elan!!!</return></ns2:sayHelloResponse>"));
 	}
 
 }


Mime
View raw message