TUSCANY-3453 - Updating JMS tests composites to comply with 'sequence' restrictions

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

10 files changed, 26 insertions, 26 deletions

diff --git a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/exceptions/service.composite b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/exceptions/service.composite
index c2cb1a8cb7..42e33330d7 100644
--- a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/exceptions/service.composite
+++ b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/exceptions/service.composite
@@ -35,8 +35,8 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceImpl"/>

         <service name="ExceptionService">

             <binding.jms>

+                 <tuscany:wireFormat.jmsObject/>            

                  <destination jndiName="ObjectExceptionService"/>

-                 <tuscany:wireFormat.jmsObject/>

             </binding.jms>

         </service> 

     </component>       

diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
index df1d138b0c..cdd079810e 100644
--- a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
@@ -27,8 +27,8 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReferenceImpl" />

         <reference name="helloWorldService1" >

            <binding.jms>

+                <tuscany:wireFormat.jmsBytes/>           

                 <destination jndiName="HelloWorldService1"/>

-                <tuscany:wireFormat.jmsBytes/>

             </binding.jms>

         </reference>  

     </component>

@@ -37,8 +37,8 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldServiceImpl" />

         <service name="HelloWorldService">

             <binding.jms>

+                <tuscany:wireFormat.jmsBytes/>            

                 <destination jndiName="HelloWorldService1"/>

-                <tuscany:wireFormat.jmsBytes/>

             </binding.jms>

         </service>

     </component> 

diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
index 8eb3dda8b8..f74ab86a14 100644
--- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
@@ -27,8 +27,8 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld.HelloWorldReferenceImpl" />

         <reference name="helloWorldService1" >

            <binding.jms>

-                <destination jndiName="HelloWorldService1"/>

                 <tuscany:wireFormat.jmsBytesXML/>

+                <destination jndiName="HelloWorldService1"/>

             </binding.jms>

         </reference>  

     </component>

@@ -37,8 +37,8 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld.HelloWorldServiceImpl" />

         <service name="HelloWorldService">

             <binding.jms>

-                <destination jndiName="HelloWorldService1"/>

                 <tuscany:wireFormat.jmsBytesXML/>

+                <destination jndiName="HelloWorldService1"/>

             </binding.jms>

         </service>

     </component> 

diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
index d6a0202ad6..96fa9abce5 100644
--- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
@@ -32,20 +32,20 @@
         </reference>  

         <reference name="helloWorldService2" >

             <binding.jms>

-                <destination jndiName="HelloWorldService2"/>

                 <tuscany:wireFormat.jmsdefault/>

+                <destination jndiName="HelloWorldService2"/>

             </binding.jms>

         </reference>

         <reference name="helloWorldService3" >

             <binding.jms>

-                <destination jndiName="HelloWorldService3"/>

                 <tuscany:wireFormat.jmsdefault/>

+                <destination jndiName="HelloWorldService3"/>

             </binding.jms>

         </reference> 

         <reference name="helloWorldService4" >

             <binding.jms>

-                <destination jndiName="HelloWorldService4"/>

                 <tuscany:wireFormat.jmsdefault sendFormat="text"/>

+                <destination jndiName="HelloWorldService4"/>

             </binding.jms>

         </reference> 

     </component>

@@ -74,8 +74,8 @@
 	    <service name="HelloWorldService">

 	        <!--interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" /-->

             <binding.jms>

-                <destination jndiName="HelloWorldService3"/>

                 <tuscany:wireFormat.jmsdefault />

+                <destination jndiName="HelloWorldService3"/>

             </binding.jms>

 	    </service>

     </component>

@@ -85,8 +85,8 @@
         <service name="HelloWorldService">

             <!--interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" /-->

             <binding.jms>

-                <destination jndiName="HelloWorldService4"/>

                 <tuscany:wireFormat.jmsdefault />

+                <destination jndiName="HelloWorldService4"/>

             </binding.jms>

         </service>

     </component>    

diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
index 78f3e12c88..48608ba9b3 100644
--- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
@@ -29,8 +29,8 @@
             <!--interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"/-->

             <interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldServiceReferenceSide"/>

             <binding.jms>

+                <tuscany:wireFormat.jmsText/>            

                 <destination jndiName="HelloWorldService1"/>

-                <tuscany:wireFormat.jmsText/>

             </binding.jms>

         </reference>  

     </component>

diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
index 4ae21526ee..aa81e59b52 100644
--- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
@@ -27,14 +27,14 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld.HelloWorldReferenceImpl" />

         <reference name="helloWorldServiceWrapSingle" >

             <binding.jms>

+                <tuscany:wireFormat.jmsObject wrapSingle="true"/>

                 <destination jndiName="HelloWorldService1"/>

-                 <tuscany:wireFormat.jmsObject wrapSingle="true"/>

             </binding.jms>

         </reference> 

         <reference name="helloWorldServiceDontWrapSingle" >

             <binding.jms>

+                <tuscany:wireFormat.jmsObject wrapSingle="false" />

                 <destination jndiName="HelloWorldService2"/>

-                 <tuscany:wireFormat.jmsObject wrapSingle="false" />

             </binding.jms>

         </reference>          

     </component>

