TUSCANY-2437 commit changes from 1.3 branch

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

8 files changed, 343 insertions, 391 deletions

diff --git a/java/sca/samples/helloworld-reference-jms/README b/java/sca/samples/helloworld-reference-jms/README
index 558504594a..184e67a239 100644
--- a/java/sca/samples/helloworld-reference-jms/README
+++ b/java/sca/samples/helloworld-reference-jms/README
@@ -1,25 +1,24 @@
-Hello World Web Service References Sample

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

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

-over a JMS protocl. 

+Hello World JMS References Sample

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

+This sample demonstrates an SCA reference 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 

 first. 

 

 If you just want to run it to see what happens you need to run the server first 

-so open a command prompt, navigate to the helloworld-ws-service-jms sample directory 

+so open a command prompt, navigate to the helloworld-service-jms sample directory 

 and do 

 

 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

 

 

 Once the server is running open a command prompt, navigate to this sample 

@@ -29,20 +28,20 @@ ant run
 

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

 

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

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

 

 and on *nix do

 

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

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

 

 

 Sample Overview

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

-The sample provides two components that are have a reference with a 

-web service binding. The binding refers to WSDL that identifies the service

-exposed by the helloworld-ws-service-jms sample. 

+The sample provides a component that has a reference with a JMS binding. 

+The binding refers to JMS queue and communicates with a service

+exposed by the helloworld-service-jms sample. 

 

-helloworld-ws-reference-jms/

+helloworld-reference-jms/

   src/

     main/

       java/

@@ -55,18 +54,15 @@ helloworld-ws-reference-jms/
                                             .composite. It then calls the 

                                             HelloWorldServiceComponent

       resources/

-        wsdl

-          helloworld.wsdl                 - the service description that the 

-                                            SCA reference uses to bind to 

-        helloworldwsjmsclient.composite   - the SCA assembly for this sample

-        helloworldwsjms.composite         - the SCA assembly for the server

+        helloworldjmsclient.composite     - the SCA assembly for this sample

+        helloworldjms.composite           - the SCA assembly for the server

                                             that is used by the JUnit tests

         logging.properties                - log4j configuration file

     test/

       java/

         helloworld/

           HelloWorldJMSClientTestCase.java - JUnit test case

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

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

                                             sample .composite file

   build.xml                               - the Ant build file

   pom.xml                                 - the Maven build file        

@@ -75,15 +71,15 @@ Building And Running The Sample Using Ant
 -----------------------------------------

 With the binary distribution the sample can be built and run using Ant. Before

 you do this start up the service that the reference will talk to. To do this

-run up the helloworld-ws-service-jms test. Take a look at the README in that sample

+run up the helloworld-service-jms test. Take a look at the README in that sample

 and you will see you need the following commands

 

-cd helloworld-ws-service-jms

+cd helloworld-service-jms

 ant run

 

 Once done you can now compile and run this sample using the following commands;

 

-cd helloworld-ws-reference-jms

+cd helloworld-reference-jms

 ant compile

 ant run

 

@@ -101,27 +97,18 @@ Building And Running The 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-service-jms sample first as the JUnit test does this for you. 

+service-jms sample first as the JUnit test does this for you. 

 

-cd helloworld-ws-reference-jms

+cd helloworld-reference-jms

 mvn

 

 You should see the following output from the test phase.

 

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

- T E S T S

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

-Running helloworld.HelloWorldJmsClientTestCase

-08-Jan-2008 10:40:15 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

-Injected helloWorldService

-Called getGreetings

-Injected helloWorldService

-Called getGreetings

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

-

+run:

+     [java] Injected helloWorldService

+     [java] Called getGreetings

+     [java] javax.naming.NameNotFoundException: RequestQueue

+     ...

+     [java] Hello World

 

 This shows that the Junit test cases have run successfully. 

diff --git a/java/sca/samples/helloworld-reference-jms/helloworld-reference.png b/java/sca/samples/helloworld-reference-jms/helloworld-reference.png
new file mode 100644
index 0000000000..ab80b1f91c
--- /dev/null
+++ b/java/sca/samples/helloworld-reference-jms/helloworld-reference.png
diff --git a/java/sca/samples/helloworld-reference-jms/helloworld-ws-reference.svg b/java/sca/samples/helloworld-reference-jms/helloworld-reference.svg
index 333ad53e0a..40f4e8f271 100644
--- a/java/sca/samples/helloworld-reference-jms/helloworld-ws-reference.svg
+++ b/java/sca/samples/helloworld-reference-jms/helloworld-reference.svg
@@ -1,150 +1,144 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://web.resource.org/cc/"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="1052.3622"

