diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-15 10:52:15 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-15 10:52:15 +0000 |
| commit | 5c4c7b1dfd17404b5f74e93c2ba4299a8cdc53dd (patch) | |
| tree | d5edaf9590e554c4d8f49857cec4bf9441125b10 /java | |
| parent | b118f5ed2575ea2d325f977d57bbc9cd3441eb48 (diff) | |
Update JMS itests for 2.x APIs
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@815269 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
91 files changed, 200 insertions, 266 deletions
diff --git a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java index 9d75685a8a..a4d5190af3 100644 --- a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java +++ b/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* Remote Web service client with callback interface
diff --git a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java index 9c2c657b55..b78feab413 100644 --- a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java +++ b/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java @@ -18,9 +18,9 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The remote service that will be invoked by the client
diff --git a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java index 5697d819c7..20b74ccc1a 100644 --- a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java +++ b/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The callback interface for {@link JMSService}.
diff --git a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java index b15b40c8a6..e8357338ae 100644 --- a/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java +++ b/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements MyService and uses a callback.
diff --git a/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java index cb9acb1bc1..18911ad8b6 100644 --- a/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java +++ b/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java @@ -20,7 +20,8 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -30,16 +31,16 @@ import org.junit.Test; */
public class CallbackTestCase {
- private static SCADomain scaDomain;
+ private Node node;
@Before
public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testHelloWorldCreate() throws Exception {
- JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");
+ JMSClient client = node.getService(JMSClient.class, "ClientComponent");
client.aClientMethod();
@@ -53,8 +54,8 @@ public class CallbackTestCase { @After
public void end() {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
}
}
diff --git a/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java index 9f450574df..b335add358 100644 --- a/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java +++ b/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java @@ -22,7 +22,8 @@ import static org.junit.Assert.assertEquals; import java.net.MalformedURLException;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -32,16 +33,16 @@ import org.junit.Test; */
public class TempCallbackQTestCase {
- private SCADomain scaDomain;
+ private Node node;
@Before
public void init() throws MalformedURLException {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/tempq.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testHelloWorldCreate() throws Exception {
- JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");
+ JMSClient client = node.getService(JMSClient.class, "ClientComponent");
client.aClientMethod();
@@ -55,8 +56,8 @@ public class TempCallbackQTestCase { @After
public void end() {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
}
diff --git a/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java index 4d00d2df0d..b572b1012a 100644 --- a/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java +++ b/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the OneWay service.
diff --git a/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java index 377f227ceb..9cec2d9b3e 100644 --- a/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java +++ b/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface OneWayService {
diff --git a/java/sca/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/java/sca/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java index 9de3bff7c3..729ad072b7 100644 --- a/java/sca/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java +++ b/java/sca/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java @@ -20,7 +20,8 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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,16 +30,16 @@ import org.junit.Test; */
public class DefinitionsTestCase {
- private static SCADomain scaDomain;
+ private Node node;
@Before
public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "definitions/definitions.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testSayHello() throws Exception {
- OneWayService client = scaDomain.getService(OneWayService.class, "OneWayClient");
+ OneWayService client = node.getService(OneWayService.class, "OneWayClient");
client.sayHello("petra");
@@ -54,8 +55,8 @@ public class DefinitionsTestCase { @After
public void end() {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
}
}
diff --git a/java/sca/itest/jms/format/pom.xml b/java/sca/itest/jms/format/pom.xml index 3adca6f921..da72ff58e1 100644 --- a/java/sca/itest/jms/format/pom.xml +++ b/java/sca/itest/jms/format/pom.xml @@ -39,6 +39,12 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-node-impl</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> <version>2.0-SNAPSHOT</version> <scope>runtime</scope> diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java index b1f62c1422..646cecc2b7 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java index efed4842ea..c6fa73a42a 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java index 5ae7032993..d9f6a18f18 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java index 5fad413ebe..be358fbac1 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java index dd58c9554e..4dec30540d 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java index 02a3d944f7..9d8525ab26 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java index 9c2198e6ca..af98fb09b1 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java index 8744a57daf..82ebdb3aec 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java index f465767056..a8cbc080da 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java index 545fcc894d..41800b6c7a 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java @@ -18,8 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld; -import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.CheckedException; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java index aca727a9db..d7c2f10f43 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java @@ -18,7 +18,6 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld; -import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.CheckedException; public class HelloWorldServiceImpl implements HelloWorldService { diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java index 948732adb4..e67f2ba8fa 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java index ed697f8a38..21b4d0461e 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java index 574188d466..43e623f192 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java index 39af400f6a..feee945ccd 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld; import javax.jws.soap.SOAPBinding; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java index e89598cb96..3affec3f72 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java index bb853673e8..2438044656 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java index 8976887daa..1c3a46a70c 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java index 304e145161..ab93ac8dc5 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java index 2587a51704..7a6dbb195b 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java index f46f3e2d04..3873991456 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java index 6015ab8930..a233a2cb03 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java index e5cd9db281..808263e409 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java index c54e195178..02b62ef1ac 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java index a98f589b9a..0530d57db9 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java @@ -18,8 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld; -import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.CheckedException; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java index 7965388013..476595adc2 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java @@ -18,7 +18,6 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld; -import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.CheckedException; public class HelloWorldServiceImpl implements HelloWorldService { diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java index 732b49ea6c..4cedd3b7f0 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldService { diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java index 65323a3d63..c478aeb0b6 100644 --- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java index a0429aa59f..eefd0a762d 100644 --- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java +++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java @@ -21,10 +21,8 @@ package org.apache.tuscany.sca.binding.jms.format; import static org.junit.Assert.assertEquals; import org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReference; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +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; @@ -35,20 +33,16 @@ import org.junit.Test; */ public class FormatJMSBytesTestCase { - private static SCANode node; + private Node node; @Before public void init() { - SCANodeFactory factory = SCANodeFactory.newInstance(); - node = factory.createSCANode("jmsbytes/helloworld.composite", - new SCAContribution("test", "./target/classes")); - - node.start(); + node = NodeFactory.newInstance().createNode().start(); } @Test public void testHelloWorldCreate() throws Exception { - HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); + HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); System.out.println(helloWorldService.getGreetings("Fred Bloggs")); /* TUSCANY-2967 - disable this change while we decide what to do and diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java index ec9a1adeb4..e5ea718a05 100644 --- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java +++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java @@ -21,10 +21,8 @@ package org.apache.tuscany.sca.binding.jms.format; import static org.junit.Assert.assertEquals; import org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReference; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +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; @@ -35,20 +33,16 @@ import org.junit.Test; */ public class FormatJMSBytesXMLTestCase { - private static SCANode node; + private static Node node; @Before public void init() { - SCANodeFactory factory = SCANodeFactory.newInstance(); - node = factory.createSCANode("jmsbytesxml/helloworld.composite", - new SCAContribution("test", "./target/classes")); - - node.start(); + node = NodeFactory.newInstance().createNode().start(); } @Test public void testHelloWorldCreate() throws Exception { - HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); + HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); System.out.println(helloWorldService.getGreetings("Fred Bloggs")); assertEquals("Hello Fred Bloggs foo remote service exception, see nested exception", helloWorldService.getGreetings("Fred Bloggs")); diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java index dc2cc13679..eb434fa0a8 100644 --- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java +++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java @@ -23,10 +23,8 @@ import static org.junit.Assert.assertEquals; import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldReference; import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl; import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.Person; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -38,20 +36,16 @@ import org.junit.Test; */ public class FormatJMSDefaultTestCase { - private static SCANode node; + private static Node node; @Before public void init() { - SCANodeFactory factory = SCANodeFactory.newInstance(); - node = factory.createSCANode("jmsdefault/helloworld.composite", - new SCAContribution("test", "./target/classes")); - - node.start(); + node = NodeFactory.newInstance().createNode().start(); } @Test public void testHelloWorldCreate() throws Exception { - HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); + HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs foo remote service exception, see nested exception foo remote service exception, see nested exception", helloWorldService.getGreetings("Fred Bloggs")); diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java index c617a984ef..7644e914e5 100644 --- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java +++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java @@ -21,10 +21,8 @@ package org.apache.tuscany.sca.binding.jms.format; import static org.junit.Assert.assertEquals; import org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldReference; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +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; @@ -35,20 +33,16 @@ import org.junit.Test; */ public class FormatJMSMessageTestCase { - private static SCANode node; + private static Node node; @Before public void init() { - SCANodeFactory factory = SCANodeFactory.newInstance(); - node = factory.createSCANode("jmsmessage/helloworld.composite", - new SCAContribution("test", "./target/classes")); - - node.start(); + node = NodeFactory.newInstance().createNode().start(); } @Test public void testHelloWorldCreate() throws Exception { - HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); + HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); System.out.println(helloWorldService.getGreetings("Fred Bloggs")); assertEquals("Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs")); diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java index 462ebb557e..5a3ca436e6 100644 --- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java +++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java @@ -21,10 +21,8 @@ package org.apache.tuscany.sca.binding.jms.format; import static org.junit.Assert.assertEquals; import org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld.HelloWorldReference; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +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.Ignore; @@ -36,21 +34,16 @@ import org.junit.Test; */ public class FormatJMSObjectTestCase { - private static SCANode node; + private static Node node; @Before public void init() { - SCANodeFactory factory = SCANodeFactory.newInstance(); - node = factory.createSCANode("jmsobject/helloworld.composite", - new SCAContribution("test", "./target/classes")); - - node.start(); + node = NodeFactory.newInstance().createNode().start(); } @Test public void testHelloWorldCreate() throws Exception { - HelloWorldReference helloWorldService = ((SCAClient) node).getService( - HelloWorldReference.class, "HelloWorldReferenceComponent"); + HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); assertEquals("Hello1 Fred Hello1 Bloggs Hello2 null Hello3 Fred Hello4 Fred Bloggs Hello5 Fred Bloggs Hello6 Fred Bloggs Hello7 Fred Bloggs", helloWorldService.getGreetingsWrapSingle("Fred", "Bloggs")); diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java index d45e6492ce..8aeb6803f8 100644 --- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java +++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java @@ -21,10 +21,8 @@ package org.apache.tuscany.sca.binding.jms.format; import static org.junit.Assert.assertEquals; import org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReference; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +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; @@ -35,20 +33,16 @@ import org.junit.Test; */ public class FormatJMSTextTestCase { - private static SCANode node; + private static Node node; @Before public void init() { - SCANodeFactory factory = SCANodeFactory.newInstance(); - node = factory.createSCANode("jmstext/helloworld.composite", - new SCAContribution("test", "./target/classes")); - - node.start(); + node = NodeFactory.newInstance().createNode().start(); } @Test public void testHelloWorldCreate() throws Exception { - HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); + HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); System.out.println(helloWorldService.getGreetings("Fred Bloggs")); assertEquals("Hello Fred Bloggs " + diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java index 5d3b0ac9e3..98ac2554d4 100644 --- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java +++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java @@ -22,13 +22,10 @@ import static org.junit.Assert.assertEquals; import org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.HelloWorldService; import org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.Person; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +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.Ignore; import org.junit.Test; @@ -37,20 +34,16 @@ import org.junit.Test; */ public class FormatJMSTextXMLInJMSObjectOutTestCase { - private static SCANode node; + private static Node node; @Before public void init() { - SCANodeFactory factory = SCANodeFactory.newInstance(); - node = factory.createSCANode("jmstextxmlinjmsobjectout/helloworld.composite", - new SCAContribution("test", "./target/classes")); - - node.start(); + node = NodeFactory.newInstance().createNode().start(); } @Test public void testHelloWorldCreate() throws Exception { - HelloWorldService helloWorldService = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldReferenceComponent"); + HelloWorldService helloWorldService = node.getService(HelloWorldService.class, "HelloWorldReferenceComponent"); assertEquals("Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs")); diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java index 5650d06a36..a9fed8a11e 100644 --- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java +++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java @@ -22,10 +22,8 @@ import static org.junit.Assert.assertEquals; import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldReference; import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.Person; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +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; @@ -36,20 +34,16 @@ import org.junit.Test; */ public class FormatJMSTextXMLTestCase { - private static SCANode node; + private static Node node; @Before public void init() { - SCANodeFactory factory = SCANodeFactory.newInstance(); - node = factory.createSCANode("jmstextxml/helloworld.composite", - new SCAContribution("test", "./target/classes")); - - node.start(); + node = NodeFactory.newInstance().createNode().start(); } @Test public void testHelloWorldCreate() throws Exception { - HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); + HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs")); diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java index 4351b17cd6..e75061e0fa 100644 --- a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java +++ b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface ExceptionService { diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java index cb244a5160..5cb7f712a4 100644 --- a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java +++ b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java index 86d4719646..65a4b32694 100644 --- a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java +++ b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java index abb29aec4c..33298eb555 100644 --- a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface HelloWorldService { diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java index b4d1cbccda..4140fa0b89 100644 --- a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java +++ b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
@Service(MsgClient.class)
public class MsgClientImpl implements MsgClient {
diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java index e8242467cc..2be4f2ad3e 100644 --- a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java +++ b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java index d376d74295..d5684ca56c 100644 --- a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java +++ b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.AllowsPassByReference;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java index 142343e349..e18de0456c 100644 --- a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java +++ b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.binding.jms; import javax.jms.Message;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
@Service(MsgService.class)
public class MsgServiceImpl implements MsgService {
diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java index 218cccf64c..6ec88aac6c 100644 --- a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java +++ b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the OneWay service. diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java index 9795089952..fc155d0324 100644 --- a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java +++ b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface OneWayObjectService { diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java index f16f853ba7..8fd6cc94bf 100644 --- a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java +++ b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface OneWayService { diff --git a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java index cdf9bef93f..ff156caa51 100644 --- a/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java +++ b/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java @@ -22,7 +22,6 @@ package org.apache.tuscany.sca.binding.jms; import javax.jms.Message; import javax.jms.Session; -import org.apache.tuscany.sca.binding.jms.impl.JMSBinding; import org.apache.tuscany.sca.binding.jms.provider.TextMessageProcessor; public class TestMessageProcessor extends TextMessageProcessor { diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java index dca9386637..354d4c2db2 100644 --- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java +++ b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -30,25 +30,26 @@ import org.junit.Test; */ public class DefaultsTestCase { - private static SCADomain scaDomain; + private Node node; @Before public void init() { - scaDomain = + node = NodeFactory.newInstance().createNode().start(); + SCADomain.newInstance("http://localhost", "/", "defaults/client.composite", "defaults/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.close(); } } } diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java index f4750e5453..86ab51a4b9 100644 --- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java +++ b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java @@ -20,7 +20,6 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals; -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java index bd326b36d2..d7d7a22afc 100644 --- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java +++ b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java @@ -19,10 +19,8 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java index c34ad07901..326c867d5d 100644 --- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java +++ b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java @@ -21,7 +21,6 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals; import org.apache.activemq.broker.BrokerService; -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java index 44f9754e29..3f997b02c2 100644 --- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java +++ b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java @@ -21,7 +21,6 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java index d982e651cd..03146aff32 100644 --- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java +++ b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java @@ -32,7 +32,6 @@ import javax.naming.NamingException; import org.apache.activemq.broker.BrokerService; import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory; import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactoryImpl; -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java index 26dda13cf9..fd7f2ff1a5 100644 --- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java +++ b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java @@ -20,7 +20,6 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals; -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java index 5e208a3081..597985296a 100644 --- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java +++ b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java @@ -22,9 +22,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import javax.jms.DeliveryMode; -import javax.jms.Message; -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java index f4ba59e61b..f64b973407 100644 --- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java +++ b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java @@ -23,7 +23,6 @@ import static org.junit.Assert.assertNotNull; import javax.jms.DeliveryMode;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java index c1882a1e26..9fb6fd97e6 100644 --- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java +++ b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java @@ -20,7 +20,6 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals; -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java index bed5515d7f..6629c1c0be 100644 --- a/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java +++ b/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java @@ -20,7 +20,6 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals; -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/java/sca/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/java/sca/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java index 28b281a0c4..430c71aaef 100644 --- a/java/sca/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ b/java/sca/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface HelloWorldService {
diff --git a/java/sca/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java b/java/sca/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java index 3db0e634be..848e340181 100644 --- a/java/sca/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java +++ b/java/sca/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java @@ -20,7 +20,6 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals;
-import java.io.Serializable;
import java.util.Properties;
import javax.jms.Connection;
@@ -35,7 +34,8 @@ import javax.jms.Session; import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -45,14 +45,14 @@ import org.junit.Test; */
public class NoReplyToTestCase {
- private static SCADomain scaDomain;
+ private Node node;
private Session session;
private InitialContext context;
private Connection connection;
@Before
public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "service.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
@@ -90,8 +90,8 @@ public class NoReplyToTestCase { @After
public void end() throws JMSException {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
if (connection != null) {
connection.close();
diff --git a/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java index f7f930f443..7fed36fa77 100644 --- a/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java +++ b/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the OneWay service.
diff --git a/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java index 5c43f02ca4..7ab6019fd5 100644 --- a/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java +++ b/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface MyService {
diff --git a/java/sca/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java b/java/sca/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java index e8aa803369..ac872f46a6 100644 --- a/java/sca/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java +++ b/java/sca/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java @@ -18,7 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -27,16 +28,16 @@ import org.junit.Test; */
public class NullsTestCase {
- private static SCADomain scaDomain;
+ private Node node;
@Before
public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "nulls.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testSayHello() throws Exception {
- MyService client1 = scaDomain.getService(MyService.class, "Client1");
+ MyService client1 = node.getService(MyService.class, "Client1");
client1.sayHello();
@@ -44,7 +45,7 @@ public class NullsTestCase { @Test
public void testSayHelloObjectFormat() throws Exception {
- MyService client1 = scaDomain.getService(MyService.class, "Client2");
+ MyService client1 = node.getService(MyService.class, "Client2");
client1.sayHello();
@@ -52,8 +53,8 @@ public class NullsTestCase { @After
public void end() {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
}
}
diff --git a/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java index 1f310e0685..9aef6ba1a3 100644 --- a/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java +++ b/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the HelloWorld service.
diff --git a/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java index 28b281a0c4..430c71aaef 100644 --- a/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ b/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface HelloWorldService {
diff --git a/java/sca/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java b/java/sca/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java index fd7b167963..03b834ce7d 100644 --- a/java/sca/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java +++ b/java/sca/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java @@ -20,7 +20,8 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -30,24 +31,23 @@ import org.junit.Test; */
public class ResponseCFTestCase {
- private static SCADomain scaDomain;
+ private Node node;
@Before
public void init() {
- scaDomain =
- SCADomain.newInstance("http://localhost", "/", "cf/client.composite", "cf/service.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@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();
}
}
}
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java index 0ad6440593..b589d5e8bc 100644 --- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java +++ b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the OneWay service.
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java index f26a3ce68b..1aff0d454e 100644 --- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java +++ b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface SelectorService {
diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java index 2b2c5d571a..0592194b21 100644 --- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java +++ b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java index 9ab8221417..2d4ff0192b 100644 --- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java index c7bdba492f..b632b3f60f 100644 --- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java +++ b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java index 573ae8d068..0b24678543 100644 --- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java +++ b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java index 744612bc14..0ce66005fc 100644 --- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java index 7dca243bdf..7e42113da4 100644 --- a/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java +++ b/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java b/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java index 46ca6b9844..bee0c549bd 100644 --- a/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java +++ b/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java @@ -21,10 +21,8 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals; import org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldReference; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +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; @@ -35,20 +33,16 @@ import org.junit.Test; */ public class OperationselectorJMSDefaultTestCase { - private static SCANode node; + private Node node; @Before public void init() { - SCANodeFactory factory = SCANodeFactory.newInstance(); - node = factory.createSCANode("jmsdefault/helloworld.composite", - new SCAContribution("test", "./target/classes")); - - node.start(); + node = NodeFactory.newInstance().createNode().start(); } @Test public void testHelloWorldCreate() throws Exception { - HelloWorldReference helloWorldReference = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); + HelloWorldReference helloWorldReference = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); assertEquals("Hello One Fred Bloggs Hello Two Fred Bloggs Hello Three Fred Bloggs Hello Four Fred Bloggs", helloWorldReference.getGreetings("Fred Bloggs")); diff --git a/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java b/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java index c9cf1a80c8..3fa3a30884 100644 --- a/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java +++ b/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java @@ -21,10 +21,8 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals; import org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldReference; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +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; @@ -35,20 +33,16 @@ import org.junit.Test; */ public class OperationselectorJMSUserPropTestCase { - private static SCANode node; + private Node node; @Before public void init() { - SCANodeFactory factory = SCANodeFactory.newInstance(); - node = factory.createSCANode("jmsuserprop/helloworld.composite", - new SCAContribution("test", "./target/classes")); - - node.start(); + node = NodeFactory.newInstance().createNode().start(); } @Test public void testHelloWorldCreate() throws Exception { - HelloWorldReference helloWorldReference = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); + HelloWorldReference helloWorldReference = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); assertEquals("Hello One Fred Bloggs Hello Four Fred Bloggs Hello Two Fred Bloggs", helloWorldReference.getGreetings("Fred Bloggs")); diff --git a/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java index ea548c22e6..e7254005be 100644 --- a/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java +++ b/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java @@ -20,7 +20,8 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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,17 +30,17 @@ import org.junit.Test; */
public class SelectorsTestCase {
- private static SCADomain scaDomain;
+ private Node node;
@Before
public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "selectors/selectors.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testSayHello() throws Exception {
- SelectorService client1 = scaDomain.getService(SelectorService.class, "Client1");
- SelectorService client2 = scaDomain.getService(SelectorService.class, "Client2");
+ SelectorService client1 = node.getService(SelectorService.class, "Client1");
+ SelectorService client2 = node.getService(SelectorService.class, "Client2");
client1.sayHello("petra");
client2.sayHello("beate");
@@ -68,8 +69,8 @@ public class SelectorsTestCase { @After
public void end() {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
}
}
diff --git a/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java index 4d00d2df0d..b572b1012a 100644 --- a/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java +++ b/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the OneWay service.
diff --git a/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java index 377f227ceb..9cec2d9b3e 100644 --- a/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java +++ b/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface OneWayService {
diff --git a/java/sca/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java b/java/sca/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java index f0b7537bcc..35fe96b81a 100644 --- a/java/sca/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java +++ b/java/sca/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java @@ -20,7 +20,8 @@ package org.apache.tuscany.sca.binding.jms; import static org.junit.Assert.assertEquals;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -30,16 +31,16 @@ import org.junit.Test; */
public class TopicsTestCase {
- private static SCADomain scaDomain;
+ private Node node;
@Before
public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "topics/TopicsClient.composite", "topics/TopicsService.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testOneWayInvoked() throws Exception {
- OneWayService oneWayService = scaDomain.getService(OneWayService.class, "OneWayClient");
+ OneWayService oneWayService = node.getService(OneWayService.class, "OneWayClient");
oneWayService.sayHello("Petra");
synchronized (OneWayServiceImpl.mutex) {
// wait up to 10 seconds but it will likely be a lot less
@@ -51,8 +52,8 @@ public class TopicsTestCase { @After
public void end() {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
}
}
|