cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: The demo pom updates
Date Fri, 22 May 2015 15:26:30 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 962f81674 -> fde8db305


The demo pom updates


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

Branch: refs/heads/master
Commit: fde8db305f362bd413d2b0f5dcdbb65917cc39a9
Parents: 962f816
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Fri May 22 16:26:09 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Fri May 22 16:26:09 2015 +0100

----------------------------------------------------------------------
 .../samples/jax_rs/jaxrs_spring_boot/README     |  13 +++
 .../samples/jax_rs/jaxrs_spring_boot/pom.xml    | 103 +++++++++++++++++++
 .../java/sample/rs/service/HelloService.java    |  18 ++++
 .../rs/service/SampleRestWSApplication.java     |  56 ++++++++++
 .../release/samples/jaxrs_spring_boot/README    |  13 ---
 .../release/samples/jaxrs_spring_boot/pom.xml   | 103 -------------------
 .../java/sample/rs/service/HelloService.java    |  18 ----
 .../rs/service/SampleRestWSApplication.java     |  56 ----------
 distribution/src/main/release/samples/pom.xml   |   3 +
 9 files changed, 193 insertions(+), 190 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/fde8db30/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/README
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/README b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/README
new file mode 100644
index 0000000..c9487d7
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/README
@@ -0,0 +1,13 @@
+== Spring Boot - Samples - CXF Rest Web Services 
+
+This sample project demonstrates how to use http://projects.spring.io/spring-rs-cxf/[CXF
Rest Web Services]
+with Spring Boot. 
+
+The sample uses Maven. It can be built and run from the command line:
+
+----
+$ mvn spring-boot:run
+----
+
+http://localhost:8080/services/helloservice/sayHello/Elan  will now display the output in
the browser
+like "Hello Elan, Welcome to CXF RS Spring Boot World!!!"