@@ -44,8 +44,8 @@
         <service name="HelloWorldService">

             <interface.wsdl interface="http://helloworld.jmsobject.format.jms.binding.sca.tuscany.apache.org/#wsdl.interface(HelloWorldService)"/>

             <binding.jms>

+                <tuscany:wireFormat.jmsObject wrapSingle="true"/>

                 <destination jndiName="HelloWorldService1"/>

-                 <tuscany:wireFormat.jmsObject wrapSingle="true"/>

             </binding.jms>

         </service>

     </component> 

@@ -54,8 +54,8 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld.HelloWorldServiceImpl" />

         <service name="HelloWorldService">

             <binding.jms>

-                <destination jndiName="HelloWorldService2"/>

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

+                <destination jndiName="HelloWorldService2"/>

             </binding.jms>

         </service>

     </component>     

diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
index 60d17a7724..a9e8782f94 100644
--- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
@@ -27,8 +27,8 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld.HelloWorldReferenceImpl" />

         <reference name="helloWorldService1" >

            <binding.jms>

-                <destination jndiName="HelloWorldService1"/>

                 <tuscany:wireFormat.jmsText/>

+                <destination jndiName="HelloWorldService1"/>

             </binding.jms>

         </reference>  

     </component>

@@ -37,8 +37,8 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld.HelloWorldServiceImpl" />

         <service name="HelloWorldService">

             <binding.jms>

+                <tuscany:wireFormat.jmsText/>            

                 <destination jndiName="HelloWorldService1"/>

-                <tuscany:wireFormat.jmsText/>

             </binding.jms>

         </service>

     </component> 

diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
index 8f43ef7e59..c15d99550e 100644
--- a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
@@ -27,20 +27,20 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldReferenceImpl" />

         <reference name="helloWorldService1" >

             <binding.jms>

-                <destination jndiName="HelloWorldService1"/>

                 <tuscany:wireFormat.jmsTextXML/>

+                <destination jndiName="HelloWorldService1"/>

             </binding.jms>

         </reference>  

         <reference name="helloWorldService2" >

             <binding.jms>

-                <destination jndiName="HelloWorldService2"/>

                 <tuscany:wireFormat.jmsTextXML/>

+                <destination jndiName="HelloWorldService2"/>

             </binding.jms>

         </reference>

         <reference name="helloWorldService3" >

             <binding.jms>

-                <destination jndiName="HelloWorldService3"/>

                 <tuscany:wireFormat.jmsTextXML/>

+                <destination jndiName="HelloWorldService3"/>

             </binding.jms>

         </reference>      

     </component>

@@ -49,8 +49,8 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldServiceImpl" />

         <service name="HelloWorldService">

             <binding.jms>

-                <destination jndiName="HelloWorldService1"/>

                 <tuscany:wireFormat.jmsTextXML/>

+                <destination jndiName="HelloWorldService1"/>

             </binding.jms>

         </service>

     </component> 

@@ -60,8 +60,8 @@
         <service name="HelloWorldService">

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

             <binding.jms>

-                <destination jndiName="HelloWorldService2"/>

                 <tuscany:wireFormat.jmsTextXML/>

+                <destination jndiName="HelloWorldService2"/>

             </binding.jms>

         </service>

     </component>    

@@ -71,8 +71,8 @@
 	    <service name="HelloWorldService">

 	        <interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" />

             <binding.jms>

-                <destination jndiName="HelloWorldService3"/>

                 <tuscany:wireFormat.jmsTextXML/>

+                <destination jndiName="HelloWorldService3"/>

             </binding.jms>

 	    </service>

     </component>

diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
index 9556ac47b1..79dd18b027 100644
--- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
@@ -27,11 +27,11 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.HelloWorldReferenceImpl" />

         <reference name="helloWorldService1" >

             <binding.jms>

+                <tuscany:wireFormat.jmsTextXML/>

                 <destination jndiName="HelloWorldService1"/>

                 <response>

                     <tuscany:wireFormat.jmsObject/>

                 </response>

-                <tuscany:wireFormat.jmsTextXML/>

             </binding.jms>

         </reference>       

     </component>

@@ -40,11 +40,11 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.HelloWorldServiceImpl" />

         <service name="HelloWorldService">

             <binding.jms>

+                <tuscany:wireFormat.jmsTextXML/>            

                 <destination jndiName="HelloWorldService1"/>

                 <response>

                     <tuscany:wireFormat.jmsObject/>

                 </response>

-                <tuscany:wireFormat.jmsTextXML/>

             </binding.jms>

         </service>

     </component> 

diff --git a/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/service.composite b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/service.composite
index 28d15d8a82..a712990a9b 100644
--- a/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/service.composite
+++ b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/service.composite
@@ -26,11 +26,11 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

         <service name="HelloWorldService">

             <binding.jms>

+               <tuscany:wireFormat.jmsObject/>

                <destination jndiName="RequestQueue"/>

                <response>

                   <destination jndiName="ResponseQueue"/>

                </response>

-               <tuscany:wireFormat.jmsObject/>

             </binding.jms>  

         </service> 

     </component>