Change all the JMS itest name attribute to jndiName

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

12 files changed, 37 insertions, 37 deletions

diff --git a/java/sca/itest/jms/format/src/main/resources/jmsbytes/helloworld.composite b/java/sca/itest/jms/format/src/main/resources/jmsbytes/helloworld.composite
index bc435b3a2d..5395bd5a3a 100644
--- a/java/sca/itest/jms/format/src/main/resources/jmsbytes/helloworld.composite
+++ b/java/sca/itest/jms/format/src/main/resources/jmsbytes/helloworld.composite
@@ -27,7 +27,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReferenceImpl" />
         <reference name="helloWorldService1" >
            <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
                 <tuscany:wireFormat.jmsBytes/>
             </binding.jms>
         </reference>  
@@ -37,7 +37,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldServiceImpl" />
         <service name="HelloWorldService">
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
                 <tuscany:wireFormat.jmsBytes/>
             </binding.jms>
         </service>
diff --git a/java/sca/itest/jms/format/src/main/resources/jmsbytesxml/helloworld.composite b/java/sca/itest/jms/format/src/main/resources/jmsbytesxml/helloworld.composite
index 6b8072db5f..57bb781e7c 100644
--- a/java/sca/itest/jms/format/src/main/resources/jmsbytesxml/helloworld.composite
+++ b/java/sca/itest/jms/format/src/main/resources/jmsbytesxml/helloworld.composite
@@ -27,7 +27,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld.HelloWorldReferenceImpl" />
         <reference name="helloWorldService1" >
            <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
                 <tuscany:wireFormat.jmsBytesXML/>
             </binding.jms>
         </reference>  
@@ -37,7 +37,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld.HelloWorldServiceImpl" />
         <service name="HelloWorldService">
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
                 <tuscany:wireFormat.jmsBytesXML/>
             </binding.jms>
         </service>
diff --git a/java/sca/itest/jms/format/src/main/resources/jmsdefault/helloworld.composite b/java/sca/itest/jms/format/src/main/resources/jmsdefault/helloworld.composite
index 9451d5316e..1b093d18fd 100644
--- a/java/sca/itest/jms/format/src/main/resources/jmsdefault/helloworld.composite
+++ b/java/sca/itest/jms/format/src/main/resources/jmsdefault/helloworld.composite
@@ -27,24 +27,24 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldReferenceImpl" />
         <reference name="helloWorldService1" >
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
             </binding.jms>
         </reference>  
         <reference name="helloWorldService2" >
             <binding.jms>
-                <destination name="HelloWorldService2"/>
+                <destination jndiName="HelloWorldService2"/>
                 <tuscany:wireFormat.jmsdefault/>
             </binding.jms>
         </reference>
         <reference name="helloWorldService3" >
             <binding.jms>
-                <destination name="HelloWorldService3"/>
+                <destination jndiName="HelloWorldService3"/>
                 <tuscany:wireFormat.jmsdefault/>
             </binding.jms>
         </reference> 
         <reference name="helloWorldService4" >
             <binding.jms>
-                <destination name="HelloWorldService4"/>
+                <destination jndiName="HelloWorldService4"/>
                 <tuscany:wireFormat.jmsdefault sendFormat="text"/>
             </binding.jms>
         </reference> 
@@ -54,7 +54,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl" />
         <service name="HelloWorldService">
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
             </binding.jms>
         </service>
     </component> 
@@ -64,7 +64,7 @@
         <service name="HelloWorldService">
             <interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldService" />
             <binding.jms>
-                <destination name="HelloWorldService2"/>
+                <destination jndiName="HelloWorldService2"/>
             </binding.jms>
         </service>
     </component>    
@@ -74,7 +74,7 @@
 	    <service name="HelloWorldService">
 	        <!--interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" /-->
             <binding.jms>
-                <destination name="HelloWorldService3"/>
+                <destination jndiName="HelloWorldService3"/>
                 <tuscany:wireFormat.jmsdefault />
             </binding.jms>
 	    </service>
@@ -85,7 +85,7 @@
         <service name="HelloWorldService">
             <!--interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" /-->
             <binding.jms>
-                <destination name="HelloWorldService4"/>
+                <destination jndiName="HelloWorldService4"/>
                 <tuscany:wireFormat.jmsdefault />
             </binding.jms>
         </service>
diff --git a/java/sca/itest/jms/format/src/main/resources/jmsmessage/helloworld.composite b/java/sca/itest/jms/format/src/main/resources/jmsmessage/helloworld.composite
index 425286b7f2..a46bcd123c 100644
--- a/java/sca/itest/jms/format/src/main/resources/jmsmessage/helloworld.composite
+++ b/java/sca/itest/jms/format/src/main/resources/jmsmessage/helloworld.composite
@@ -29,7 +29,7 @@
             <!--interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"/-->
             <interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldServiceReferenceSide"/>
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
                 <tuscany:wireFormat.jmsText/>
             </binding.jms>
         </reference>  