-   height="744.09448"

-   id="svg2"

-   sodipodi:version="0.32"

-   inkscape:version="0.44"

-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference"

-   sodipodi:docname="helloworld-ws-reference.svg"

-   version="1.0"

-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference\helloworld-ws-reference.png"

-   inkscape:export-xdpi="52.84"

-   inkscape:export-ydpi="52.84">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     gridtolerance="10000"

-     guidetolerance="10"

-     objecttolerance="10"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="1.4"

-     inkscape:cx="519.38407"

-     inkscape:cy="414.63224"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1054"

-     inkscape:window-height="721"

-     inkscape:window-x="85"

-     inkscape:window-y="295" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1">

-    <g

-       id="g2997"

-       transform="matrix(0.991389,0,0,1,2.215655,0)">

-      <rect

-         rx="13.79423"

-         ry="12.692303"

-         y="192.00233"

-         x="258.3114"

-         height="299.99988"

-         width="446.72086"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot2954"

-         xml:space="preserve"><flowRegion

-           id="flowRegion2956"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2958" /></flowRegion><flowPara

-           id="flowPara2960">helloworldwsclient</flowPara></flowRoot>    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2988"

-       width="115.66247"

-       height="85.862968"

-       x="432.05917"

-       y="307.1676"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(172.4684,115.2291)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2972">HelloWorld</flowPara><flowPara

-         id="flowPara1883">Service</flowPara><flowPara

-         id="flowPara1885">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "

-       id="path3017" />

-    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 528.16111,337.17632 L 561.49615,337.17632 L 567.55706,350.3083 L 560.486,362.43014 L 528.16111,362.43014 L 535.73726,350.3083 L 528.16111,337.17632 z "

-       id="path3019" />

-    <path

-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 651.01647,320.75333 L 718.80207,320.75333 L 731.12672,349.11387 L 716.74797,375.29287 L 651.01647,375.29287 L 666.4223,349.11387 L 651.01647,320.75333 z "

-       id="path1887" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1889"

-       transform="translate(388.9491,122.6895)"

-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion1891"><rect

-           id="rect1893"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara1895">HelloWorld</flowPara><flowPara

-         id="flowPara1897">Service</flowPara><flowPara

-         id="flowPara1899" /></flowRoot>    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 567.85714,349.09448 C 666.42857,348.3802 666.42857,348.3802 666.42857,348.3802"

-       id="path1901" />

-  </g>

