Author: ningjiang
Date: Thu Sep 22 10:08:59 2011
New Revision: 1174040
URL: http://svn.apache.org/viewvc?rev=1174040&view=rev
Log:
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.4.x-fixes/distribution/src/main/release/samples/js_provider/pom.xml
- copied, changed from r1173998,
cxf/trunk/distribution/src/main/release/samples/js_provider/pom.xml
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/src/main/resources/
- copied from r1173998,
cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/src/main/resources/impl.js
- copied unchanged from r1173998,
cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/impl.js
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/src/main/resources/impl.jsx
- copied unchanged from r1173998,
cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/impl.jsx
Removed:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/impl.js
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/impl.jsx
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/README.txt
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/build.xml
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/pom.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 22 10:08:59 2011
@@ -1 +1 @@
-/cxf/trunk:1173831
+/cxf/trunk:1173831,1173997-1173998
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/js_provider/README.txt
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/README.txt?rev=1174040&r1=1174039&r2=1174040&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/README.txt
(original)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/README.txt
Thu Sep 22 10:08:59 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.4.x-fixes/distribution/src/main/release/samples/js_provider/build.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/build.xml?rev=1174040&r1=1174039&r2=1174040&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/build.xml
(original)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/build.xml
Thu Sep 22 10:08:59 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.4.x-fixes/distribution/src/main/release/samples/js_provider/pom.xml
(from r1173998,
cxf/trunk/distribution/src/main/release/samples/js_provider/pom.xml)
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/pom.xml?p2=cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/pom.xml&p1=cxf/trunk/distribution/src/main/release/samples/js_provider/pom.xml&r1=1173998&r2=1174040&rev=1174040&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/js_provider/pom.xml
(original)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/js_provider/pom.xml
Thu Sep 22 10:08:59 2011
@@ -22,12 +22,12 @@
<artifactId>js_provider</artifactId>
<name>Hello world javascript demo</name>
<description>Hello world javascript demo</description>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.3-SNAPSHOT</version>
<parent>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.3-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.5.0-SNAPSHOT</version>
+ <version>2.4.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.3-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.4.3-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/pom.xml?rev=1174040&r1=1174039&r2=1174040&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/pom.xml
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/pom.xml Thu
Sep 22 10:08:59 2011
@@ -63,6 +63,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>
