Update JMS itests for 2.x APIs

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

11 files changed, 28 insertions, 39 deletions

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();

         }

     }

 }