-</svg>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1052.3622"
+   height="744.09448"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="C:\simon\tuscany\java-sca-1.3\samples\helloworld-reference-jms"
+   sodipodi:docname="helloworld-reference.svg"
+   version="1.0"
+   inkscape:export-filename="C:\simon\tuscany\java-sca-1.3\samples\helloworld-reference-jms\helloworld-reference.png"
+   inkscape:export-xdpi="70.806541"
+   inkscape:export-ydpi="70.806541"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="519.38407"
+     inkscape:cy="414.63224"
+     inkscape:document-units="px"
+     inkscape:current-layer="g2997"
+     inkscape:window-width="1054"
+     inkscape:window-height="721"
+     inkscape:window-x="179"
+     inkscape:window-y="99" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g2997"
+       transform="matrix(0.991389,0,0,1,2.215655,0)">
+      <rect
+         rx="13.79423"
+         ry="12.692303"
+         y="192.00233"
+         x="258.3114"
+         height="299.99988"
+         width="446.72086"
+         id="rect2067"
+         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <flowRoot
+         id="flowRoot2954"
+         xml:space="preserve"><flowRegion
+           id="flowRegion2956"><rect
+             y="212.66591"
+             x="281.42856"
+             height="61.42857"
+             width="170"
+             id="rect2958" /></flowRegion><flowPara
+           id="flowPara2960">helloworldjmsreference</flowPara></flowRoot>    </g>
+    <rect
+       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:4.47792912;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2988"
+       width="231.75597"
+       height="214.81361"
+       x="364.72672"
+       y="246.978"
+       rx="14.018401"
+       ry="17.82052" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot2966"
+       transform="translate(167.4684,48.086243)"><flowRegion
+         id="flowRegion2968"><rect
+           id="rect2970"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591" /></flowRegion><flowPara
+         id="flowPara2972">HelloWorld</flowPara><flowPara
+         id="flowPara1883">Service</flowPara><flowPara
+         id="flowPara1885">Component</flowPara></flowRoot>    <path
+       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 342.05152,338.30031 L 375.38656,338.30031 L 381.44747,351.43229 L 374.37641,363.55413 L 342.05152,363.55413 L 349.62767,351.43229 L 342.05152,338.30031 z "
+       id="path3017" />
+    <path
+       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.52129698px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 544.84854,320.29968 L 650.26997,320.29968 L 669.4375,362.50343 L 647.0754,401.46079 L 544.84854,401.46079 L 568.80798,362.50343 L 544.84854,320.29968 z "
+       id="path1887" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot1889"
+       transform="translate(288.9491,129.83236)"
+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
+         id="flowRegion1891"><rect
+           id="rect1893"
+           width="179.28572"
+           height="60.714283"
+           x="281.42856"
+           y="212.66591"
+           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
+         id="flowPara1897">HelloWorldService </flowPara><flowPara
+         id="flowPara2184">Reference</flowPara><flowPara
+         id="flowPara2180">JMS</flowPara><flowPara
+         id="flowPara1899" /></flowRoot>  </g>
+</svg>
diff --git a/java/sca/samples/helloworld-reference-jms/helloworld-ws-reference.png b/java/sca/samples/helloworld-reference-jms/helloworld-ws-reference.png
deleted file mode 100644
index bd2bba41db..0000000000
--- a/java/sca/samples/helloworld-reference-jms/helloworld-ws-reference.png
+++ /dev/null
diff --git a/java/sca/samples/helloworld-service-jms/README b/java/sca/samples/helloworld-service-jms/README
index 26272b1d91..49feabaa07 100644
--- a/java/sca/samples/helloworld-service-jms/README
+++ b/java/sca/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. 

diff --git a/java/sca/samples/helloworld-service-jms/helloworld-service.png b/java/sca/samples/helloworld-service-jms/helloworld-service.png
new file mode 100644
index 0000000000..ef27c71f54
--- /dev/null
+++ b/java/sca/samples/helloworld-service-jms/helloworld-service.png
diff --git a/java/sca/samples/helloworld-service-jms/helloworld-ws-service.svg b/java/sca/samples/helloworld-service-jms/helloworld-service.svg
index 8d2ae98c82..dd7a9dd87d 100644
--- a/java/sca/samples/helloworld-service-jms/helloworld-ws-service.svg
+++ b/java/sca/samples/helloworld-service-jms/helloworld-service.svg
@@ -1,150 +1,139 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://web.resource.org/cc/"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="1052.3622"

-   height="744.09448"

-   id="svg2"

-   sodipodi:version="0.32"

-   inkscape:version="0.45.1"

-   sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\helloworld-ws-service"

-   sodipodi:docname="helloworld-ws-service.svg"

-   version="1.0"

-   inkscape:export-filename="C:\simon\tuscany\java-head\sca\samples\helloworld-ws-service\helloworld-ws-service.png"

-   inkscape:export-xdpi="52.84"

-   inkscape:export-ydpi="52.84"

-   inkscape:output_extension="org.inkscape.output.svg.inkscape">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     gridtolerance="10000"

-     guidetolerance="10"

-     objecttolerance="10"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="1.4"

-     inkscape:cx="519.38407"

-     inkscape:cy="414.63224"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1054"

-     inkscape:window-height="573"

-     inkscape:window-x="117"

-     inkscape:window-y="316" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1">

-    <g

-       id="g2997"

-       transform="matrix(0.991389,0,0,1,2.215655,0)">

-      <rect

-         rx="13.79423"

-         ry="12.692303"

-         y="192.00233"

-         x="258.3114"

-         height="299.99988"

-         width="446.72086"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

-      <flowRoot

-         id="flowRoot2954"

-         xml:space="preserve"><flowRegion

-           id="flowRegion2956"><rect

-             y="212.66591"

-             x="281.42856"

-             height="61.42857"

-             width="170"

-             id="rect2958" /></flowRegion><flowPara

