Author: coheigea Date: Thu Jun 14 11:12:47 2012 New Revision: 1350192 URL: http://svn.apache.org/viewvc?rev=1350192&view=rev Log: Merged revisions 1350190 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1350190 | coheigea | 2012-06-14 12:07:15 +0100 (Thu, 14 Jun 2012) | 18 lines Merged revisions 1350187 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1350187 | coheigea | 2012-06-14 11:55:57 +0100 (Thu, 14 Jun 2012) | 10 lines Merged revisions 1350186 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1350186 | coheigea | 2012-06-14 11:52:02 +0100 (Thu, 14 Jun 2012) | 2 lines Minor spelling fixes to the sample READMEs ........ ........ ........ Added: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/oauth/ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/oauth/README.TXT Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/corba/bank/README.txt cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/README.txt cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/README.txt cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/README.txt Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/corba/bank/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/corba/bank/README.txt?rev=1350192&r1=1350191&r2=1350192&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/corba/bank/README.txt (original) +++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/corba/bank/README.txt Thu Jun 14 11:12:47 2012 @@ -3,7 +3,7 @@ CORBA Bank Demo This demo illustrates the user of JAX-WS API's for creating a service that uses the CORBA/IIOP protocol for communication. It also -shows throwing exceptions accross that connection. +shows throwing exceptions across that connection. Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/README.txt?rev=1350192&r1=1350191&r2=1350192&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/README.txt (original) +++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/README.txt Thu Jun 14 11:12:47 2012 @@ -18,7 +18,7 @@ certificates. Likewise the client authenticates the server's certificate "CN=Cherry" and chain against the same trust store. Note also the usage of the cipherSuitesFilter configuration in the configuration files, -where each party imposes different ciphersuites contraints, so that the +where each party imposes different ciphersuites constraints, so that the ciphersuite eventually negotiated during the TLS handshake is acceptable to both sides. This may be viewed by adding a -Djavax.net.debug=all argument to the JVM. Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/README.txt?rev=1350192&r1=1350191&r2=1350192&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/README.txt (original) +++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/README.txt Thu Jun 14 11:12:47 2012 @@ -3,7 +3,7 @@ JAX-WS Dispatch/Provider Demo The demo demonstrates the use of JAX-WS Dispatch and Provider interface. The client side Dispatch instance invokes upon an endpoint using a JAX-WS -Provider implementor. There are three differnt invocations from the client. +Provider implementor. There are three different invocations from the client. The first uses the SOAPMessage data in MESSAGE mode. The second uses the DOMSource data in MESSAGE mode. The third uses the DOMSource in PAYLOAD mode. The three different messages are constructed by reading in the XML files found in the Added: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/oauth/README.TXT URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/oauth/README.TXT?rev=1350192&view=auto ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/oauth/README.TXT (added) +++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/oauth/README.TXT Thu Jun 14 11:12:47 2012 @@ -0,0 +1,63 @@ +OAuth 1.0a demo (client and server) +======================================== +The OAuth 1.0a demo that shows protocol's flow between OAuth parties. Demo contains two parts: + + client: + A web application capable of making OAuth-authenticated requests. It is a usual OAuth client, + not dependent on Apache CXF framework, built to test this demo server part and for OAuth + educational purposes. Implementation works with any OAuth 1.0a providers, not only included + in this demo. + + + server: + A web application capable of accepting OAuth-authenticated requests. It is based on Apache + CXF OAuth module. It exposes OAuth endpoints and protected resources in the form of JAX-RS + services. Server demo shows and explains how CXF OAuth module can be configured to secure + JAX-RS services and integrated with existing web applications. + +Building and running the demo using maven +--------------------------------------- + + client: + Main directory of client demo application is located in folder: "client", in base folder + of this sample. + To start demo app use maven command: + + mvn jetty:run + + It will cause in starting Jetty web server and deploying client application at host on port: 8080. + Port number is defined in pom.xml. + + server: + Main directory of server demo application is located in folder: "server", in base folder + of this sample. + To start demo app use maven command: + + mvn jetty:run + + It will cause in starting Jetty web server and deploying client application at host on port: 8081. + Port number is defined in pom.xml. + + + Both client and server modules depend on Spring 3, so you need to use CXF spring3 profile. + You can build both client and server modules using command: + + mvn clean install + + and deploy war from 'target' folder in selected web container. + +Performing steps in the OAuth flow +----------------------------- +When you have successfully deployed client and server you can start with OAuth steps: +1. Go to OAuth server (http://localhost:8081) and login with given username and password +2. Provide details and register new application at the OAuth server. +3. You have registered client application at the OAuth server, with associated and displayed + client identifier, client shared-secret and callback url. You will need those on the client side. +4. Go to OAuth client demo (http://localhost:8080) and provide information about the registered application. +5. Perform usual OAuth 1.0 flow steps + + + +Running OAuth 1.0a demo at Google App Engine +----------------------------- +//todo add challenges in deploying demo to GAE Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/README.txt?rev=1350192&r1=1350191&r2=1350192&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/README.txt (original) +++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/ws_security/ut/README.txt Thu Jun 14 11:12:47 2012 @@ -67,7 +67,7 @@ Using either UNIX or Windows: mvn install (builds the demo) mvn -Pserver (from one command line window) - Mvn -Pclient (from a second command line window) + mvn -Pclient (from a second command line window) On startup, the client makes a sequence of 4 two-way invocations.
