Change the remaining JMS itest namespaces for 2.x

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

18 files changed, 41 insertions, 23 deletions

diff --git a/java/sca/itest/jms/general/src/main/resources/defaults/client.composite b/java/sca/itest/jms/general/src/main/resources/defaults/client.composite
index 02aef2f1b0..b33177fb1b 100644
--- a/java/sca/itest/jms/general/src/main/resources/defaults/client.composite
+++ b/java/sca/itest/jms/general/src/main/resources/defaults/client.composite
@@ -18,6 +18,7 @@
  * under the License.    

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://itest"

            name="DefaultClientComposite">

 

     <component name="HelloWorldClient">

diff --git a/java/sca/itest/jms/general/src/main/resources/defaults/service.composite b/java/sca/itest/jms/general/src/main/resources/defaults/service.composite
index 565573931a..a4de896f24 100644
--- a/java/sca/itest/jms/general/src/main/resources/defaults/service.composite
+++ b/java/sca/itest/jms/general/src/main/resources/defaults/service.composite
@@ -18,6 +18,7 @@
  * under the License.    

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://itest"

            name="DefaultServiceComposite">

 

     <component name="HelloWorldService">

diff --git a/java/sca/itest/jms/general/src/main/resources/dynamic/client.composite b/java/sca/itest/jms/general/src/main/resources/dynamic/client.composite
index 727a524396..1d4413d371 100644
--- a/java/sca/itest/jms/general/src/main/resources/dynamic/client.composite
+++ b/java/sca/itest/jms/general/src/main/resources/dynamic/client.composite
@@ -18,6 +18,7 @@
  * under the License.    

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://itest"

            name="DynamicComposite">

 

     <component name="HelloWorldClient">

@@ -28,7 +29,7 @@
     <reference name="serviceA" promote="HelloWorldClient/serviceA">

         <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

         <binding.jms>

-            <destination name="DestQueueA"/>

+            <destination jndiName="DestQueueA"/>

             <!-- No response destination defined means a temporary queue will be used -->

         </binding.jms>  

     </reference>

diff --git a/java/sca/itest/jms/general/src/main/resources/exceptions/client.composite b/java/sca/itest/jms/general/src/main/resources/exceptions/client.composite
index a3a439466d..1a60a9f52c 100644
--- a/java/sca/itest/jms/general/src/main/resources/exceptions/client.composite
+++ b/java/sca/itest/jms/general/src/main/resources/exceptions/client.composite
@@ -18,6 +18,7 @@
  * under the License.    

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://itest"

            name="ExceptionClientComposite">

 

     <component name="ExceptionServiceClient">

diff --git a/java/sca/itest/jms/general/src/main/resources/exceptions/service.composite b/java/sca/itest/jms/general/src/main/resources/exceptions/service.composite
index 34a7c54f38..6875772d56 100644
--- a/java/sca/itest/jms/general/src/main/resources/exceptions/service.composite
+++ b/java/sca/itest/jms/general/src/main/resources/exceptions/service.composite
@@ -18,6 +18,7 @@
  * under the License.    

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://itest"

            name="ExceptionServiceComposite">

 

     <component name="ExceptionService">

diff --git a/java/sca/itest/jms/general/src/main/resources/external/client.composite b/java/sca/itest/jms/general/src/main/resources/external/client.composite
index 6d72267454..bc9f3160ab 100644
--- a/java/sca/itest/jms/general/src/main/resources/external/client.composite
+++ b/java/sca/itest/jms/general/src/main/resources/external/client.composite
@@ -18,6 +18,7 @@
  * under the License.    

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://itest"

            name="ExternalClientComposite">

 

     <component name="HelloWorldClient">

@@ -28,9 +29,9 @@
     <reference name="serviceA" promote="HelloWorldClient/serviceA">

         <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

         <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">

-            <destination name="DestQueueA"/>

+            <destination jndiName="DestQueueA"/>

             <response>

-               <destination name="RespQueueA"/>

+               <destination jndiName="RespQueueA"/>

             </response>

         </binding.jms>  

     </reference>

diff --git a/java/sca/itest/jms/general/src/main/resources/external/service.composite b/java/sca/itest/jms/general/src/main/resources/external/service.composite
index b9e4bae77c..8a76d8cd29 100644
--- a/java/sca/itest/jms/general/src/main/resources/external/service.composite
+++ b/java/sca/itest/jms/general/src/main/resources/external/service.composite
@@ -18,15 +18,16 @@
  * under the License.    

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://itest"

            name="ExternalServiceComposite">

 

     <component name="HelloWorldService">

         <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

         <service name="HelloWorldService">

             <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">