http://git-wip-us.apache.org/repos/asf/cxf/blob/fde8db30/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
new file mode 100644
index 0000000..c3b56f6
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml
@@ -0,0 +1,103 @@
+<?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>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>1.2.3.RELEASE</version>
+  	   </parent> 
+	<artifactId>spring-boot-sample-rs-cxf</artifactId>
+	<name>Spring Boot Web Services Sample</name>
+	<description>Spring Boot CXF Restful Web Services Sample</description>
+	<url>http://projects.spring.io/spring-boot/</url>
+	<properties>
+		<cxf.version>3.1.1-SNAPSHOT</cxf.version>
+		<jackson.version>2.3.0</jackson.version>
+		<jetty.version>8.1.5.v20120716</jetty.version>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+                        <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>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxrs</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.apache.cxf</groupId>
+			<artifactId>cxf-rt-rs-service-description</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>${jetty.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+			<version>${jetty.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-webapp</artifactId>
+			<version>${jetty.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlets</artifactId>
+			<version>${jetty.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+                        <version>1.2.3.RELEASE</version>
+		</dependency>
+
+	</dependencies>
+	<build>
+		<plugins>
+
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+</project>

http://git-wip-us.apache.org/repos/asf/cxf/blob/fde8db30/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService.java
b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService.java
new file mode 100644
index 0000000..72e2a66
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService.java
@@ -0,0 +1,18 @@
+package sample.rs.service;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+ 
+@Path("/sayHello")
+public class HelloService {
+ 
+    @GET
+    @Path("/{a}")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String sayHello(@PathParam("a") String a) {
+        return "Hello "+a+", Welcome to CXF RS Spring Boot World!!!";
+    }
+    
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/fde8db30/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
new file mode 100644
index 0000000..5bd90db
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java
@@ -0,0 +1,56 @@
+package sample.rs.service;
+import org.apache.cxf.Bus;
+import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
+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.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.ServletRegistrationBean;
+import org.springframework.boot.context.web.SpringBootServletInitializer;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
+
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.bus.spring.SpringBus;
+import sample.rs.service.HelloService;
+import org.apache.cxf.jaxrs.JAXRSBindingFactory;
+
+@Configuration
+@EnableAutoConfiguration
+@ImportResource({ "classpath:META-INF/cxf/cxf.xml" })
+public class SampleRestWSApplication extends SpringBootServletInitializer {
+ 
+    @Autowired
+    private ApplicationContext applicationContext;
+ 
+    public static void main(String[] args) {
+        SpringApplication.run(SampleRestWSApplication.class, args);
+    }
+ 
+    @Bean
+    public ServletRegistrationBean servletRegistrationBean(ApplicationContext context) {
+        return new ServletRegistrationBean(new CXFServlet(), "/services/*");
+    }
+ 
+    
+    @Bean
+    public Server rsServer() {
+        Bus bus = (Bus) applicationContext.getBean(Bus.DEFAULT_BUS_ID);
+        JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean();
+        endpoint.setServiceBean(new HelloService());
+        endpoint.setAddress("/helloservice");
+        endpoint.setBus(bus);
+        return endpoint.create();
+    }
+ 
+    @Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+		return application.sources(SampleRestWSApplication.class);
+	}
+ 
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/fde8db30/distribution/src/main/release/samples/jaxrs_spring_boot/README
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxrs_spring_boot/README b/distribution/src/main/release/samples/jaxrs_spring_boot/README
deleted file mode 100644
index c9487d7..0000000
--- a/distribution/src/main/release/samples/jaxrs_spring_boot/README
+++ /dev/null
@@ -1,13 +0,0 @@
-== Spring Boot - Samples - CXF Rest Web Services 
-
-This sample project demonstrates how to use http://projects.spring.io/spring-rs-cxf/[CXF
Rest Web Services]
-with Spring Boot. 
-
-The sample uses Maven. It can be built and run from the command line:
-
-----
-$ mvn spring-boot:run
-----
-
-http://localhost:8080/services/helloservice/sayHello/Elan  will now display the output in
the browser
-like "Hello Elan, Welcome to CXF RS Spring Boot World!!!"

http://git-wip-us.apache.org/repos/asf/cxf/blob/fde8db30/distribution/src/main/release/samples/jaxrs_spring_boot/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxrs_spring_boot/pom.xml b/distribution/src/main/release/samples/jaxrs_spring_boot/pom.xml
deleted file mode 100644
index c3b56f6..0000000
--- a/distribution/src/main/release/samples/jaxrs_spring_boot/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
-  	   </parent> 
-	<artifactId>spring-boot-sample-rs-cxf</artifactId>
-	<name>Spring Boot Web Services Sample</name>
-	<description>Spring Boot CXF Restful Web Services Sample</description>
-	<url>http://projects.spring.io/spring-boot/</url>
-	<properties>
-		<cxf.version>3.1.1-SNAPSHOT</cxf.version>
-		<jackson.version>2.3.0</jackson.version>
-		<jetty.version>8.1.5.v20120716</jetty.version>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-                        <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>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxrs</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.apache.cxf</groupId>
-			<artifactId>cxf-rt-rs-service-description</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>${jetty.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<version>${jetty.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-webapp</artifactId>
-			<version>${jetty.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlets</artifactId>
-			<version>${jetty.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-                        <version>1.2.3.RELEASE</version>
-		</dependency>
-
-	</dependencies>
-	<build>
-		<plugins>
-
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-</project>

http://git-wip-us.apache.org/repos/asf/cxf/blob/fde8db30/distribution/src/main/release/samples/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService.java
b/distribution/src/main/release/samples/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService.java
deleted file mode 100644
index 72e2a66..0000000
--- a/distribution/src/main/release/samples/jaxrs_spring_boot/src/main/java/sample/rs/service/HelloService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package sample.rs.service;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
- 
-@Path("/sayHello")
-public class HelloService {
- 
-    @GET
-    @Path("/{a}")
-    @Produces(MediaType.TEXT_PLAIN)
-    public String sayHello(@PathParam("a") String a) {
-        return "Hello "+a+", Welcome to CXF RS Spring Boot World!!!";
-    }
-    
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/fde8db30/distribution/src/main/release/samples/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java
b/distribution/src/main/release/samples/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java
deleted file mode 100644
index 5bd90db..0000000
--- a/distribution/src/main/release/samples/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package sample.rs.service;
-import org.apache.cxf.Bus;
-import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
-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.builder.SpringApplicationBuilder;
-import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
-import org.springframework.boot.context.web.SpringBootServletInitializer;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
-import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-
-import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.bus.spring.SpringBus;
-import sample.rs.service.HelloService;
-import org.apache.cxf.jaxrs.JAXRSBindingFactory;
-
-@Configuration
-@EnableAutoConfiguration
-@ImportResource({ "classpath:META-INF/cxf/cxf.xml" })
-public class SampleRestWSApplication extends SpringBootServletInitializer {
- 
-    @Autowired
-    private ApplicationContext applicationContext;
- 
-    public static void main(String[] args) {
-        SpringApplication.run(SampleRestWSApplication.class, args);
-    }
- 
-    @Bean
-    public ServletRegistrationBean servletRegistrationBean(ApplicationContext context) {
-        return new ServletRegistrationBean(new CXFServlet(), "/services/*");
-    }
- 
-    
-    @Bean
-    public Server rsServer() {
-        Bus bus = (Bus) applicationContext.getBean(Bus.DEFAULT_BUS_ID);
-        JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean();
-        endpoint.setServiceBean(new HelloService());
-        endpoint.setAddress("/helloservice");
-        endpoint.setBus(bus);
-        return endpoint.create();
-    }
- 
-    @Override
-	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-		return application.sources(SampleRestWSApplication.class);
-	}
- 
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/fde8db30/distribution/src/main/release/samples/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index f9e56c6..fabd812 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -53,6 +53,8 @@
         <module>jax_rs/websocket</module>
         <module>jax_rs/search</module>
         <module>jax_rs/description_swagger</module>
+        <module>jax_rs/jaxrs_spring_boot</module>
+        <module>jax_rs/big_query</module>
         <module>callback</module>
         <module>wsdl_first_pure_xml</module>
         <module>jaxws_dispatch_provider</module>
@@ -103,6 +105,7 @@
         <module>ws_discovery</module>
         <module>ws_eventing</module>
         <module>throttling</module>
+        <module>jaxws_spring_boot</module>
     </modules>
     <dependencyManagement>
         <dependencies>


Mime
View raw message