TUSCANY-2437 Fix READMEs and Diagrams

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@673369 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 34 insertions, 52 deletions

diff --git a/branches/sca-java-1.3/samples/helloworld-service-jms/README b/branches/sca-java-1.3/samples/helloworld-service-jms/README
index 26272b1d91..49feabaa07 100644
--- a/branches/sca-java-1.3/samples/helloworld-service-jms/README
+++ b/branches/sca-java-1.3/samples/helloworld-service-jms/README
@@ -1,7 +1,6 @@
-Hello World SOAP/JMS Service Sample

-===================================

-This sample demonstrates an SCA service that uses a web service binding using 

-a SOAP/JMS protocol 

+Hello World JMS Service Sample

+==============================

+This sample demonstrates an SCA service that uses a JMS binding 

 

 The README in the samples directory (the directory above this) provides 

 general instructions about building and running samples. Take a look there 

@@ -14,21 +13,21 @@ ant run
 

 OR if you don't have ant, on Windows do

 

-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-service-jms.jar helloworld.HelloWorldServer

+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-service-jms.jar helloworld.HelloWorldServer

 

 and on *nix do

 

-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service-jms.jar helloworld.HelloWorldServer

+java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-service-jms.jar helloworld.HelloWorldServer

 

-Now the server is started you can use the helloworld-ws-reference-jms sample to 

+Now the server is started you can use the helloworld-reference-jms sample to 

 exercise it. 

 

 Sample Overview

 ---------------

 The sample provides a single component that is wired to a service with a 

-web service binding.

+JMS binding.

 

-helloworld-ws-service-jms/

+helloworld-service-jms/

   src/

     main/

       java/

@@ -37,23 +36,17 @@ helloworld-ws-service-jms/
                                             HelloWorldServiceComponent

           HelloWorldImpl.java             - component implementation

           HelloWorldServer.java           - starts the SCA Runtime and 

-                                            deploys the helloworldwsjms

+                                            deploys the helloworldjmsservice

                                             .composite and then waits for the

-                                            service to be called via web services

+                                            service to be called via JMS

       resources/

-        wsdl/

-          helloworld.wsdl                 - the service description that describes

-                                            the exposed service

-        helloworldwsjms.composite         - the SCA assembly for this sample

-        helloworldwsjmspolicy.composite   - shows how the protocol can be 

-                                            selected using policy. Not run

-                                            by the sample

+        helloworldjmsservice.composite    - the SCA assembly for this sample

+

     test/

       java/

         helloworld/

           HelloWorldJMSServerTestCase.java- JUnit test case 

-          HelloWorldJMSPolicyServerTestCase.java- JUnit test case 

-  helloworld-ws-service.png               - a pictorial representation of the 

+  helloworld-service.png                  - a pictorial representation of the 

                                             sample .composite file

   build.xml                               - the Ant build file

   pom.xml                                 - the Maven build file        

@@ -63,7 +56,7 @@ Building And Running The Sample Using Ant
 With the binary distribution the sample can be built and run using Ant using the 

 following commands

 

-cd helloworld-ws-service-jms

+cd helloworld-service-jms

 ant compile

 ant run

 

@@ -75,45 +68,34 @@ om.util.StAXUtils).
      [java] log4j:WARN Please initialize the log4j system properly.

      [java] HelloWorld server started (press enter to shutdown)

      

-As this point the SCA service is exposed as a web service by a web server 

+As this point the SCA service is exposed as a JMS service via ActiveMQ which is

 started automatically by the SCA runtime. To stop the server just press 

 enter.

 

-To exercise the service run up the helloworld-ws-reference-jms sample. Take a look at 

+To exercise the service run up the helloworld-reference-jms sample. Take a look at 

 the README in that sample and you will see you need the following commands

 

-cd helloworld-ws-reference-jms

+cd helloworld-reference-jms

 ant run

 

-Building And Running The Sample Using Maven 

+Building Sample Using Maven 

 -------------------------------------------

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. When using Maven you don't need to run the helloworld-

-ws-reference-jms sample as Maven includes a simple ping test to make sure that the

-service is available

+With either the binary or source distributions the sample can be built 

+using Maven as follows. 

 

-cd helloworld-ws-service-jms

+cd helloworld-service-jms

 mvn

 

-You should see the following output from the test phase.

-

--------------------------------------------------------

- T E S T S

--------------------------------------------------------

-Running helloworld.HelloWorldJmsPolicyServerTestCase

-08-Jan-2008 10:41:17 org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvide

-r start

-INFO: Axis2 JMS URL=jms:/HelloWorldServiceComponent?java.naming.factory.initial=

-org.apache.activemq.jndi.ActiveMQInitialContextFactory&java.naming.provider.url=

-tcp://localhost:61619&transport.jms.ConnectionFactoryJNDIName=QueueConnectionFac

-tory

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.984 sec

-Running helloworld.HelloWorldJmsServerTestCase

-08-Jan-2008 10:41:22 org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvide

-r start

-INFO: Axis2 JMS URL=jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=Qu

-eueConnectionFactory&java.naming.factory.initial=org.apache.activemq.jndi.Active

-MQInitialContextFactory&java.naming.provider.url=tcp://localhost:61619

-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.266 sec

-

-This shows that the Junit test cases have run successfully. 

+You should see the following output 

+

+...

+[INFO] ------------------------------------------------------------------------

+[INFO] BUILD SUCCESSFUL

+[INFO] ------------------------------------------------------------------------

+[INFO] Total time: 15 seconds

+[INFO] Finished at: Wed Jul 02 12:50:24 BST 2008

+[INFO] Final Memory: 13M/51M

+[INFO] ------------------------------------------------------------------------

+

+

+This shows that the module has compiled successfully.