Simplify itest scdl by removing the unneeded interface definitions

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

2 files changed, 6 insertions, 12 deletions

diff --git a/java/sca/itest/jms-callbacks/src/main/resources/simple/client.composite b/java/sca/itest/jms-callbacks/src/main/resources/simple/client.composite
index 4a11f83291..93d8acb65b 100644
--- a/java/sca/itest/jms-callbacks/src/main/resources/simple/client.composite
+++ b/java/sca/itest/jms-callbacks/src/main/resources/simple/client.composite
@@ -24,8 +24,6 @@
     <component name="ClientComponent">

         <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSClientImpl" />

         <reference name="myService">

-            <interface.java interface="org.apache.tuscany.sca.binding.jms.JMSService"

-                            callbackInterface="org.apache.tuscany.sca.binding.jms.JMSServiceCallback" />

             <binding.jms uri="jms:ServiceQueue"/>

             <callback>

                 <binding.jms uri="jms:CallbackQueue"/>

@@ -36,8 +34,6 @@
     <component name="ServiceComponent">

         <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSServiceImpl" />

         <service name="JMSService">

-            <interface.java interface="org.apache.tuscany.sca.binding.jms.JMSService"

-                callbackInterface="org.apache.tuscany.sca.binding.jms.JMSServiceCallback" />

             <binding.jms uri="jms:ServiceQueue"/>

             <callback>

                 <binding.jms uri="jms:CallbackQueue"/>

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 18c3bfbce2..9f450574df 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,9 +22,7 @@ import static org.junit.Assert.assertEquals;
 

 import java.net.MalformedURLException;

 

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

+import org.apache.tuscany.sca.host.embedded.SCADomain;

 import org.junit.After;

 import org.junit.Before;

 import org.junit.Test;

@@ -34,16 +32,16 @@ import org.junit.Test;
  */

 public class TempCallbackQTestCase {

 

-    private SCAClient scaClient;

+    private SCADomain scaDomain;

 

     @Before

     public void init() throws MalformedURLException {

-        this.scaClient = (SCAClient)SCANode2Factory.newInstance().createSCANode("src/main/resources/simple/tempq.composite");

+        scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/tempq.composite");

     }

 

     @Test

     public void testHelloWorldCreate() throws Exception {

-        JMSClient client = scaClient.getService(JMSClient.class, "ClientComponent");

+        JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");

 

         client.aClientMethod();

 

@@ -57,8 +55,8 @@ public class TempCallbackQTestCase {
 

     @After

     public void end() {

-        if (scaClient != null) {

-            ((SCANode2)scaClient).stop();

+        if (scaDomain != null) {

+            scaDomain.close();

         }

     }