You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by gm...@apache.org on 2011/11/29 22:27:55 UTC
svn commit: r1208079 - in /cxf/branches/2.4.x-fixes: ./
distribution/src/main/release/samples/java_first_spring_support/
distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/
distribution/src/main/release/samples/ja...
Author: gmazza
Date: Tue Nov 29 21:27:54 2011
New Revision: 1208079
URL: http://svn.apache.org/viewvc?rev=1208079&view=rev
Log:
Merged revisions 1208005 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1208005 | gmazza | 2011-11-29 13:21:59 -0500 (Tue, 29 Nov 2011) | 1 line
Better Mavenized java_first_spring_support example.
........
Added:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/
- copied from r1208005, cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/HelloWorld.java
- copied unchanged from r1208005, cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/HelloWorld.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/HelloWorldImpl.java
- copied unchanged from r1208005, cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/HelloWorldImpl.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
- copied unchanged from r1208005, cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/resources/
- copied from r1208005, cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/resources/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/resources/client-beans.xml
- copied unchanged from r1208005, cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/resources/client-beans.xml
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/
- copied from r1208005, cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/
- copied from r1208005, cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
- copied unchanged from r1208005, cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
Removed:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/HelloWorld.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/HelloWorldImpl.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/client-beans.xml
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/servlet/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/webapp/
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/pom.xml
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/pom.xml?rev=1208079&r1=1208078&r2=1208079&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/pom.xml Tue Nov 29 21:27:54 2011
@@ -20,9 +20,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>java_first_spring_support</artifactId>
- <name>Spring HTTP Sample</name>
<version>2.4.5-SNAPSHOT</version>
+ <name>Spring HTTP Sample</name>
<description>Spring HTTP Sample</description>
+ <packaging>war</packaging>
<parent>
<groupId>org.apache.cxf.samples</groupId>
@@ -31,34 +32,19 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
+ <cxf.release.base>${basedir}/../..</cxf.release.base>
</properties>
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <webXml>${cxf.release.base}/etc/web.xml</webXml>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare-transform</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy file="${basedir}/src/main/java/demo/spring/client/client-beans.xml" todir="${basedir}/target/classes/demo/spring/client" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
+ <finalName>JavaFirstSpringSupport</finalName>
</build>
<profiles>
<profile>
@@ -76,7 +62,7 @@
<goal>java</goal>
</goals>
<configuration>
- <mainClass>demo.spring.servlet.Server</mainClass>
+ <mainClass>demo.spring.service.Server</mainClass>
</configuration>
</execution>
</executions>
@@ -119,7 +105,6 @@
<artifactId>cxf-rt-transports-http</artifactId>
<version>2.4.5-SNAPSHOT</version>
</dependency>
- <!-- Jetty is needed if you're not using the CXFServlet -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
@@ -131,3 +116,4 @@
</dependency>
</dependencies>
</project>
+
Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java?rev=1208079&r1=1208078&r2=1208079&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java (original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java Tue Nov 29 21:27:54 2011
@@ -20,8 +20,7 @@ package demo.spring.client;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import demo.spring.HelloWorld;
+import demo.spring.service.HelloWorld;
public final class Client {
@@ -32,7 +31,7 @@ public final class Client {
public static void main(String args[]) throws Exception {
// START SNIPPET: client
ClassPathXmlApplicationContext context
- = new ClassPathXmlApplicationContext(new String[] {"demo/spring/client/client-beans.xml"});
+ = new ClassPathXmlApplicationContext(new String[] {"client-beans.xml"});
HelloWorld client = (HelloWorld)context.getBean("client");