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

         }

     }

 }