You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/08/12 15:14:21 UTC
svn commit: r984757 - in /tuscany/sca-java-2.x/trunk/itest/jms:
args/src/main/resources/selectors/ callbacks/src/main/resources/simple/
defaults/src/main/resources/defaults/
exceptions1/src/main/resources/exceptions/
non-sca-client/src/main/resources/n...
Author: antelder
Date: Thu Aug 12 13:14:20 2010
New Revision: 984757
URL: http://svn.apache.org/viewvc?rev=984757&view=rev
Log:
Correct the format of all the jms uri's
Modified:
tuscany/sca-java-2.x/trunk/itest/jms/args/src/main/resources/selectors/selectors.composite
tuscany/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/client.composite
tuscany/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/tempq.composite
tuscany/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/client.composite
tuscany/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
tuscany/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
tuscany/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/nulls.composite
tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
tuscany/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/properties/properties.composite
tuscany/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/selectors/selectors.composite
tuscany/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
Modified: tuscany/sca-java-2.x/trunk/itest/jms/args/src/main/resources/selectors/selectors.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/args/src/main/resources/selectors/selectors.composite?rev=984757&r1=984756&r2=984757&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/args/src/main/resources/selectors/selectors.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/args/src/main/resources/selectors/selectors.composite Thu Aug 12 13:14:20 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/client.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/client.composite?rev=984757&r1=984756&r2=984757&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/client.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/client.composite Thu Aug 12 13:14:20 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/tempq.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/tempq.composite?rev=984757&r1=984756&r2=984757&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/tempq.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/tempq.composite Thu Aug 12 13:14:20 2010
@@ -30,7 +30,7 @@ The client component does not define the
<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
<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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/client.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/client.composite?rev=984757&r1=984756&r2=984757&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/client.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/client.composite Thu Aug 12 13:14:20 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/client.composite?rev=984757&r1=984756&r2=984757&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/client.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/client.composite Thu Aug 12 13:14:20 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite?rev=984757&r1=984756&r2=984757&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite Thu Aug 12 13:14:20 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/nulls.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/nulls.composite?rev=984757&r1=984756&r2=984757&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/nulls.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/nulls.composite Thu Aug 12 13:14:20 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite?rev=984757&r1=984756&r2=984757&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite Thu Aug 12 13:14:20 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/properties/properties.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/properties/properties.composite?rev=984757&r1=984756&r2=984757&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/properties/properties.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/properties/properties.composite Thu Aug 12 13:14:20 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/selectors/selectors.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/selectors/selectors.composite?rev=984757&r1=984756&r2=984757&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/selectors/selectors.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/selectors/selectors.composite Thu Aug 12 13:14:20 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite?rev=984757&r1=984756&r2=984757&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite (original)
+++ tuscany/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite Thu Aug 12 13:14:20 2010
@@ -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>