Return-Path: <commits-return-42190-archive-asf-public=cust-asf.ponee.io@cxf.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 025E8200B16
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Sun,  5 Jun 2016 19:02:32 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 00C56160A54; Sun,  5 Jun 2016 17:02:32 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 35ADB160A25
	for <archive-asf-public@cust-asf.ponee.io>; Sun,  5 Jun 2016 19:02:31 +0200 (CEST)
Received: (qmail 34101 invoked by uid 500); 5 Jun 2016 17:02:30 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 33344 invoked by uid 99); 5 Jun 2016 17:02:29 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Jun 2016 17:02:29 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 68C56EAD95; Sun,  5 Jun 2016 17:02:29 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: reta@apache.org
To: commits@cxf.apache.org
Date: Sun, 05 Jun 2016 17:02:45 -0000
Message-Id: <c2c3c6bf502e4a59b9a279e52b0db4f0@git.apache.org>
In-Reply-To: <50464dff9b544aab852bc693aca799a2@git.apache.org>
References: <50464dff9b544aab852bc693aca799a2@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [17/33] cxf git commit: [CXF-6869] Updating SpringBoot jaxws demo
archived-at: Sun, 05 Jun 2016 17:02:32 -0000

[CXF-6869] Updating SpringBoot jaxws demo


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 4837a6cb5ea319f6bf87aaf3bf49c1e4e99e45a7
Parents: 8fbf094
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Thu Jun 2 13:17:24 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Thu Jun 2 13:17:24 2016 +0100

----------------------------------------------------------------------
 .../release/samples/jaxws_spring_boot/pom.xml   | 40 ++++----------------
 .../main/java/sample/ws/WebServiceConfig.java   | 30 +++------------
 .../src/main/resources/application.properties   |  1 +
 3 files changed, 14 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/4837a6cb/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 cdf3181..57e4210 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -4,13 +4,11 @@
      <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.2.3.RELEASE</version>
+        <version>1.3.5.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>
-    <groupId>org.apache.cxf.spring.boot</groupId>
-    <version>1.0.0</version>
     <properties>
         <cxf.version>3.2.0-SNAPSHOT</cxf.version>
     </properties> 
@@ -18,43 +16,19 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>1.2.3.RELEASE</version>
+            <version>1.3.5.RELEASE</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-                <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <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>
+            <version>1.3.5.RELEASE</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-            <version>1.6.3</version>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
+            <version>${cxf.version}</version>
         </dependency>
     </dependencies>
     <build>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4837a6cb/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/WebServiceConfig.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/WebServiceConfig.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/WebServiceConfig.java
index 3f4c629..bbabb25 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/WebServiceConfig.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/WebServiceConfig.java
@@ -19,41 +19,23 @@
 package sample.ws;
 
 import javax.xml.ws.Endpoint;
-import org.apache.cxf.bus.spring.SpringBus;
+import org.apache.cxf.Bus;
 import org.apache.cxf.jaxws.EndpointImpl;
-import org.apache.cxf.transport.servlet.CXFServlet;
 
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.ws.config.annotation.EnableWs;
-import org.springframework.ws.config.annotation.WsConfigurerAdapter;
-import sample.ws.service.Hello;
 import sample.ws.service.HelloPortImpl;
 
-@EnableWs
 @Configuration
-public class WebServiceConfig extends WsConfigurerAdapter {
+public class WebServiceConfig {
 
-    @Bean
-    public ServletRegistrationBean dispatcherServlet() {
-        CXFServlet cxfServlet = new CXFServlet();
-        return new ServletRegistrationBean(cxfServlet, "/Service/*");
-    }
-
-    @Bean(name = "cxf")
-    public SpringBus springBus() {
-        return new SpringBus();
-    }
-
-    @Bean
-    public Hello myService() {
-        return new HelloPortImpl();
-    }
+    @Autowired
+    private Bus bus;
 
     @Bean
     public Endpoint endpoint() {
-        EndpointImpl endpoint = new EndpointImpl(springBus(), myService());
+        EndpointImpl endpoint = new EndpointImpl(bus, new HelloPortImpl());
         endpoint.publish("/Hello");
         return endpoint;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/4837a6cb/distribution/src/main/release/samples/jaxws_spring_boot/src/main/resources/application.properties
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/resources/application.properties b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/resources/application.properties
new file mode 100644
index 0000000..2f7a5bb
--- /dev/null
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/resources/application.properties
@@ -0,0 +1 @@
+cxf.path=/Service