@@ -39,7 +39,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldServiceImpl" />
         <service name="HelloWorldService">
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
             </binding.jms>
         </service>
     </component> 
diff --git a/java/sca/itest/jms/format/src/main/resources/jmsobject/helloworld.composite b/java/sca/itest/jms/format/src/main/resources/jmsobject/helloworld.composite
index 56133c20ab..6954ba19fc 100644
--- a/java/sca/itest/jms/format/src/main/resources/jmsobject/helloworld.composite
+++ b/java/sca/itest/jms/format/src/main/resources/jmsobject/helloworld.composite
@@ -27,13 +27,13 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld.HelloWorldReferenceImpl" />
         <reference name="helloWorldServiceWrapSingle" >
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
                  <tuscany:wireFormat.jmsObject wrapSingle="true"/>
             </binding.jms>
         </reference> 
         <reference name="helloWorldServiceDontWrapSingle" >
             <binding.jms>
-                <destination name="HelloWorldService2"/>
+                <destination jndiName="HelloWorldService2"/>
                  <tuscany:wireFormat.jmsObject wrapSingle="false" />
             </binding.jms>
         </reference>          
@@ -44,7 +44,7 @@
         <service name="HelloWorldService">
             <interface.wsdl interface="http://helloworld.jmsobject.format.jms.binding.sca.tuscany.apache.org/#wsdl.interface(HelloWorldService)"/>
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
                  <tuscany:wireFormat.jmsObject wrapSingle="true"/>
             </binding.jms>
         </service>
@@ -54,7 +54,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld.HelloWorldServiceImpl" />
         <service name="HelloWorldService">
             <binding.jms>
-                <destination name="HelloWorldService2"/>
+                <destination jndiName="HelloWorldService2"/>
                 <tuscany:wireFormat.jmsObject /> <!-- test that wrapSingle default works -->
             </binding.jms>
         </service>
diff --git a/java/sca/itest/jms/format/src/main/resources/jmstext/helloworld.composite b/java/sca/itest/jms/format/src/main/resources/jmstext/helloworld.composite
index d46137749f..1f8bfcba0e 100644
--- a/java/sca/itest/jms/format/src/main/resources/jmstext/helloworld.composite
+++ b/java/sca/itest/jms/format/src/main/resources/jmstext/helloworld.composite
@@ -27,7 +27,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld.HelloWorldReferenceImpl" />
         <reference name="helloWorldService1" >
            <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
                 <tuscany:wireFormat.jmsText/>
             </binding.jms>
         </reference>  
@@ -37,7 +37,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld.HelloWorldServiceImpl" />
         <service name="HelloWorldService">
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
                 <tuscany:wireFormat.jmsText/>
             </binding.jms>
         </service>
diff --git a/java/sca/itest/jms/format/src/main/resources/jmstextxml/helloworld.composite b/java/sca/itest/jms/format/src/main/resources/jmstextxml/helloworld.composite
index 3548125daa..40eb934c1f 100644
--- a/java/sca/itest/jms/format/src/main/resources/jmstextxml/helloworld.composite
+++ b/java/sca/itest/jms/format/src/main/resources/jmstextxml/helloworld.composite
@@ -27,19 +27,19 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldReferenceImpl" />
         <reference name="helloWorldService1" >
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
                 <tuscany:wireFormat.jmsTextXML/>
             </binding.jms>
         </reference>  
         <reference name="helloWorldService2" >
             <binding.jms>
-                <destination name="HelloWorldService2"/>
+                <destination jndiName="HelloWorldService2"/>
                 <tuscany:wireFormat.jmsTextXML/>
             </binding.jms>
         </reference>
         <reference name="helloWorldService3" >
             <binding.jms>
-                <destination name="HelloWorldService3"/>
+                <destination jndiName="HelloWorldService3"/>
                 <tuscany:wireFormat.jmsTextXML/>
             </binding.jms>
         </reference>      
@@ -49,7 +49,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldServiceImpl" />
         <service name="HelloWorldService">
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
                 <tuscany:wireFormat.jmsTextXML/>
             </binding.jms>
         </service>
@@ -60,7 +60,7 @@
         <service name="HelloWorldService">
             <interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldService" />
             <binding.jms>
-                <destination name="HelloWorldService2"/>
+                <destination jndiName="HelloWorldService2"/>
                 <tuscany:wireFormat.jmsTextXML/>
             </binding.jms>
         </service>
