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 2009/09/16 09:12:49 UTC
svn commit: r815637 - in /tuscany/java/sca/itest/jms/general/src:
main/resources/defaults/ main/resources/dynamic/ main/resources/exceptions/
main/resources/external/ main/resources/nonSCAclient/
main/resources/oneway/ main/resources/policyHeaders/ mai...
Author: antelder
Date: Wed Sep 16 07:12:48 2009
New Revision: 815637
URL: http://svn.apache.org/viewvc?rev=815637&view=rev
Log:
Change the remaining JMS itest namespaces for 2.x
Modified:
tuscany/java/sca/itest/jms/general/src/main/resources/defaults/client.composite
tuscany/java/sca/itest/jms/general/src/main/resources/defaults/service.composite
tuscany/java/sca/itest/jms/general/src/main/resources/dynamic/client.composite
tuscany/java/sca/itest/jms/general/src/main/resources/exceptions/client.composite
tuscany/java/sca/itest/jms/general/src/main/resources/exceptions/service.composite
tuscany/java/sca/itest/jms/general/src/main/resources/external/client.composite
tuscany/java/sca/itest/jms/general/src/main/resources/external/service.composite
tuscany/java/sca/itest/jms/general/src/main/resources/nonSCAclient/service.composite
tuscany/java/sca/itest/jms/general/src/main/resources/oneway/OneWayClient.composite
tuscany/java/sca/itest/jms/general/src/main/resources/oneway/OneWayService.composite
tuscany/java/sca/itest/jms/general/src/main/resources/policyHeaders/policyHeaders.composite
tuscany/java/sca/itest/jms/general/src/main/resources/properties/properties.composite
tuscany/java/sca/itest/jms/general/src/main/resources/simple/client.composite
tuscany/java/sca/itest/jms/general/src/main/resources/simple/mpclient.composite
tuscany/java/sca/itest/jms/general/src/main/resources/simple/mpservice.composite
tuscany/java/sca/itest/jms/general/src/main/resources/simple/service.composite
tuscany/java/sca/itest/jms/general/src/main/resources/simple/uriclient.composite
tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/defaults/client.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/defaults/client.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/defaults/client.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/defaults/client.composite Wed Sep 16 07:12:48 2009
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="DefaultClientComposite">
<component name="HelloWorldClient">
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/defaults/service.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/defaults/service.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/defaults/service.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/defaults/service.composite Wed Sep 16 07:12:48 2009
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="DefaultServiceComposite">
<component name="HelloWorldService">
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/dynamic/client.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/dynamic/client.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/dynamic/client.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/dynamic/client.composite Wed Sep 16 07:12:48 2009
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="DynamicComposite">
<component name="HelloWorldClient">
@@ -28,7 +29,7 @@
<reference name="serviceA" promote="HelloWorldClient/serviceA">
<interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
<binding.jms>
- <destination name="DestQueueA"/>
+ <destination jndiName="DestQueueA"/>
<!-- No response destination defined means a temporary queue will be used -->
</binding.jms>
</reference>
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/exceptions/client.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/exceptions/client.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/exceptions/client.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/exceptions/client.composite Wed Sep 16 07:12:48 2009
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="ExceptionClientComposite">
<component name="ExceptionServiceClient">
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/exceptions/service.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/exceptions/service.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/exceptions/service.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/exceptions/service.composite Wed Sep 16 07:12:48 2009
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="ExceptionServiceComposite">
<component name="ExceptionService">
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/external/client.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/external/client.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/external/client.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/external/client.composite Wed Sep 16 07:12:48 2009
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="ExternalClientComposite">
<component name="HelloWorldClient">
@@ -28,9 +29,9 @@
<reference name="serviceA" promote="HelloWorldClient/serviceA">
<interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
<binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
- <destination name="DestQueueA"/>
+ <destination jndiName="DestQueueA"/>
<response>
- <destination name="RespQueueA"/>
+ <destination jndiName="RespQueueA"/>
</response>
</binding.jms>
</reference>
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/external/service.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/external/service.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/external/service.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/external/service.composite Wed Sep 16 07:12:48 2009
@@ -18,15 +18,16 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="ExternalServiceComposite">
<component name="HelloWorldService">
<implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
<service name="HelloWorldService">
<binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61616">
- <destination name="DestQueueA" create="always"/>
+ <destination jndiName="DestQueueA" create="always"/>
<response>
- <destination name="RespQueueA" create="always"/>
+ <destination jndiName="RespQueueA" create="always"/>
</response>
</binding.jms>
</service>
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/nonSCAclient/service.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/nonSCAclient/service.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/nonSCAclient/service.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/nonSCAclient/service.composite Wed Sep 16 07:12:48 2009
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="ServiceComposite">
<component name="DefaultService">
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/oneway/OneWayClient.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/oneway/OneWayClient.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/oneway/OneWayClient.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/oneway/OneWayClient.composite Wed Sep 16 07:12:48 2009
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="OneWayClientComposite">
<component name="OneWayClient">
@@ -28,7 +29,7 @@
<reference name="serviceA" promote="OneWayClient/serviceA">
<interface.java interface="org.apache.tuscany.sca.binding.jms.OneWayService" />
<binding.jms>
- <destination name="DestQueueA"/>
+ <destination jndiName="DestQueueA"/>
</binding.jms>
</reference>
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/oneway/OneWayService.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/oneway/OneWayService.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/oneway/OneWayService.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/oneway/OneWayService.composite Wed Sep 16 07:12:48 2009
@@ -18,13 +18,14 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="OneWayServiceComposite">
<component name="OneWayService">
<implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
<service name="OneWayService">
<binding.jms>
- <destination name="DestQueueA" create="always"/>
+ <destination jndiName="DestQueueA" create="always"/>
</binding.jms>
</service>
</component>
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/policyHeaders/policyHeaders.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/policyHeaders/policyHeaders.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/policyHeaders/policyHeaders.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/policyHeaders/policyHeaders.composite Wed Sep 16 07:12:48 2009
@@ -18,7 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- targetNamespace="http://jms"
+ targetNamespace="http://itest"
name="PropertiesClientComposite">
<component name="ClientComponent">
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/properties/properties.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/properties/properties.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/properties/properties.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/properties/properties.composite Wed Sep 16 07:12:48 2009
@@ -18,7 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- targetNamespace="http://jms"
+ targetNamespace="http://itest"
name="PropertiesClientComposite">
<component name="ClientComponent">
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/simple/client.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/simple/client.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/simple/client.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/simple/client.composite Wed Sep 16 07:12:48 2009
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="SimpleClientComposite">
<component name="HelloWorldClient">
@@ -28,10 +29,10 @@
<reference name="serviceA" promote="HelloWorldClient/serviceA">
<interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
<binding.jms>
- <destination name="DestQueueA">
+ <destination jndiName="DestQueueA">
</destination>
<response>
- <destination name="RespQueueA"/>
+ <destination jndiName="RespQueueA"/>
</response>
</binding.jms>
</reference>
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/simple/mpclient.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/simple/mpclient.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/simple/mpclient.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/simple/mpclient.composite Wed Sep 16 07:12:48 2009
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="MPClientComposite">
<component name="HelloWorldClientMP">
@@ -28,9 +29,9 @@
<reference name="serviceMP" promote="HelloWorldClientMP/serviceA">
<interface.java interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
<binding.jms messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">
- <destination name="DestQueueMP"/>
+ <destination jndiName="DestQueueMP"/>
<response>
- <destination name="RespQueueMP"/>
+ <destination jndiName="RespQueueMP"/>
</response>
</binding.jms>
</reference>
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/simple/mpservice.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/simple/mpservice.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/simple/mpservice.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/simple/mpservice.composite Wed Sep 16 07:12:48 2009
@@ -18,16 +18,17 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="MPServiceComposite">
<component name="HelloWorldServiceMP">
<implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
<service name="HelloWorldService">
<binding.jms messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">
- <destination name="DestQueueMP" create="always">
+ <destination jndiName="DestQueueMP" create="always">
</destination>
<response>
- <destination name="RespQueueMP" create="always"/>
+ <destination jndiName="RespQueueMP" create="always"/>
</response>
</binding.jms>
</service>
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/simple/service.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/simple/service.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/simple/service.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/simple/service.composite Wed Sep 16 07:12:48 2009
@@ -18,16 +18,17 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="SimpleServiceComposite">
<component name="HelloWorldService">
<implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
<service name="HelloWorldService">
<binding.jms>
- <destination name="DestQueueA" create="always">
+ <destination jndiName="DestQueueA" create="always">
</destination>
<response>
- <destination name="RespQueueA" create="always"/>
+ <destination jndiName="RespQueueA" create="always"/>
</response>
</binding.jms>
</service>
Modified: tuscany/java/sca/itest/jms/general/src/main/resources/simple/uriclient.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/resources/simple/uriclient.composite?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/resources/simple/uriclient.composite (original)
+++ tuscany/java/sca/itest/jms/general/src/main/resources/simple/uriclient.composite Wed Sep 16 07:12:48 2009
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="URIClientComposite">
<component name="HelloWorldClient">
Modified: tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java?rev=815637&r1=815636&r2=815637&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java (original)
+++ tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java Wed Sep 16 07:12:48 2009
@@ -20,6 +20,8 @@
import static org.junit.Assert.assertEquals;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -29,25 +31,26 @@
*/
public class RPCTestCase {
- private static SCADomain scaDomain;
+ private Node node;
@Before
public void init() {
- scaDomain =
- SCADomain.newInstance("http://localhost", "/", "simple/client.composite", "simple/service.composite");
+ node = NodeFactory.newInstance().createNode().start();
+// scaDomain =
+// SCADomain.newInstance("http://localhost", "/", "simple/client.composite", "simple/service.composite");
// scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
}
@Test
public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
+ HelloWorldService helloWorldService = node.getService(HelloWorldService.class, "HelloWorldClient");
assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
}
@After
public void end() {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
}
}