Author: gmazza
Date: Tue Nov 22 14:44:23 2011
New Revision: 1205024
URL: http://svn.apache.org/viewvc?rev=1205024&view=rev
Log:
Merged revisions 1204987 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1204987 | gmazza | 2011-11-22 08:29:36 -0500 (Tue, 22 Nov 2011) | 1 line
Better Mavenized Ruby sample, switched to common ../etc/web.xml file
........
Added:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/
- copied from r1204987,
cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/HelloWorld.java
- copied unchanged from r1204987,
cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/HelloWorld.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
- copied unchanged from r1204987,
cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/resources/
- copied from r1204987,
cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/resources/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/resources/HelloWorldImpl.rb
- copied unchanged from r1204987,
cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/resources/HelloWorldImpl.rb
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/resources/client-beans.xml
- copied unchanged from r1204987,
cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/resources/client-beans.xml
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/
- copied from r1204987,
cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/
- copied from r1204987,
cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
- copied unchanged from r1204987,
cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/cxf-servlet.xml
Removed:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/HelloWorld.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/HelloWorldImpl.rb
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/client-beans.xml
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/servlet/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/webapp/
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/README.txt
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/pom.xml
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_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/ruby_spring_support/README.txt
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/README.txt?rev=1205024&r1=1205023&r2=1205024&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/README.txt
(original)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/README.txt
Tue Nov 22 14:44:23 2011
@@ -1,6 +1,7 @@
Ruby script demo
=================
-This example shows how to create a Ruby web service implemented with Spring.
+This example shows how to create a Ruby web service implemented with CXF
+using Spring configuration.
Building and running the demo using Maven
@@ -8,7 +9,7 @@ Building and running the demo using Mave
From the base directory of this example (i.e., where this README file is
located), the Maven pom.xml file can be used to build and run the demo.
-Using either UNIX or Windows:
+Using either Unix or Windows:
mvn -Pserver (from one command line window)
mvn -Pclient (from a second command line window)
Modified:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/pom.xml?rev=1205024&r1=1205023&r2=1205024&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/pom.xml
(original)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/pom.xml
Tue Nov 22 14:44:23 2011
@@ -55,25 +55,8 @@
<target>1.5</target>
</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/HelloWorldImpl.rb"
todir="${basedir}/target/classes/demo/spring" />
- <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>RubySpringSupport</finalName>
</build>
<profiles>
<profile>
@@ -91,7 +74,7 @@
<goal>java</goal>
</goals>
<configuration>
-
<mainClass>demo.spring.servlet.Server</mainClass>
+
<mainClass>demo.spring.service.Server</mainClass>
</configuration>
</execution>
</executions>
Modified:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_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/ruby_spring_support/src/main/java/demo/spring/client/Client.java?rev=1205024&r1=1205023&r2=1205024&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
(original)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
Tue Nov 22 14:44:23 2011
@@ -18,10 +18,9 @@
*/
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");
