Correct the format of all the jms uri's

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

11 files changed, 24 insertions, 24 deletions

diff --git a/sca-java-2.x/trunk/itest/jms/args/src/main/resources/selectors/selectors.composite b/sca-java-2.x/trunk/itest/jms/args/src/main/resources/selectors/selectors.composite
index 827d3a7dc8..fcda648f1c 100644
--- a/sca-java-2.x/trunk/itest/jms/args/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/trunk/itest/jms/args/src/main/resources/selectors/selectors.composite
@@ -24,7 +24,7 @@
     <component name="Client1">

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

         <reference name="serviceA">

-           <binding.jms uri="jms:MyService" />

+           <binding.jms uri="jms:jndi:MyService" />

         </reference>

     </component>

 

diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/client.composite b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/client.composite
index 671fddaa34..64d45f1816 100644
--- a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/client.composite
@@ -24,9 +24,9 @@
     <component name="ClientComponent">

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

         <reference name="myService">

-            <binding.jms uri="jms:ServiceQueue"/>

+            <binding.jms uri="jms:jndi:ServiceQueue"/>

             <callback>

-                <binding.jms uri="jms:CallbackQueue"/>

+                <binding.jms uri="jms:jndi:CallbackQueue"/>

             </callback>

         </reference>

     </component>

@@ -34,9 +34,9 @@
     <component name="ServiceComponent">

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

         <service name="JMSService">

-            <binding.jms uri="jms:ServiceQueue"/>

+            <binding.jms uri="jms:jndi:ServiceQueue"/>

             <callback>

-                <binding.jms uri="jms:CallbackQueue"/>

+                <binding.jms uri="jms:jndi:CallbackQueue"/>

             </callback>

         </service>

     </component>

diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/tempq.composite b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/tempq.composite
index e140bdf9b7..f9bccedfe9 100644
--- a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/tempq.composite
+++ b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/tempq.composite
@@ -30,7 +30,7 @@ The client component does not define the callback destination so a temporary que
     <component name="TQClientComponent">

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

         <reference name="myService">

-            <binding.jms uri="jms:TQServiceQueue"/>

+            <binding.jms uri="jms:jndi:TQServiceQueue"/>

             <callback>

                 <binding.jms />

             </callback>

@@ -40,7 +40,7 @@ The client component does not define the callback destination so a temporary que
     <component name="TQServiceComponent">

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

         <service name="JMSService">

-            <binding.jms uri="jms:TQServiceQueue"/>

+            <binding.jms uri="jms:jndi:TQServiceQueue"/>

             <callback>

                 <binding.jms />

             </callback>

diff --git a/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/client.composite b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/client.composite
index 06010956aa..ebafbb6bcd 100644
--- a/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/client.composite
+++ b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/client.composite
@@ -24,7 +24,7 @@
     <component name="HelloWorldClient">

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

         <reference name="serviceA">

-            <binding.jms uri="jms:HelloWorldService" />

+            <binding.jms uri="jms:jndi:HelloWorldService" />

         </reference>

     </component>

 

diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/client.composite b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
index 162d7d68b8..86451dcf02 100644
--- a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
+++ b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
@@ -24,7 +24,7 @@
     <component name="ExceptionServiceClient">

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

         <reference name="service">

-            <binding.jms uri="jms:ExceptionService" />

+            <binding.jms uri="jms:jndi:ExceptionService" />

         </reference>

     </component>

 

diff --git a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
index 16474865ce..67d5038a51 100644
--- a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
+++ b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
@@ -35,7 +35,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

         <service name="OneWayService">

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

-                         uri="jms:TextDest">

+                         uri="jms:jndi:TextDest">

                 <tuscany:wireFormat.jmsText/>

             </binding.jms>

         </service>

@@ -45,7 +45,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayObjectServiceImpl"/>

         <service name="OneWayObjectService">

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

-                         uri="jms:ObjectDest">

+                         uri="jms:jndi:ObjectDest">

                 <tuscany:wireFormat.jmsObject /> <!-- test that wrapSingle default works -->

             </binding.jms>

         </service>

diff --git a/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/nulls.composite b/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/nulls.composite
index 64fc9f9345..1aa17808bf 100644
--- a/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/nulls.composite
+++ b/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/nulls.composite
@@ -25,7 +25,7 @@
     <component name="Client1">

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

         <reference name="serviceA">