-               <destination name="DestQueueA" create="always"/>

+               <destination jndiName="DestQueueA" create="always"/>

                <response>

-                  <destination name="RespQueueA" create="always"/>

+                  <destination jndiName="RespQueueA" create="always"/>

                </response>

             </binding.jms>  

         </service> 

diff --git a/java/sca/itest/jms/general/src/main/resources/nonSCAclient/service.composite b/java/sca/itest/jms/general/src/main/resources/nonSCAclient/service.composite
index 8e88f8d803..4904565381 100644
--- a/java/sca/itest/jms/general/src/main/resources/nonSCAclient/service.composite
+++ b/java/sca/itest/jms/general/src/main/resources/nonSCAclient/service.composite
@@ -18,6 +18,7 @@
  * under the License.

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://itest"

            name="ServiceComposite">

 

     <component name="DefaultService">

diff --git a/java/sca/itest/jms/general/src/main/resources/oneway/OneWayClient.composite b/java/sca/itest/jms/general/src/main/resources/oneway/OneWayClient.composite
index c851d4127c..1c6ace9600 100644
--- a/java/sca/itest/jms/general/src/main/resources/oneway/OneWayClient.composite
+++ b/java/sca/itest/jms/general/src/main/resources/oneway/OneWayClient.composite
@@ -18,6 +18,7 @@
  * under the License.    

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://itest"

            name="OneWayClientComposite">

 

     <component name="OneWayClient">

@@ -28,7 +29,7 @@
     <reference name="serviceA" promote="OneWayClient/serviceA">

         <interface.java interface="org.apache.tuscany.sca.binding.jms.OneWayService" />

         <binding.jms>

-            <destination name="DestQueueA"/>

+            <destination jndiName="DestQueueA"/>

         </binding.jms>  

     </reference>

 

diff --git a/java/sca/itest/jms/general/src/main/resources/oneway/OneWayService.composite b/java/sca/itest/jms/general/src/main/resources/oneway/OneWayService.composite
index 3a996b37f0..e41e226994 100644
--- a/java/sca/itest/jms/general/src/main/resources/oneway/OneWayService.composite
+++ b/java/sca/itest/jms/general/src/main/resources/oneway/OneWayService.composite
@@ -18,13 +18,14 @@
  * under the License.    

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://itest"

            name="OneWayServiceComposite">

 

     <component name="OneWayService">

         <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

         <service name="OneWayService">

             <binding.jms>

-               <destination name="DestQueueA" create="always"/>

+               <destination jndiName="DestQueueA" create="always"/>

             </binding.jms>  

         </service> 

     </component>       

diff --git a/java/sca/itest/jms/general/src/main/resources/policyHeaders/policyHeaders.composite b/java/sca/itest/jms/general/src/main/resources/policyHeaders/policyHeaders.composite
index 96e78516bd..13b5ed3986 100644
--- a/java/sca/itest/jms/general/src/main/resources/policyHeaders/policyHeaders.composite
+++ b/java/sca/itest/jms/general/src/main/resources/policyHeaders/policyHeaders.composite
@@ -18,7 +18,7 @@
  * under the License.    
  -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://jms"
+           targetNamespace="http://itest"
            name="PropertiesClientComposite">
 
     <component name="ClientComponent">
diff --git a/java/sca/itest/jms/general/src/main/resources/properties/properties.composite b/java/sca/itest/jms/general/src/main/resources/properties/properties.composite
index 9563314b8e..7f443c7622 100644
--- a/java/sca/itest/jms/general/src/main/resources/properties/properties.composite
+++ b/java/sca/itest/jms/general/src/main/resources/properties/properties.composite
@@ -18,7 +18,7 @@
  * under the License.    

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-           targetNamespace="http://jms"

+           targetNamespace="http://itest"

            name="PropertiesClientComposite">

 

     <component name="ClientComponent">

diff --git a/java/sca/itest/jms/general/src/main/resources/simple/client.composite b/java/sca/itest/jms/general/src/main/resources/simple/client.composite
index 748e79ab60..b618b6a9a7 100644
--- a/java/sca/itest/jms/general/src/main/resources/simple/client.composite
+++ b/java/sca/itest/jms/general/src/main/resources/simple/client.composite
@@ -18,6 +18,7 @@
  * under the License.    

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://itest"

            name="SimpleClientComposite">

 

     <component name="HelloWorldClient">

@@ -28,10 +29,10 @@
     <reference name="serviceA" promote="HelloWorldClient/serviceA">

         <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

         <binding.jms>

-            <destination name="DestQueueA">

+            <destination jndiName="DestQueueA">

             </destination>

             <response>

