cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1173766 - in /cxf/branches/2.4.x-fixes: ./ distribution/src/main/release/samples/groovy_spring_support/ distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/ distribution/src/main/release/samples/groovy_spring_suppor...
Date Wed, 21 Sep 2011 17:10:48 GMT
Author: gmazza
Date: Wed Sep 21 17:10:47 2011
New Revision: 1173766

URL: http://svn.apache.org/viewvc?rev=1173766&view=rev
Log:
Merged revisions 1173644 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1173644 | ningjiang | 2011-09-21 09:46:16 -0400 (Wed, 21 Sep 2011) | 1 line
  
  CXF-3690, CXF-3817 added pom support on ruby_spring_support and groovy_spring_support samples
........

Added:
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/pom.xml
      - copied unchanged from r1173644, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/pom.xml
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/
      - copied from r1173644, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/
      - copied from r1173644, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/java/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/
      - copied from r1173644, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/
      - copied from r1173644, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/HelloWorld.groovy
      - copied unchanged from r1173644, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/HelloWorld.groovy
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/HelloWorld.java
      - copied unchanged from r1173644, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/HelloWorld.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/HelloWorldImpl.groovy
      - copied unchanged from r1173644, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/HelloWorldImpl.groovy
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/
      - copied from r1173644, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java
      - copied unchanged from r1173644, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/client-beans.xml
      - copied unchanged from r1173644, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/client-beans.xml
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/
      - copied from r1173644, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
      - copied unchanged from r1173644, cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/pom.xml
      - copied unchanged from r1173644, cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/pom.xml
Removed:
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/HelloWorld.groovy
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/HelloWorld.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/HelloWorldImpl.groovy
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/client/Client.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/client/client-beans.xml
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/servlet/Server.java
Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/README.txt
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/build.xml
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/README.txt

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/groovy_spring_support/README.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/README.txt?rev=1173766&r1=1173765&r2=1173766&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/README.txt
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/README.txt
Wed Sep 21 17:10:47 2011
@@ -42,7 +42,6 @@ ant get.dep
 
 
 Building and running the demo using Ant
-
 ---------------------------------------
 
 
@@ -57,4 +56,16 @@ Using either UNIX or Windows:
 
 
 To remove the code generated from the WSDL file and the .class
-files, run "ant clean".
\ No newline at end of file
+files, run "ant clean".
+
+Building and running the demo using Maven
+-----------------------------------------
+
+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:
+
+  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/groovy_spring_support/build.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/build.xml?rev=1173766&r1=1173765&r2=1173766&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/build.xml
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/build.xml
Wed Sep 21 17:10:47 2011
@@ -46,7 +46,7 @@
 
     <target name="server" description="run demo server" depends="build">
         <copy todir="build/classes/demo/spring">
-            <fileset dir="src/demo/spring" excludes="**/*.java"/>
+            <fileset dir="src/main/java/demo/spring" excludes="**/*.java"/>
         </copy>
         <cxfrun classname="demo.spring.servlet.Server"/>
     </target>

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=1173766&r1=1173765&r2=1173766&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
Wed Sep 21 17:10:47 2011
@@ -55,4 +55,17 @@ Using either UNIX or Windows:
 
 
 To remove the code generated from the WSDL file and the .class
-files, run "ant clean".
\ No newline at end of file
+files, run "ant clean".
+
+Building and running the demo using Maven
+
+-----------------------------------------
+
+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:
+
+  mvn -Pserver  (from one command line window)
+  mvn -Pclient  (from a second command line window)
+



Mime
View raw message