Update JMS itests for 2.x APIs

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

3 files changed, 11 insertions, 10 deletions

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

         }

     }

 }