You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2010/03/18 02:34:48 UTC
svn commit: r924590 - in /tuscany/sca-java-2.x/trunk/itest/jms:
exceptions/src/main/resources/exceptions/
format-jmsbytes/src/main/resources/jmsbytes/
format-jmsbytesxml/src/main/resources/jmsbytesxml/
format-jmsdefault/src/main/resources/jmsdefault/ f...
Author: lresende
Date: Thu Mar 18 01:34:48 2010
New Revision: 924590
URL: http://svn.apache.org/viewvc?rev=924590&view=rev
Log:
TUSCANY-3453 - Updating JMS tests composites to comply with 'sequence' restrictions
Modified:
tuscany/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/exceptions/service.composite
tuscany/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
tuscany/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
tuscany/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
tuscany/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
tuscany/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
tuscany/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
tuscany/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
tuscany/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
tuscany/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/service.composite
Modified: tuscany/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/exceptions/service.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/exceptions/service.composite?rev=924590&r1=924589&r2=924590&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/exceptions/service.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/exceptions/service.composite Thu Mar 18 01:34:48 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite?rev=924590&r1=924589&r2=924590&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite Thu Mar 18 01:34:48 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite?rev=924590&r1=924589&r2=924590&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite Thu Mar 18 01:34:48 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite?rev=924590&r1=924589&r2=924590&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite Thu Mar 18 01:34:48 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite?rev=924590&r1=924589&r2=924590&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite Thu Mar 18 01:34:48 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite?rev=924590&r1=924589&r2=924590&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite Thu Mar 18 01:34:48 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite?rev=924590&r1=924589&r2=924590&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite Thu Mar 18 01:34:48 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite?rev=924590&r1=924589&r2=924590&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite Thu Mar 18 01:34:48 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite?rev=924590&r1=924589&r2=924590&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite Thu Mar 18 01:34:48 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/service.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/service.composite?rev=924590&r1=924589&r2=924590&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/service.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/service.composite Thu Mar 18 01:34:48 2010
@@ -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>