Remove dependency on SCABinding/WebServiceBinding models

Remove duplicate start method

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

3 files changed, 10 insertions, 11 deletions

diff --git a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java b/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
index b9d93d1e84..67dc63861f 100644
--- a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
+++ b/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
@@ -25,8 +25,8 @@ import itest.nodes.Helloworld;
 

 import java.io.File;

 

-import org.apache.tuscany.sca.assembly.SCABinding;

-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;

+import javax.xml.namespace.QName;

+

 import org.apache.tuscany.sca.node.Node;

 import org.apache.tuscany.sca.node.NodeFactory;

 import org.apache.tuscany.sca.node.configuration.NodeConfiguration;

@@ -41,7 +41,7 @@ import org.oasisopen.sca.client.SCAClientFactory;
  * This shows how to test the Calculator service component.

  */

 public class ClientNode {

-

+    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";

     private static Node clientNode;

     private static TestCaseRunner runner;

 

@@ -54,8 +54,8 @@ public class ClientNode {
         NodeFactory factory = NodeFactory.newInstance();

         NodeConfiguration conf =

             factory.createNodeConfiguration().setURI("clientNode").

-                addBinding(SCABinding.TYPE, "http://localhost:8085/sca https://localhost:9085/sca")

-                .addBinding(WebServiceBinding.TYPE, "http://localhost:8086/ws")

+                addBinding(new QName(SCA11_NS, "binding.sca"), "http://localhost:8085/sca https://localhost:9085/sca")

+                .addBinding(new QName(SCA11_NS, "binding.ws"), "http://localhost:8086/ws")

                 .addContribution("client", new File("../helloworld-client/target/classes").toURI().toString());

         clientNode = factory.createNode(conf).start();

         Thread.sleep(1000);

diff --git a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java b/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
index 4b278d89a2..74136fe988 100644
--- a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
+++ b/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
@@ -21,8 +21,8 @@ package itest;
 

 import java.io.File;

 

-import org.apache.tuscany.sca.assembly.SCABinding;

-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;

+import javax.xml.namespace.QName;

+

 import org.apache.tuscany.sca.node.Node;

 import org.apache.tuscany.sca.node.NodeFactory;

 import org.apache.tuscany.sca.node.configuration.NodeConfiguration;

@@ -33,7 +33,7 @@ import org.junit.BeforeClass;
  * This shows how to test the Calculator service component.

  */

 public class ServiceNode {

-

+    private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";

     private static Node serviceNode;

 

     @BeforeClass

@@ -43,8 +43,8 @@ public class ServiceNode {
         NodeFactory factory = NodeFactory.newInstance();

         NodeConfiguration conf =

             factory.createNodeConfiguration().setURI("serviceNode")

-                .addBinding(SCABinding.TYPE, "http://localhost:8087/sca")

-                .addBinding(WebServiceBinding.TYPE, "http://localhost:8088/ws")

+                .addBinding(new QName(SCA11_NS, "binding.sca"), "http://localhost:8087/sca")

+                .addBinding(new QName(SCA11_NS, "binding.ws"), "http://localhost:8088/ws")

                 .addContribution("service", new File("../helloworld-service/target/classes").toURI().toString());

         serviceNode = factory.createNode(conf).start();

     }

diff --git a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java b/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
index f2b141e10f..f1b3af82a0 100644
--- a/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
+++ b/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
@@ -56,7 +56,6 @@ public class TwoNodesTestCase {
             factory.createNodeConfiguration().setURI("clientNode")

                 .addContribution("client", getJar("../helloworld-client/target"));

         clientNode = factory.createNode(configuration2).start();

-        clientNode.start();

     }

 

     /**