-               <destination name="RespQueueA"/>

+               <destination jndiName="RespQueueA"/>

             </response>

         </binding.jms>  

     </reference>

diff --git a/java/sca/itest/jms/general/src/main/resources/simple/mpclient.composite b/java/sca/itest/jms/general/src/main/resources/simple/mpclient.composite
index 790a52cbf3..d1864c5339 100644
--- a/java/sca/itest/jms/general/src/main/resources/simple/mpclient.composite
+++ b/java/sca/itest/jms/general/src/main/resources/simple/mpclient.composite
@@ -18,6 +18,7 @@
  * under the License.    

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://itest"

            name="MPClientComposite">

 

     <component name="HelloWorldClientMP">

@@ -28,9 +29,9 @@
     <reference name="serviceMP" promote="HelloWorldClientMP/serviceA">

         <interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />

         <binding.jms messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">

-            <destination name="DestQueueMP"/>

+            <destination jndiName="DestQueueMP"/>

             <response>

-               <destination name="RespQueueMP"/>

+               <destination jndiName="RespQueueMP"/>

             </response>

         </binding.jms>  

     </reference>

diff --git a/java/sca/itest/jms/general/src/main/resources/simple/mpservice.composite b/java/sca/itest/jms/general/src/main/resources/simple/mpservice.composite
index b6b761564e..e6bd005698 100644
--- a/java/sca/itest/jms/general/src/main/resources/simple/mpservice.composite
+++ b/java/sca/itest/jms/general/src/main/resources/simple/mpservice.composite
@@ -18,16 +18,17 @@
  * under the License.    
  -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+           targetNamespace="http://itest"
            name="MPServiceComposite">
 
     <component name="HelloWorldServiceMP">
         <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
         <service name="HelloWorldService">
             <binding.jms messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">
-               <destination name="DestQueueMP" create="always"> 
+               <destination jndiName="DestQueueMP" create="always"> 
                </destination>
                <response>
-                  <destination name="RespQueueMP" create="always"/>
+                  <destination jndiName="RespQueueMP" create="always"/>
                </response>
             </binding.jms>  
         </service> 
diff --git a/java/sca/itest/jms/general/src/main/resources/simple/service.composite b/java/sca/itest/jms/general/src/main/resources/simple/service.composite
index 76622a767c..01553a968c 100644
--- a/java/sca/itest/jms/general/src/main/resources/simple/service.composite
+++ b/java/sca/itest/jms/general/src/main/resources/simple/service.composite
@@ -18,16 +18,17 @@
  * under the License.    

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://itest"

            name="SimpleServiceComposite">

 

     <component name="HelloWorldService">

         <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

         <service name="HelloWorldService">

             <binding.jms>

-               <destination name="DestQueueA" create="always"> 

+               <destination jndiName="DestQueueA" create="always"> 

                </destination>

                <response>

-                  <destination name="RespQueueA" create="always"/>

+                  <destination jndiName="RespQueueA" create="always"/>

                </response>

             </binding.jms>  

         </service> 

diff --git a/java/sca/itest/jms/general/src/main/resources/simple/uriclient.composite b/java/sca/itest/jms/general/src/main/resources/simple/uriclient.composite
index f5f237e07d..97918428a9 100644
--- a/java/sca/itest/jms/general/src/main/resources/simple/uriclient.composite
+++ b/java/sca/itest/jms/general/src/main/resources/simple/uriclient.composite
@@ -18,6 +18,7 @@
  * under the License.    

  -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"

+           targetNamespace="http://itest"

            name="URIClientComposite">

 

     <component name="HelloWorldClient">

diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
index 9fb6fd97e6..04d4663b13 100644
--- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
@@ -20,6 +20,8 @@ package org.apache.tuscany.sca.binding.jms;
 
 import static org.junit.Assert.assertEquals;
 
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -29,25 +31,26 @@ import org.junit.Test;
  */
 public class RPCTestCase {
 
-    private static SCADomain scaDomain;
+    private Node node;
 
     @Before
     public void init() {
-        scaDomain =
-            SCADomain.newInstance("http://localhost", "/", "simple/client.composite", "simple/service.composite");
+        node = NodeFactory.newInstance().createNode().start();
+//        scaDomain =
+//            SCADomain.newInstance("http://localhost", "/", "simple/client.composite", "simple/service.composite");
         // scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
     }
 
     @Test
     public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
+        HelloWorldService helloWorldService = node.getService(HelloWorldService.class, "HelloWorldClient");
         assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
     }
 
     @After
     public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
+        if (node != null) {
+            node.stop();
         }
     }
 }