-           <binding.jms uri="jms:MyService" />

+           <binding.jms uri="jms:jndi:MyService" />

         </reference>

     </component>

 

@@ -39,7 +39,7 @@
     <component name="Client2">

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

         <reference name="serviceA">

-           <binding.jms uri="jms:MyService2">

+           <binding.jms uri="jms:jndi:MyService2">

               <tuscany:wireFormat.jmsObject/>

            </binding.jms>

         </reference>

@@ -48,7 +48,7 @@
     <component name="Service2">

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

         <service name="MyService">

-            <binding.jms uri="jms:MyService2">

+            <binding.jms uri="jms:jndi:MyService2">

               <tuscany:wireFormat.jmsObject/>

            </binding.jms>

         </service> 

diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
index c6ea015d85..68f93669ec 100644
--- a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
+++ b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
@@ -24,7 +24,7 @@
     <component name="ClientComponent">

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

         <reference name="myService" requires="priority.medium">

-            <binding.jms uri="jms:ServiceQueue">

+            <binding.jms uri="jms:jndi:ServiceQueue">

                <headers type="myType"

                         deliveryMode="persistent"

                         timeToLive="4321"	

@@ -38,7 +38,7 @@
     <component name="ServiceComponent">

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

         <service name="MsgService">

-            <binding.jms uri="jms:ServiceQueue"/>

+            <binding.jms uri="jms:jndi:ServiceQueue"/>

         </service>

     </component>

 

diff --git a/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/properties/properties.composite b/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/properties/properties.composite
index 12c26132a2..234bfa7fcf 100644
--- a/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/properties/properties.composite
+++ b/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/properties/properties.composite
@@ -24,7 +24,7 @@
     <component name="ClientComponent">

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

         <reference name="myService">

-            <binding.jms uri="jms:ServiceQueue">

+            <binding.jms uri="jms:jndi:ServiceQueue">

                <headers type="myType"

                         deliveryMode="persistent"

                         timeToLive="4321"	

@@ -46,7 +46,7 @@
     <component name="ServiceComponent">

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

         <service name="MsgService">

-            <binding.jms uri="jms:ServiceQueue"/>

+            <binding.jms uri="jms:jndi:ServiceQueue"/>

         </service>

     </component>

 

diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/selectors/selectors.composite b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/selectors/selectors.composite
index 651cbe81a4..1a408dfb9a 100644
--- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/selectors/selectors.composite
@@ -25,7 +25,7 @@
     <component name="Client1">

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

         <reference name="serviceA">

-           <binding.jms uri="jms:ServiceTopic" >

+           <binding.jms uri="jms:jndi:ServiceTopic" >

               <headers type="type1" />

            </binding.jms>

         </reference>

@@ -34,7 +34,7 @@
     <component name="Client2">

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

         <reference name="serviceA">

-           <binding.jms uri="jms:ServiceTopic" >

+           <binding.jms uri="jms:jndi:ServiceTopic" >

               <headers type="type2" />

            </binding.jms>

         </reference>

@@ -43,14 +43,14 @@
     <component name="Service1">

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

         <service name="SelectorService">

-            <binding.jms uri="jms:ServiceTopic" />

+            <binding.jms uri="jms:jndi:ServiceTopic" />

         </service> 

     </component>       

 

     <component name="Service2">

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

         <service name="SelectorService">

-            <binding.jms uri="jms:ServiceTopic" >

+            <binding.jms uri="jms:jndi:ServiceTopic" >

                <messageSelection selector="JMSType = 'type1'"/>

             </binding.jms>

         </service> 

@@ -59,7 +59,7 @@
     <component name="Service3">

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

         <service name="SelectorService">

-            <binding.jms uri="jms:ServiceTopic" >

+            <binding.jms uri="jms:jndi:ServiceTopic" >

                <messageSelection selector="JMSType = 'type2'"/>

             </binding.jms>

         </service> 

diff --git a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
index 2e47288c04..8295fb10c9 100644
--- a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
+++ b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
@@ -24,7 +24,7 @@
     <component name="HelloWorldClient">

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

         <reference name="serviceA">

-            <binding.jms uri="jms:DestQueueA" />

+            <binding.jms uri="jms:jndi:DestQueueA" />

         </reference>

     </component>