You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2015/12/10 13:17:53 UTC
[1/2] cxf git commit: Updates to Spring boot demos
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes c2e09554a -> 452300ef1
Updates to Spring boot demos
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2e7338a1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2e7338a1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2e7338a1
Branch: refs/heads/3.1.x-fixes
Commit: 2e7338a15df3b313997be4700cccba9ac6294d02
Parents: c2e0955
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Thu Dec 10 12:10:48 2015 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Thu Dec 10 12:15:05 2015 +0000
----------------------------------------------------------------------
.../release/samples/jax_rs/jaxrs_spring_boot/pom.xml | 11 ++++++++---
.../sample/rs/client/SampleRestClientApplication.java | 4 ++--
.../sample/rs/service/SampleRestWSApplication.java | 14 +++++++-------
.../main/release/samples/jaxws_spring_boot/pom.xml | 7 +++++--
4 files changed, 22 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/2e7338a1/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml
index 90fe064..7e3af7d 100644
--- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml
@@ -12,20 +12,25 @@
<description>Spring Boot CXF Restful Web Services Sample</description>
<url>http://projects.spring.io/spring-boot/</url>
<properties>
- <cxf.version>3.1.2-SNAPSHOT</cxf.version>
+ <cxf.version>3.2.0-SNAPSHOT</cxf.version>
<jackson.version>2.3.0</jackson.version>
<jetty.version>8.1.5.v20120716</jetty.version>
</properties>
<dependencies>
<dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
- <version>1.2.3.RELEASE</version>
+ <version>1.2.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
- <version>1.2.3.RELEASE</version>
+ <version>1.2.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/2e7338a1/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
index 8e5e0f0..eeb2781 100644
--- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
@@ -28,8 +28,8 @@ public final class SampleRestClientApplication {
}
public static void main(String[] args) {
- HelloService service = JAXRSClientFactory.create("http://locahost:8080/helloservice/",
+ HelloService service = JAXRSClientFactory.create("http://localhost:8080/services/helloservice/",
HelloService.class);
System.out.println(service.sayHello("ApacheCxfUser"));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/2e7338a1/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java
index 7b44d62..ac1f1e3 100644
--- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java
@@ -24,7 +24,7 @@ import org.apache.cxf.jaxrs.spring.JaxRsConfig;
import org.apache.cxf.transport.servlet.CXFServlet;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.embedded.ServletRegistrationBean;
import org.springframework.boot.context.web.SpringBootServletInitializer;
@@ -32,9 +32,9 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
-@EnableAutoConfiguration
+@SpringBootApplication
@Import(JaxRsConfig.class)
-public class SampleRestWSApplication extends SpringBootServletInitializer {
+public class SampleRestWSApplication {
@Autowired
private ApplicationContext applicationContext;
@@ -59,9 +59,9 @@ public class SampleRestWSApplication extends SpringBootServletInitializer {
return endpoint.create();
}
- @Override
- protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
- return application.sources(SampleRestWSApplication.class);
- }
+ //@Override
+ //protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+ // return application.sources(SampleRestWSApplication.class);
+ //}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/2e7338a1/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 1a9f2f1..cdf3181 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -11,6 +11,9 @@
<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>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -21,12 +24,12 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
[2/2] cxf git commit: Updates to Spring boot demos
Posted by se...@apache.org.
Updates to Spring boot demos
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/452300ef
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/452300ef
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/452300ef
Branch: refs/heads/3.1.x-fixes
Commit: 452300ef14037ada7de1534003f771dfc7ba5c40
Parents: 2e7338a
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Thu Dec 10 12:17:30 2015 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Thu Dec 10 12:17:30 2015 +0000
----------------------------------------------------------------------
.../src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml | 2 +-
distribution/src/main/release/samples/jaxws_spring_boot/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/452300ef/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml
index 7e3af7d..b97cd8d 100644
--- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml
@@ -12,7 +12,7 @@
<description>Spring Boot CXF Restful Web Services Sample</description>
<url>http://projects.spring.io/spring-boot/</url>
<properties>
- <cxf.version>3.2.0-SNAPSHOT</cxf.version>
+ <cxf.version>3.1.5-SNAPSHOT</cxf.version>
<jackson.version>2.3.0</jackson.version>
<jetty.version>8.1.5.v20120716</jetty.version>
</properties>
http://git-wip-us.apache.org/repos/asf/cxf/blob/452300ef/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..256fc3d 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.apache.cxf.spring.boot</groupId>
<version>1.0.0</version>
<properties>
- <cxf.version>3.2.0-SNAPSHOT</cxf.version>
+ <cxf.version>3.1.5-SNAPSHOT</cxf.version>
</properties>
<dependencies>
<dependency>