-           id="flowPara2960">helloworldws</flowPara></flowRoot>    </g>

-    <rect

-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

-       id="rect2988"

-       width="115.66247"

-       height="85.862968"

-       x="432.05917"

-       y="307.1676"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(172.4684,115.2291)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591" /></flowRegion><flowPara

-         id="flowPara2972">HelloWorld</flowPara><flowPara

-         id="flowPara1883">Service</flowPara><flowPara

-         id="flowPara1885">Component</flowPara></flowRoot>    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "

-       id="path3017" />

-    <path

-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 226.73064,320.75315 L 293.91185,320.75315 L 306.1266,352.82797 L 291.87606,382.43553 L 226.73064,382.43553 L 241.99911,352.82797 L 226.73064,320.75315 z "

-       id="path1892" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot1894"

-       transform="translate(-37.47944,122.8324)"

-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion

-         id="flowRegion1896"><rect

-           id="rect1898"

-           width="170"

-           height="61.42857"

-           x="281.42856"

-           y="212.66591"

-           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara

-         id="flowPara1900">HelloWorld</flowPara><flowPara

-         id="flowPara1906">Web</flowPara><flowPara

-         id="flowPara1904">Service</flowPara></flowRoot>    <path

-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 305.71429,353.3802 L 422.85714,351.95163"

-       id="path1910"

-       inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-service\helloworld-ws-service.png"

-       inkscape:export-xdpi="52.84"

-       inkscape:export-ydpi="52.84" />

-  </g>

-</svg>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1052.3622"
+   height="744.09448"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="C:\simon\tuscany\java-sca-1.3\samples\helloworld-service-jms"
+   sodipodi:docname="helloworld-service.svg"
+   version="1.0"
+   inkscape:export-filename="C:\simon\tuscany\java-sca-1.3\samples\helloworld-service-jms\helloworld-service.png"
+   inkscape:export-xdpi="70.806541"
+   inkscape:export-ydpi="70.806541"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="519.38407"
+     inkscape:cy="414.63224"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1111"
+     inkscape:window-height="783"
+     inkscape:window-x="204"
+     inkscape:window-y="141" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g2997"
+       transform="matrix(0.991389,0,0,1,2.215655,0)">
+      <rect
+         rx="13.79423"
+         ry="12.692303"
+         y="192.00233"
+         x="258.3114"
+         height="299.99988"
+         width="446.72086"
+         id="rect2067"
+         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <flowRoot
+         id="flowRoot2954"
+         xml:space="preserve"><flowRegion
+           id="flowRegion2956"><rect
+             y="212.66591"
+             x="281.42856"
+             height="61.42857"
+             width="170"
+             id="rect2958" /></flowRegion><flowPara
+           id="flowPara2960">helloworld</flowPara></flowRoot>    </g>
+    <rect
+       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:3.70037222;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2988"
+       width="201.81923"
+       height="168.4483"
+       x="387.1951"
+       y="262.30353"
+       rx="12.207596"
+       ry="13.974144" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot2966"
+       transform="translate(168.89697,70.2291)"><flowRegion
+         id="flowRegion2968"><rect
+           id="rect2970"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591" /></flowRegion><flowPara
+         id="flowPara2972">HelloWorld</flowPara><flowPara
+         id="flowPara1883">Service</flowPara><flowPara
+         id="flowPara1885">Component</flowPara></flowRoot>    <path
+       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 353.15921,319.32458 L 420.34042,319.32458 L 432.55517,351.3994 L 418.30463,381.00696 L 353.15921,381.00696 L 368.42768,351.3994 L 353.15921,319.32458 z "
+       id="path1892" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot1894"
+       transform="translate(88.234846,118.54669)"
+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
+         id="flowRegion1896"><rect
+           id="rect1898"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591"
+           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
+         id="flowPara1900">HelloWorld</flowPara><flowPara
+         id="flowPara1904">Service</flowPara><flowPara
+         id="flowPara2181">JMS</flowPara></flowRoot>  </g>
+</svg>
diff --git a/java/sca/samples/helloworld-service-jms/helloworld-ws-service.png b/java/sca/samples/helloworld-service-jms/helloworld-ws-service.png
deleted file mode 100644
index eab29d0bcd..0000000000
--- a/java/sca/samples/helloworld-service-jms/helloworld-ws-service.png
+++ /dev/null