You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/06/30 00:52:21 UTC
svn commit: r789483 - in
/tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest:
ClientNode.java ServiceNode.java TwoNodesTestCase.java
Author: rfeng
Date: Mon Jun 29 22:52:20 2009
New Revision: 789483
URL: http://svn.apache.org/viewvc?rev=789483&view=rev
Log:
Remove dependency on SCABinding/WebServiceBinding models
Remove duplicate start method
Modified:
tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
Modified: tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java?rev=789483&r1=789482&r2=789483&view=diff
==============================================================================
--- tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java (original)
+++ tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java Mon Jun 29 22:52:20 2009
@@ -25,8 +25,8 @@
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 @@
* 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 @@
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);
Modified: tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java?rev=789483&r1=789482&r2=789483&view=diff
==============================================================================
--- tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java (original)
+++ tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java Mon Jun 29 22:52:20 2009
@@ -21,8 +21,8 @@
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 @@
* 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 @@
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();
}
Modified: tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java?rev=789483&r1=789482&r2=789483&view=diff
==============================================================================
--- tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java (original)
+++ tuscany/java/sca/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java Mon Jun 29 22:52:20 2009
@@ -56,7 +56,6 @@
factory.createNodeConfiguration().setURI("clientNode")
.addContribution("client", getJar("../helloworld-client/target"));
clientNode = factory.createNode(configuration2).start();
- clientNode.start();
}
/**