@@ -71,7 +71,7 @@
 	    <service name="HelloWorldService">
 	        <interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" />
             <binding.jms>
-                <destination name="HelloWorldService3"/>
+                <destination jndiName="HelloWorldService3"/>
                 <tuscany:wireFormat.jmsTextXML/>
             </binding.jms>
 	    </service>
diff --git a/java/sca/itest/jms/format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite b/java/sca/itest/jms/format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
index 64ac25477f..d8f6dba5cc 100644
--- a/java/sca/itest/jms/format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
+++ b/java/sca/itest/jms/format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
@@ -27,7 +27,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.HelloWorldReferenceImpl" />
         <reference name="helloWorldService1" >
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
                 <response>
                     <tuscany:wireFormat.jmsObject/>
                 </response>
@@ -40,7 +40,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.HelloWorldServiceImpl" />
         <service name="HelloWorldService">
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
                 <response>
                     <tuscany:wireFormat.jmsObject/>
                 </response>
diff --git a/java/sca/itest/jms/responsecf/src/main/resources/cf/client.composite b/java/sca/itest/jms/responsecf/src/main/resources/cf/client.composite
index 1d95e01e51..befd2ca355 100644
--- a/java/sca/itest/jms/responsecf/src/main/resources/cf/client.composite
+++ b/java/sca/itest/jms/responsecf/src/main/resources/cf/client.composite
@@ -28,9 +28,9 @@
     <reference name="serviceA" promote="HelloWorldClient/serviceA">

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

         <binding.jms>

-            <destination name="DestQueueA"/>

+            <destination jndiName="DestQueueA"/>

             <response>

-               <destination name="RespQueueA"/>

+               <destination jndiName="RespQueueA"/>

             </response>

         </binding.jms>  

     </reference>

diff --git a/java/sca/itest/jms/responsecf/src/main/resources/cf/service.composite b/java/sca/itest/jms/responsecf/src/main/resources/cf/service.composite
index 9cd8ec4893..c9e638c549 100644
--- a/java/sca/itest/jms/responsecf/src/main/resources/cf/service.composite
+++ b/java/sca/itest/jms/responsecf/src/main/resources/cf/service.composite
@@ -24,7 +24,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

         <service name="HelloWorldService">

             <binding.jms>

-               <destination name="DestQueueA"/>

+               <destination jndiName="DestQueueA"/>

                <response>

                   <connectionFactory name="ResponseCF"/>

                </response>

diff --git a/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite b/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
index 18e4b61a10..6851acdb5d 100644
--- a/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
+++ b/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
@@ -27,12 +27,12 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldReferenceImpl" />
         <reference name="helloWorldService1" >
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
             </binding.jms>
         </reference> 
         <reference name="helloWorldService2" >
             <binding.jms>
-                <destination name="HelloWorldService2"/>
+                <destination jndiName="HelloWorldService2"/>
                 <operationProperties name="getGreetingsOne" >
                   <headers>
                      <property name="scaOperationName">getGreetingsThree</property>
@@ -46,7 +46,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldServiceImpl" />
         <service name="HelloWorldService">
             <binding.jms>
-                <destination name="HelloWorldService1"/>
+                <destination jndiName="HelloWorldService1"/>
                 <operationProperties name="getGreetingsThree" nativeOperation="getGreetingsFour">
                 </operationProperties>
             </binding.jms>
@@ -57,7 +57,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldServiceImpl" />
         <service name="HelloWorldService">
             <binding.jms>
-                <destination name="HelloWorldService2"/>
+                <destination jndiName="HelloWorldService2"/>
                 <tuscany:operationSelector.jmsdefault/>
             </binding.jms>
         </service>
diff --git a/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite b/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
index 34a6b23284..30db3df93b 100644
--- a/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
+++ b/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
@@ -27,7 +27,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop.HelloWorldReferenceImpl" />
         <reference name="helloWorldService1" >
             <binding.jms>
-                <destination name="HelloWorldService2"/>
+                <destination jndiName="HelloWorldService2"/>
                 <operationProperties name="getGreetingsOne" >
                   <headers>
                      <property name="myProperty">getGreetingsOne</property>
@@ -51,7 +51,7 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop.HelloWorldServiceImpl" />
         <service name="HelloWorldService">
             <binding.jms>
-                <destination name="HelloWorldService2"/>
+                <destination jndiName="HelloWorldService2"/>
                 <operationProperties name="getGreetingsThree" nativeOperation="getGreetingsFour">
                 </operationProperties>
                 <tuscany:operationSelector.jmsUserProp propertyName="myProperty"/>