Author: gmazza
Date: Wed Sep 21 17:12:15 2011
New Revision: 1173767
URL: http://svn.apache.org/viewvc?rev=1173767&view=rev
Log:
Merged revisions 1173758 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1173758 | gmazza | 2011-09-21 13:00:00 -0400 (Wed, 21 Sep 2011) | 1 line
Removed Ant build options from remaining 7 Mavenized projects.
........
Removed:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/configuration_interceptor/build.xml
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/in_jvm_transport/build.xml
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/build.xml
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/restful_http_binding/build.xml
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ruby_spring_support/build.xml
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/build.xml
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/configuration_interceptor/README.txt
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/in_jvm_transport/README.txt
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/README.txt
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/restful_http_binding/README.txt
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/wsdl_first_https/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/configuration_interceptor/README.txt
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/configuration_interceptor/README.txt?rev=1173767&r1=1173766&r2=1173767&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/configuration_interceptor/README.txt
(original)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/configuration_interceptor/README.txt
Wed Sep 21 17:12:15 2011
@@ -8,36 +8,8 @@ Please review the README in the samples
continuing.
-Prerequisite
-------------
-
-If your environment already includes cxf-manifest.jar on the
-CLASSPATH, and the JDK and ant bin directories on the PATH
-it is not necessary to set the environment as described in
-the samples directory README. If your environment is not
-properly configured, or if you are planning on using wsdl2java,
-javac, and java to build and run the demos, you must set the
-environment.
-
-
-Building and running the demo using Ant
----------------------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located), the Ant build.xml file can be used to build and run the demo.
-The server and client targets automatically build the demo.
-
-Using either UNIX or Windows:
-
- ant server (from one command line window)
- ant client (from a second command line window)
-
-To remove the code generated from the WSDL file and the .class
-files, run "ant clean".
-
-
-Building and running the demo using maven
----------------------------------------
+Building and running the demo using Maven
+-----------------------------------------
From the base directory of this sample (i.e., where this README file is
located), the maven pom.xml file can be used to build and run the demo.
@@ -53,71 +25,3 @@ To remove the code generated from the WS
files, run "mvn clean".
-
-Building the demo using wsdl2java and javac
--------------------------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located) first create the target directory build/classes and then
-generate code from the WSDL file.
-
-For UNIX:
- mkdir -p build/classes
-
- wsdl2java -d build/classes -compile ./wsdl/hello_world.wsdl
-
-For Windows:
- mkdir build\classes
- Must use back slashes.
-
- wsdl2java -d build\classes -compile .\wsdl\hello_world.wsdl
- May use either forward or back slashes.
-
-Now compile the provided client and server applications with the commands:
-
-For UNIX:
-
- export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-manifest.jar:./build/classes
- javac -d build/classes src/demo/stream/interceptor/*.java
- javac -d build/classes src/demo/stream/client/*.java
- javac -d build/classes src/demo/stream/server/*.java
-
-For Windows:
- set classpath=%classpath%;%CXF_HOME%\lib\cxf-manifest.jar;.\build\classes
- javac -d build\classes src\demo\stream\interceptor\*.java
- javac -d build\classes src\demo\stream\client\*.java
- javac -d build\classes src\demo\stream\server\*.java
-
-
-Running the demo using java
----------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located) run the commands, entered on a single command line:
-
-For UNIX (must use forward slashes):
- java -Dcxf.config.file=server.xml
- demo.stream.server.Server &
-
- java -Dcxf.config.file=client.xml
- demo.stream.client.Client ./wsdl/hello_world.wsdl
-
-The server process starts in the background. After running the client,
-use the kill command to terminate the server process.
-
-For Windows (may use either forward or back slashes):
- start
- java -Dcxf.config.file=server.xml
- demo.stream.server.Server
-
- java -Dcxf.config.file=client.xml
- demo.stream.client.Client .\wsdl\hello_world.wsdl
-
-A new command windows opens for the server process. After running the
-client, terminate the server process by issuing Ctrl-C in its command window.
-
-To remove the code generated from the WSDL file and the .class
-files, either delete the build directory and its contents or run:
-
- ant clean
-
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=1173767&r1=1173766&r2=1173767&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:12:15 2011
@@ -1,66 +1,11 @@
Groovy script demo
-
==================
-
-This example shows how to create groovy web service
+This example shows how to create a Groovy web service
implemented with Spring.
-You'll learn how to write a simple groovy script web service.
-
-For more information see the
-documentation for this example in the
-user's guide.
-
-
-
-
-
-Prerequisite
-------------
-
-If your environment already includes cxf-manifest.jar on the
-CLASSPATH, and the JDK and ant bin directories on the PATH
-it is not necessary to set the environment as described in
-the samples directory's README. If your environment is not
-properly configured, or if you are planning on using wsdl2java,
-javac, and java to build and run the demos, you must set the
-environment.
-
-
-
-
-
-Some third-party jars need to be installed to make this sample working.
-
-You can run the following command to get these third-party jars
-
-:
-
-ant get.dep
-
-
-
-
-Building and running the demo using Ant
----------------------------------------
-
-
-From the base directory of this sample (i.e., where this README file is
-located), the Ant build.xml file can be used to build and run the demo.
-The server and client targets automatically build the demo.
-
-Using either UNIX or Windows:
-
- ant server (from one command line window)
- ant client (from a second command line window)
-
-
-To remove the code generated from the WSDL file and the .class
-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.
Modified:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/in_jvm_transport/README.txt
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/in_jvm_transport/README.txt?rev=1173767&r1=1173766&r2=1173767&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/in_jvm_transport/README.txt
(original)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/in_jvm_transport/README.txt
Wed Sep 21 17:12:15 2011
@@ -1,39 +1,11 @@
Colocated Demo using Document/Literal Style
=============================================
-
Please review the README in the samples directory before
continuing.
-Prerequisite
-------------
-
-If your environment already includes cxf.jar on the
-CLASSPATH, and the JDK and ant bin directories on the PATH
-it is not necessary to set the environment as described in
-the samples directory README. If your environment is not
-properly configured, or if you are planning on using wsdl2java,
-javac, and java to build and run the demos, you must set the
-environment.
-
-
-Building and running the demo using Ant
----------------------------------------
-From the base directory of this sample (i.e., where this README file is
-located), the Ant build.xml file can be used to build and run the demo.
-The client target automatically builds the demo.
-
-Using either UNIX or Windows:
-
- ant client
-
-
-To remove the code generated from the WSDL file and the .class
-files, run "ant clean".
-
-
-Building and running the demo using maven
----------------------------------------
+Building and running the demo using Maven
+-----------------------------------------
From the base directory of this sample (i.e., where this README file is
located), the maven pom.xml file can be used to build and run the demo.
@@ -47,57 +19,4 @@ To remove the code generated from the WS
files, run "mvn clean".
-Building the demo using wsdl2java and javac
--------------------------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located) first create the target directory build/classes and then
-generate code from the WSDL file.
-
-For UNIX:
- mkdir -p build/classes
-
- wsdl2java -d build/classes -compile ./wsdl/hello_world.wsdl
-
-For Windows:
- mkdir build\classes
- Must use back slashes.
-
- wsdl2java -d build\classes -compile .\wsdl\hello_world.wsdl
- May use either forward or back slashes.
-
-Now compile the provided client and server applications with the commands:
-
-For UNIX:
-
- export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf.jar:./build/classes
- javac -d build/classes src/demo/colocated/server/*.java
- javac -d build/classes src/demo/colocated/client/*.java
-
-For Windows:
- set classpath=%classpath%;%CXF_HOME%\lib\cxf.jar;.\build\classes
- javac -d build\classes src\demo\colocated\server\*.java
- javac -d build\classes src\demo\colocated\client\*.java
-
-
-Running the demo using java
----------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located) run the commands, entered on a single command line:
-
-For UNIX (must use forward slashes):
- java -Djava.util.logging.config.file=$CXF_HOME/etc/logging.properties
- -Dcxf.config.file=./coloc.xml
- demo.colocated.client.Client ./wsdl/hello_world.wsdl
-
-For Windows (may use either forward or back slashes):
- start
- java -Djava.util.logging.config.file=%CXF_HOME%\etc\logging.properties
- -Dcxf.config.file=.\coloc.xml
- demo.colocated.client.Client .\wsdl\hello_world.wsdl
-
-To remove the code generated from the WSDL file and the .class
-files, either delete the build directory and its contents or run:
- ant clean
Modified:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/README.txt
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/README.txt?rev=1173767&r1=1173766&r2=1173767&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/README.txt
(original)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/README.txt
Wed Sep 21 17:12:15 2011
@@ -1,38 +1,10 @@
Java First demo using jax-ws APIs and jsr-181
=============================================
-
This demo illustrates how to develop a service use the "code first"
approach using the JAX-WS APIs.
-
-Prerequisite
-------------
-
-If your environment already includes cxf-manifest.jar on the
-CLASSPATH, and the JDK and ant bin directories on the PATH
-it is not necessary to set the environment as described in
-the samples directory README. If your environment is not
-properly configured, or if you are planning on using wsdl2java,
-javac, and java to build and run the demos, you must set the
-environment.
-
-
-Building and running the demo using ant
----------------------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located), the Ant build.xml file can be used to build and run the demo.
-The server and client targets automatically build the demo.
-
-Using either UNIX or Windows:
-
- ant server (from one command line window)
- ant client (from a second command line window)
-
-
Building and running the demo using Maven
---------------------------------------
-
From the base directory of this sample (i.e., where this README file is
located), the pom.xml file is used to build and run the demo.
@@ -47,50 +19,3 @@ To remove the code generated from the WS
files, run "mvn clean".
-Building the demo using javac
------------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located), first create the target directory build/classes and then compile
-the provided client and server code.
-
-For UNIX:
-
- mkdir -p build/classes
- export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-manifest.jar:./build/classes
- javac -d build/classes src/demo/hw/client/*.java
- javac -d build/classes src/demo/hw/server/*.java
-
-For Windows:
- mkdir build\classes
- set classpath=%classpath%;%CXF_HOME%\lib\cxf-manifest.jar;.\build\classes
- javac -d build\classes src\demo\hw\client\*.java
- javac -d build\classes src\demo\hw\server\*.java
-
-
-Running the demo using java
----------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located) run the commands, entered on a single command line:
-
-For UNIX (must use forward slashes):
- java -Djava.util.logging.config.file=$CXF_HOME/etc/logging.properties
- demo.hw.server.Server &
-
- java -Djava.util.logging.config.file=$CXF_HOME/etc/logging.properties
- demo.hw.client.Client
-
-The server process starts in the background. After running the client,
-use the kill command to terminate the server process.
-
-For Windows (may use either forward or back slashes):
- start
- java -Djava.util.logging.config.file=%CXF_HOME%\etc\logging.properties
- demo.hw.server.Server
-
- java -Djava.util.logging.config.file=%CXF_HOME%\etc\logging.properties
- demo.hw.client.Client
-
-A new command windows opens for the server process. After running the
-client, terminate the server process by issuing Ctrl-C in its command window.
Modified:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/restful_http_binding/README.txt
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/restful_http_binding/README.txt?rev=1173767&r1=1173766&r2=1173767&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/restful_http_binding/README.txt
(original)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/restful_http_binding/README.txt
Wed Sep 21 17:12:15 2011
@@ -1,49 +1,11 @@
RESTful HTTP Binding Demo
=========================
-
This demo shows how to create RESTful services using CXF's HTTP binding.
The server in the demo creates 3 different endpoints: a RESTful XML
endpoint, a RESTful JSON endpoint, and a SOAP endpoint.
-
-Prerequisites
--------------
-
-If your environment already includes cxf-manifest.jar on the
-CLASSPATH, and the JDK and ant bin directories on the PATH
-it is not necessary to set the environment as described in
-the samples directory README. If your environment is not
-properly configured, or if you are planning on using wsdl2java,
-javac, and java to build and run the demos, you must set the
-environment.
-
-
-Building and running the demo using Ant
----------------------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located), the Ant build.xml file can be used to build and run the demo.
-The server and client targets automatically build the demo.
-
-The demo has a class called demo.restful.server.Server which starts up various
-endpoints. To start this server run the command:
-
-Using either UNIX or Windows:
- ant server (from one command line window)
-
-The demo also includes a Client class which accesses data using
-HTTP. To run this client, do:
-
-Using either UNIX or Windows:
- ant client (from a second command line window)
-
-To remove the code generated from the WSDL file and the .class
-files, run "ant clean".
-
-
Building and running the demo using Maven
---------------------------------------
-
From the base directory of this sample (i.e., where this README file is
located), the maven pom.xml file can be used to build and run the demo.
@@ -66,8 +28,6 @@ To remove the code generated from the WS
files, run "mvn clean".
---------------------------------------
-
-
Once it is running try going to the following URLs:
http://localhost:8080/xml/customers
@@ -90,7 +50,6 @@ wget --post-file add.xml http://localhos
wget --post-file update.xml http://localhost:8080/xml/customers/123
And if you are interested in SOAP you can try the SOAP endpoint:
-
http://localhost:8080/soap?wsdl
-
+
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=1173767&r1=1173766&r2=1173767&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:12:15 2011
@@ -1,66 +1,10 @@
Ruby script demo
-
=================
+This example shows how to create a Ruby web service implemented with Spring.
-This example shows how to create ruby web service
-implemented with Spring.
-You'll learn how to write a simple ruby script web service.
-
-For more information
-see the documentation for this example in the
-user's guide.
-
-
-
-Prerequisite
-------------
-
-If your environment already includes cxf-manifest.jar on the
-CLASSPATH, and the JDK and ant bin directories on the PATH
-it is not necessary to set the environment as described in
-the samples directory's README. If your environment is not
-properly configured, or if you are planning on using wsdl2java,
-javac, and java to build and run the demos, you must set the
-environment.
-
-
-
-
-
-Some third-party jars need to be installed to make this sample working.
-
-
-You can run the following command to get these third-party jars
-
-:
-
-ant get.dep
-
-
-
-
-Building and running the demo using Ant
-
----------------------------------------
-
-
-From the base directory of this sample (i.e., where this README file is
-located), the Ant build.xml file can be used to build and run the demo.
-The server and client targets automatically build the demo.
-
-Using either UNIX or Windows:
-
- ant server (from one command line window)
- ant client (from a second command line window)
-
-
-To remove the code generated from the WSDL file and the .class
-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.
Modified:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/README.txt
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/README.txt?rev=1173767&r1=1173766&r2=1173767&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/README.txt
(original)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/wsdl_first_https/README.txt
Wed Sep 21 17:12:15 2011
@@ -7,19 +7,6 @@ by doing the communication using HTTPS.
Please review the README in the samples directory before
continuing.
-
-Prerequisite
-------------
-
-If your environment already includes cxf-manifest.jar on the
-CLASSPATH, and the JDK and ant bin directories on the PATH
-it is not necessary to run the environment script described in
-the samples directory README. If your environment is not
-properly configured, or if you are planning on using wsdl2java,
-javac, and java to build and run the demos, you must set the
-environment by running the script.
-
-
Building and running the demo using maven
-----------------------------------------
@@ -37,26 +24,11 @@ In separate windows:
mvn clean (removes all generated and compiled classes)"
-Building and running the demo using Ant
----------------------------------------
-From the base directory of this sample (i.e., where this README file is
-located), the Ant build.xml file can be used to build and run the demo.
-The server target automatically builds the demo.
-
-Using either UNIX or Windows:
-
- ant server
-
-
-To remove the code generated from the WSDL file and the .class
-files, run "ant clean".
-
-
The demo illustrates how authentication can be achieved through
configuration using 3 different scenarios. The non-defaulted security
policy values are be specified via configuration files or programmatically.
-Scenario 1:
+Scenario 1: (-Pinsecure.client)
A HTTPS listener is started up. The listener requires
client authentication so the client must provide suitable credentials.
@@ -67,12 +39,7 @@ from the "InsecureClient.cxf" file in th
client does NOT provide the appropriate credentials and so the
invocation on the server fails.
-To run:
-
- ant server
- ant insecure.client
-
-Scenario 2:
+Scenario 2: (-Psecure.client)
The same HTTPS listener is used. The client's security data is taken
from the "WibbleClient.cxf" configuration file in this directory,
using the bean name:
@@ -99,23 +66,14 @@ may be configured programmatically so us
employed to keep passwords from being stored in configuration files.
The approach taken here is for demonstration reasons only.
-
-To run:
-
- ant server
- ant secure.client
-
-Scenario 3:
+Scenario 3: (-Pinsecure.client.non.spring)
A HTTPS listener is started up. The client does NOT provide the appropriate
credentials programmatically and so the invocation on the server fails.
-To run:
-
- ant server
- ant insecure.client.non.spring
-Scenario 4:
+Scenario 4: (-Psecure.client.non.spring)
+
A HTTPS listener is started up. The client's security data
is in essence the same as for scenario 2, however this time it
is provided programmatically in the client code, ClientNonSpring.java.
@@ -127,11 +85,6 @@ prompting for the password.
The approach taken here is for demonstration reasons only.
-To run:
-
- ant server
- ant secure.client.non.spring
-
Certificates:
If the certificates are expired for some reason, a shell script in
bin/gencerts.sh will generate the set of certificates needed for
@@ -140,4 +93,4 @@ this sample. Just do the following:
cd certs
sh ../bin/gencerts.sh
-
+
