cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1174143 - in /cxf/branches/2.3.x-fixes: ./ distribution/src/main/release/samples/ distribution/src/main/release/samples/groovy_spring_support/ distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/ distribution/src/ma...
Date Thu, 22 Sep 2011 13:56:14 GMT
Author: ningjiang
Date: Thu Sep 22 13:56:13 2011
New Revision: 1174143

URL: http://svn.apache.org/viewvc?rev=1174143&view=rev
Log:
Merged revisions 1173766,1174040 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1173766 | gmazza | 2011-09-22 01:10:47 +0800 (Thu, 22 Sep 2011) | 9 lines
  
  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
  ........
................
  r1174040 | ningjiang | 2011-09-22 18:08:59 +0800 (Thu, 22 Sep 2011) | 13 lines
  
  Merged revisions 1173997-1173998 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1173997 | ningjiang | 2011-09-22 16:55:30 +0800 (Thu, 22 Sep 2011) | 1 line
    
    CXF-3817 added pom support on js_provider
  ........
    r1173998 | ningjiang | 2011-09-22 17:00:34 +0800 (Thu, 22 Sep 2011) | 1 line
    
    CXF-3817 updated the pom.xml of pom.xml for new added maven supporting samples
  ........
................

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

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 22 13:56:13 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.4.x-fixes:1172584,1173057
-/cxf/trunk:1172522,1173027
+/cxf/branches/2.4.x-fixes:1172584,1173057,1173766,1174040
+/cxf/trunk:1172522,1173027,1173997-1173998

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/groovy_spring_support/README.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/groovy_spring_support/README.txt?rev=1174143&r1=1174142&r2=1174143&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/groovy_spring_support/README.txt
(original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/groovy_spring_support/README.txt
Thu Sep 22 13:56:13 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.3.x-fixes/distribution/src/main/release/samples/groovy_spring_support/build.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/groovy_spring_support/build.xml?rev=1174143&r1=1174142&r2=1174143&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/groovy_spring_support/build.xml
(original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/groovy_spring_support/build.xml
Thu Sep 22 13:56:13 2011
@@ -52,7 +52,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>

Copied: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/groovy_spring_support/pom.xml
(from r1173766, cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/pom.xml)
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/groovy_spring_support/pom.xml?p2=cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/groovy_spring_support/pom.xml&p1=cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/pom.xml&r1=1173766&r2=1174143&rev=1174143&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/pom.xml
(original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/groovy_spring_support/pom.xml
Thu Sep 22 13:56:13 2011
@@ -23,12 +23,12 @@
     <packaging>war</packaging>
     <name>Spring HTTP Servlet demo with groovy support</name>
     <description>Spring HTTP Servlet demo with groovy support</description>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.3.7-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>2.3.7-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -129,18 +129,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.5.0-SNAPSHOT</version>
+            <version>2.3.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.5.0-SNAPSHOT</version>
+            <version>2.3.7-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.5.0-SNAPSHOT</version>
+            <version>2.3.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/js_provider/README.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/js_provider/README.txt?rev=1174143&r1=1174142&r2=1174143&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/js_provider/README.txt
(original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/js_provider/README.txt
Thu Sep 22 13:56:13 2011
@@ -87,10 +87,22 @@ compilation, there is no server-side jav
 Finally, copy resource files into the build/classes directory with the commands:
 
 For UNIX:    
-  cp ./src/demo/hwDispatch/client/*.xml ./build/classes/demo/hwDispatch/client
+  cp ./src/main/java/demo/hwDispatch/client/*.xml ./build/classes/demo/hwDispatch/client
 
 For Windows:
-  copy src\demo\hwDispatch\client\*.xml build\classes\demo\hwDispatch\client
+  copy src\main\java\demo\hwDispatch\client\*.xml build\classes\demo\hwDispatch\client
+
+
+Running the demo using maven
+----------------------------
+
+From the base directory of this sample (i.e., where this README file is
+located) run the commands, entered on a single command line:
+
+Using either UNIX or Windows:
+
+  mvn -Pserver  (from one command line window)
+  mvn -Pclient  (from a second command line window)
 
 
 Running the demo using java

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/js_provider/build.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/js_provider/build.xml?rev=1174143&r1=1174142&r2=1174143&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/js_provider/build.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/js_provider/build.xml Thu
Sep 22 13:56:13 2011
@@ -43,7 +43,7 @@
     </target> 
         
     <target name="server" description="run demo server" depends="build">
-        <cxfrun classname="org.apache.cxf.js.rhino.ServerApp" param1="-v" param2="-b"
param3="http://localhost:9000/SoapContext" param4="${basedir}/impl.jsx" param5="${basedir}/impl.js"/>
+        <cxfrun classname="org.apache.cxf.js.rhino.ServerApp" param1="-v" param2="-b"
param3="http://localhost:9000/SoapContext" param4="${basedir}/src/main/resources/impl.jsx"
param5="${basedir}/src/main/resources/impl.js"/>
     </target>
         
     <target name="generate.code">

Copied: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/js_provider/pom.xml
(from r1174040, cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/pom.xml)
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/js_provider/pom.xml?p2=cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/js_provider/pom.xml&p1=cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/pom.xml&r1=1174040&r2=1174143&rev=1174143&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/js_provider/pom.xml Thu
Sep 22 13:56:13 2011
@@ -22,12 +22,12 @@
     <artifactId>js_provider</artifactId>
     <name>Hello world javascript demo</name>
     <description>Hello world javascript demo</description>
-    <version>2.4.3-SNAPSHOT</version>
+    <version>2.3.7-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.4.3-SNAPSHOT</version>
+        <version>2.3.7-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -159,18 +159,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-js</artifactId>
-            <version>2.4.3-SNAPSHOT</version>
+            <version>2.3.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.4.3-SNAPSHOT</version>
+            <version>2.3.7-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.4.3-SNAPSHOT</version>
+            <version>2.3.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/pom.xml?rev=1174143&r1=1174142&r2=1174143&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/pom.xml Thu Sep 22 13:56:13
2011
@@ -62,6 +62,9 @@
         <module>ws_rm</module>
         <module>configuration_interceptor</module>
         <module>java_first_spring_support</module>
+        <module>ruby_spring_support</module>
+        <module>groovy_spring_support</module>
+        <module>js_provider</module>
         <module>ws_security/ut</module>
         <module>ws_security/ut_sign</module>
         <module>ws_security/sign_enc</module>

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ruby_spring_support/README.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ruby_spring_support/README.txt?rev=1174143&r1=1174142&r2=1174143&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ruby_spring_support/README.txt
(original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ruby_spring_support/README.txt
Thu Sep 22 13:56:13 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)
+

Copied: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ruby_spring_support/pom.xml
(from r1173766, 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.3.x-fixes/distribution/src/main/release/samples/ruby_spring_support/pom.xml?p2=cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ruby_spring_support/pom.xml&p1=cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/pom.xml&r1=1173766&r2=1174143&rev=1174143&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/pom.xml
(original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ruby_spring_support/pom.xml
Thu Sep 22 13:56:13 2011
@@ -23,12 +23,12 @@
     <packaging>war</packaging>
     <name>Spring HTTP Servlet demo with ruby support</name>
     <description>Spring HTTP Servlet demo with ruby support</description>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.3.7-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>2.3.7-SNAPSHOT</version>
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
@@ -128,18 +128,18 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>2.5.0-SNAPSHOT</version>
+            <version>2.3.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>2.5.0-SNAPSHOT</version>
+            <version>2.3.7-SNAPSHOT</version>
         </dependency>
         <!-- Jetty is needed if you're using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>2.5.0-SNAPSHOT</version>
+            <version>2.3.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jruby</groupId>



Mime
View raw message