diff options
31 files changed, 620 insertions, 202 deletions
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/pom.xml b/sca-java-2.x/trunk/itest/implementation-spring/pom.xml index 548b3e955e..5c3c99567a 100644 --- a/sca-java-2.x/trunk/itest/implementation-spring/pom.xml +++ b/sca-java-2.x/trunk/itest/implementation-spring/pom.xml @@ -60,6 +60,12 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-jetty</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-policy-security</artifactId> <version>2.0-SNAPSHOT</version> </dependency> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java index dde328ecd2..3ad98ba1f5 100644 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java +++ b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java @@ -21,6 +21,8 @@ package org.apache.tuscany.sca.itest.bindingsca; import java.io.File; +import org.apache.tuscany.sca.assembly.SCABinding; +import org.apache.tuscany.sca.binding.ws.WebServiceBinding; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; import org.apache.tuscany.sca.node.configuration.NodeConfiguration; @@ -66,7 +68,10 @@ public class BindingSCATestCase { static Node createServiceNode(NodeFactory factory) { NodeConfiguration config2 = factory.createNodeConfiguration().setDomainURI(DOMAIN_URI).setURI("node2").addContribution("c2", ROOT) - .addDeploymentComposite("c2", SERVICE).setDomainRegistryURI(REGISTRY_URI); + .addDeploymentComposite("c2", SERVICE).setDomainRegistryURI(REGISTRY_URI) + .addBinding(WebServiceBinding.TYPE, "http://localhost:8085/").addBinding(SCABinding.TYPE, + "http://localhost:8085/"); + Node node2 = factory.createNode(config2); return node2; } @@ -79,7 +84,9 @@ public class BindingSCATestCase { static Node createClientNode(NodeFactory factory) { NodeConfiguration config1 = factory.createNodeConfiguration().setDomainURI(DOMAIN_URI).setURI("node1").addContribution("c1", ROOT) - .addDeploymentComposite("c1", CLIENT).setDomainRegistryURI(REGISTRY_URI); + .addDeploymentComposite("c1", CLIENT).setDomainRegistryURI(REGISTRY_URI) + .addBinding(WebServiceBinding.TYPE, "http://localhost:8085/").addBinding(SCABinding.TYPE, + "http://localhost:8085/"); Node node1 = factory.createNode(config1); return node1; } diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java index 7e3cf0c3e6..e8a62eef99 100644 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java +++ b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java @@ -25,6 +25,7 @@ import itest.nodes.Helloworld; import java.net.URI;
+import org.apache.tuscany.sca.binding.rmi.RMIBinding;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
@@ -42,6 +43,8 @@ public class TwoRemoteNodesTestCase{ @BeforeClass
public static void setUpBeforeClass() throws Exception {
+ System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
+
serviceNode = NodeFactory.newInstance().createNode(URI.create("tuscany:TwoRemoteNodesTestCase"), "../helloworld-service/target/classes");
serviceNode.start();
@@ -78,5 +81,6 @@ public class TwoRemoteNodesTestCase{ if (clientNode != null) {
clientNode.stop();
}
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
}
diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java index 7e3cf0c3e6..ac86083e9e 100644 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java +++ b/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java @@ -25,6 +25,7 @@ import itest.nodes.Helloworld; import java.net.URI;
+import org.apache.tuscany.sca.binding.rmi.RMIBinding;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
@@ -42,6 +43,7 @@ public class TwoRemoteNodesTestCase{ @BeforeClass
public static void setUpBeforeClass() throws Exception {
+ System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
serviceNode = NodeFactory.newInstance().createNode(URI.create("tuscany:TwoRemoteNodesTestCase"), "../helloworld-service/target/classes");
serviceNode.start();
@@ -78,5 +80,6 @@ public class TwoRemoteNodesTestCase{ if (clientNode != null) {
clientNode.stop();
}
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
}
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml index 6e282e1f12..98474d2cf4 100644 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml +++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml @@ -22,6 +22,7 @@ <target name="run">
<java classpath="${runtime_classpath}" classname="org.apache.tuscany.sca.node.launcher.NodeMain" fork="true">
+ <sysproperty key="org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding" value="{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi"/>
<arg value="-node"/>
<arg value="./server-config.xml"/>
<!-- Give the server 60 seconds to stay -->
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java index 5df68b8f2f..d94c9850b5 100644 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java +++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java @@ -21,6 +21,7 @@ package itest; import java.net.URI;
+import org.apache.tuscany.sca.binding.rmi.RMIBinding;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
@@ -33,6 +34,7 @@ public class Client { @BeforeClass
public static void setUpBeforeClass() throws Exception {
+ System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
clientNode = NodeFactory.newInstance().createNode(URI.create("tuscany:default"), "../helloworld-client/target//classes");
clientNode.start();
}
@@ -46,6 +48,7 @@ public class Client { if (clientNode != null) {
clientNode.stop();
}
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
public static void main(String[] args) throws Exception {
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java index 67f2c913dc..da5ab5a27c 100644 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java +++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java @@ -23,12 +23,14 @@ import itest.nodes.Helloworld; import java.net.URI; +import org.apache.tuscany.sca.binding.rmi.RMIBinding; import org.apache.tuscany.sca.node.NodeFactory; import org.oasisopen.sca.client.SCAClientFactory; public class SCAClient { public void testSCAClient() throws Exception { + System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString()); // The configuration required when running with sca-client-rmi and endpoint-hazelcast-rmi //SCAClientFactory factory = SCAClientFactory.newInstance(URI.create("tuscanyclient:default?remotes=192.168.247.1:14820")); @@ -56,6 +58,7 @@ public class SCAClient { // or just rely on the runtime hosting the classes using the SCAClient // when it's on its way down NodeFactory.getInstance().destroy(); + System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding"); } public static void main(String[] args) throws Exception { diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java index dbccfd4407..51166fbef4 100644 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java +++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java @@ -21,6 +21,7 @@ package itest; import java.net.URI;
+import org.apache.tuscany.sca.binding.rmi.RMIBinding;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
@@ -33,6 +34,8 @@ public class Service { @BeforeClass
public static void setUpBeforeClass() throws Exception {
+ System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
+
serviceNode = NodeFactory.newInstance().createNode(URI.create("tuscany:default"), "../helloworld-service/target/classes");
serviceNode.start();
}
@@ -48,6 +51,7 @@ public class Service { if (serviceNode != null) {
serviceNode.stop();
}
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
public static void main(String[] args) throws Exception {
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server.xml index 267650c2d8..05a5aa16e9 100644 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server.xml +++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server.xml @@ -22,6 +22,7 @@ <target name="run"> <java classpath="${runtime_classpath}" classname="org.apache.tuscany.sca.node.launcher.NodeMain" fork="true"> + <sysproperty key="org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding" value="{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi"/> <arg value="-node"/> <arg value="./server-config.xml"/> <arg value="-ttl"/> diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java index 4e7b099ad4..8921d90aa2 100644 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java +++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java @@ -21,6 +21,7 @@ package itest; import java.io.File;
+import org.apache.tuscany.sca.binding.rmi.RMIBinding;
import org.apache.tuscany.sca.domain.node.DomainNode;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
@@ -35,6 +36,7 @@ public class Client { @BeforeClass
public static void setUpBeforeClass() throws Exception {
+ System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
NodeFactory factory = NodeFactory.newInstance();
clientNode = factory.createNode(new File("client-config.xml").toURI().toURL());
@@ -59,6 +61,8 @@ public class Client { if (clientNode != null) {
clientNode.stop();
}
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
+
}
public static void main(String[] args) throws Exception {
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java index cd020b5c33..42594f3da9 100644 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java +++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java @@ -21,6 +21,7 @@ package itest; import java.io.File;
+import org.apache.tuscany.sca.binding.rmi.RMIBinding;
import org.apache.tuscany.sca.domain.node.DomainNode;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
@@ -35,6 +36,7 @@ public class Service { @BeforeClass
public static void setUpBeforeClass() throws Exception {
+ System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
NodeFactory factory = NodeFactory.newInstance();
serviceNode = factory.createNode(new File("server-config.xml").toURI().toURL());
@@ -56,5 +58,6 @@ public class Service { if (serviceNode != null) {
serviceNode.stop();
}
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
}
diff --git a/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/test/java/test/scaclient/SCAClientTestCase.java index 35e5e28194..91a3f552f4 100644 --- a/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/test/java/test/scaclient/SCAClientTestCase.java +++ b/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/test/java/test/scaclient/SCAClientTestCase.java @@ -19,14 +19,17 @@ package test.scaclient;
+import static org.junit.Assert.assertEquals;
import itest.HelloworldService;
import java.net.URI;
-import junit.framework.TestCase;
-
+import org.apache.tuscany.sca.binding.rmi.RMIBinding;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.oasisopen.sca.client.SCAClientFactory;
@@ -35,9 +38,19 @@ import org.oasisopen.sca.client.SCAClientFactory; *
* @version $Rev: 904064 $ $Date: 2010-01-28 12:31:36 +0000 (Thu, 28 Jan 2010) $
*/
-public class SCAClientTestCase extends TestCase {
+public class SCAClientTestCase {
private Node node;
+
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
+ }
+
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
+ }
@Test
public void testDefault() throws Exception {
@@ -77,8 +90,8 @@ public class SCAClientTestCase extends TestCase { assertEquals("Hello petra", service.sayHello("petra"));
}
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
node.stop();
}
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java index 0dbe8b864b..e196b9cdc6 100644 --- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java +++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java @@ -38,7 +38,7 @@ public class AsynchTestCase { @BeforeClass
public static void init() throws Exception {
System.out.println("Setting up nodes");
-
+ // System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
try {
// create and start nodes
Contribution contrib = new Contribution("asynch", "./target/test-classes/asynchReference");
@@ -60,6 +60,7 @@ public class AsynchTestCase { public static void destroy() throws Exception {
nodeA.stop();
nodeB.stop();
+ // System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
@Test
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java index b981bbc943..f679312447 100644 --- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java +++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java @@ -36,6 +36,7 @@ public class CallbackTestCase { @BeforeClass
public static void init() throws Exception {
System.out.println("Setting up nodes");
+ // System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
try {
// create and start nodes
@@ -58,6 +59,7 @@ public class CallbackTestCase { public static void destroy() throws Exception {
nodeA.stop();
nodeB.stop();
+ // System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
//@Test
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java index 992850e470..e7d6d7fab9 100644 --- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java +++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java @@ -20,6 +20,7 @@ package org.apache.tuscany.sca.binding.sca.rmi; import junit.framework.Assert;
+import org.apache.tuscany.sca.binding.rmi.RMIBinding;
import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
import org.apache.tuscany.sca.node.Contribution;
import org.apache.tuscany.sca.node.Node;
@@ -37,6 +38,7 @@ public class PromotionTestCase { @BeforeClass
public static void init() throws Exception {
System.out.println("Setting up nodes");
+ System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
try {
// create and start nodes
@@ -59,6 +61,8 @@ public class PromotionTestCase { public static void destroy() throws Exception {
nodeA.stop();
nodeB.stop();
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
+
}
@Test
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java index a6f4f216d6..4154ed778a 100644 --- a/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java +++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java @@ -20,6 +20,7 @@ package org.apache.tuscany.sca.binding.sca.rmi; import junit.framework.Assert;
+import org.apache.tuscany.sca.binding.rmi.RMIBinding;
import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
import org.apache.tuscany.sca.node.Contribution;
import org.apache.tuscany.sca.node.Node;
@@ -31,21 +32,24 @@ import org.oasisopen.sca.ServiceUnavailableException; public class SimpleTestCase {
+ private static NodeFactory factory;
public static Node nodeA;
public static Node nodeB;
@BeforeClass
public static void init() throws Exception {
System.out.println("Setting up nodes");
+ System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
try {
+ factory = NodeFactory.getInstance();
// create and start nodes
Contribution contrib = new Contribution("reference", "./target/test-classes/simpleReference");
- nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
+ nodeA = factory.createNode("HelloWorld.composite", contrib);
nodeA.start();
contrib = new Contribution("service", "./target/test-classes/simpleService");
- nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
+ nodeB = factory.createNode("HelloWorld.composite", contrib);
nodeB.start();
} catch (Exception ex) {
@@ -59,6 +63,8 @@ public class SimpleTestCase { public static void destroy() throws Exception {
nodeA.stop();
nodeB.stop();
+ factory.destroy();
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
@Test
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/binding-sca-runtime/META-INF/MANIFEST.MF index 90adf537f3..60fe20a40f 100644 --- a/sca-java-2.x/trunk/modules/binding-sca-runtime/META-INF/MANIFEST.MF +++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Version: 2.0.0 Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA Default Binding Model
-Import-Package: javax.xml.namespace,
+Import-Package: javax.xml.namespace,
javax.xml.stream;resolution:=optional,
org.apache.tuscany.sca.assembly;version="2.0.0",
org.apache.tuscany.sca.assembly.builder;version="2.0.0",
@@ -18,6 +18,7 @@ Import-Package: javax.xml.namespace, org.apache.tuscany.sca.core;version="2.0.0",
org.apache.tuscany.sca.databinding;version="2.0.0",
org.apache.tuscany.sca.definitions;version="2.0.0",
+ org.apache.tuscany.sca.extensibility;version="2.0.0",
org.apache.tuscany.sca.interfacedef;version="2.0.0",
org.apache.tuscany.sca.invocation;version="2.0.0",
org.apache.tuscany.sca.monitor;version="2.0.0";resolution:=optional,
@@ -28,3 +29,14 @@ Import-Package: javax.xml.namespace, Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.runtime
Bundle-DocURL: http://www.apache.org/
Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 +Export-Package: org.apache.tuscany.sca.binding.sca.provider;version="2.0.0";
+ uses:="org.apache.tuscany.sca.databinding,
+ org.apache.tuscany.sca.runtime,
+ org.apache.tuscany.sca.assembly,
+ org.apache.tuscany.sca.provider,
+ org.apache.tuscany.sca.core,
+ org.apache.tuscany.sca.interfacedef,
+ javax.xml.namespace,
+ org.apache.tuscany.sca.invocation,
+ org.apache.tuscany.sca.contribution.processor,
+ org.apache.tuscany.sca.assembly.builder"
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java new file mode 100644 index 0000000000..14c8fae369 --- /dev/null +++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java @@ -0,0 +1,217 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.binding.sca.provider; + +import java.io.StringReader; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.logging.Logger; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; + +import org.apache.tuscany.sca.assembly.Base; +import org.apache.tuscany.sca.assembly.Binding; +import org.apache.tuscany.sca.assembly.builder.BindingBuilder; +import org.apache.tuscany.sca.assembly.builder.BuilderContext; +import org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint; +import org.apache.tuscany.sca.common.xml.stax.StAXHelper; +import org.apache.tuscany.sca.contribution.processor.ContributionReadException; +import org.apache.tuscany.sca.contribution.processor.ProcessorContext; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.extensibility.ServiceDeclarationParser; +import org.apache.tuscany.sca.policy.PolicySubject; +import org.apache.tuscany.sca.provider.ProviderFactory; +import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint; +import org.apache.tuscany.sca.runtime.DomainRegistryFactory; +import org.apache.tuscany.sca.runtime.DomainRegistryFactoryExtensionPoint; +import org.apache.tuscany.sca.runtime.RuntimeEndpoint; +import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; +import org.oasisopen.sca.ServiceRuntimeException; + +/** + * Default implementation of SCABindingMapper + */ +public class DefaultSCABindingMapper implements SCABindingMapper { + private final static Logger logger = Logger.getLogger(DefaultSCABindingMapper.class.getName()); + protected ExtensionPointRegistry registry; + protected ProviderFactoryExtensionPoint providerFactories; + protected StAXArtifactProcessor processor; + protected BindingBuilder builder; + protected QName mappedBinding; + private Binding bindingTemplate; + private boolean remotable; + + public DefaultSCABindingMapper(ExtensionPointRegistry registry, Map<String, String> attributes) { + this.registry = registry; + providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class); + BuilderExtensionPoint builders = registry.getExtensionPoint(BuilderExtensionPoint.class); + StAXArtifactProcessorExtensionPoint processors = + registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); + if (attributes != null) { + String qname = attributes.get("mappedBinding"); + if (qname != null) { + mappedBinding = ServiceDeclarationParser.getQName(qname); + } + } + if (mappedBinding == null) { + String qname = + System.getProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding"); + if (qname != null) { + mappedBinding = ServiceDeclarationParser.getQName(qname); + } else { + // By default, mapping to binding.ws + mappedBinding = new QName(Base.SCA11_NS, "binding.ws"); + } + } + + processor = processors.getProcessor(mappedBinding); + builder = builders.getBindingBuilder(mappedBinding); + if (processor == null) { + logger.warning("Mapped binding for binding.sca is not supported: " + mappedBinding); + } + + try { + if (processor != null) { + bindingTemplate = createDelegatingBinding(); + ProviderFactory providerFactory = providerFactories.getProviderFactory(bindingTemplate.getClass()); + if (providerFactory == null) { + logger.warning("Mapped binding for binding.sca is not supported: " + mappedBinding); + processor = null; + } + } + } catch (Throwable e) { + throw new ServiceRuntimeException(e); + } + remotable = isDistributed() && processor != null; + } + + // FIXME: [rfeng] This is a HACK to check if we should make binding.sca remotable + // by checking if we have distributed domain registry present + private boolean isDistributed() { + DomainRegistryFactoryExtensionPoint factories = + registry.getExtensionPoint(DomainRegistryFactoryExtensionPoint.class); + List<DomainRegistryFactory> list = factories.getDomainRegistryFactories(); + if (list.size() == 1) { + String[] schemes = list.get(0).getSupportedSchemes(); + if (Arrays.asList(schemes).contains("local")) { + return false; + } + } + return true; + } + + public RuntimeEndpoint map(RuntimeEndpoint endpoint) { + if (processor == null) { + return null; + } + // create a copy of the endpoint but with the web service binding in + RuntimeEndpoint ep = null; + try { + ep = (RuntimeEndpoint)endpoint.clone(); + } catch (Exception ex) { + // we know we can clone endpoint references + } + + Binding binding = map(endpoint.getBinding(), false); + ep.setBinding(binding); + if (builder != null) { + builder.build(ep.getComponent(), ep.getService(), binding, new BuilderContext(registry)); + } + return ep; + } + + public RuntimeEndpointReference map(RuntimeEndpointReference endpointReference) { + if (processor == null) { + return null; + } + // create a copy of the endpoint but with the web service binding in + RuntimeEndpointReference epr = null; + try { + epr = (RuntimeEndpointReference)endpointReference.clone(); + } catch (Exception ex) { + // we know we can clone endpoint references + } + + Binding binding = map(endpointReference.getBinding(), true); + epr.setBinding(binding); + + // epr.setTargetEndpoint(map((RuntimeEndpoint)epr.getTargetEndpoint())); + + if (builder != null) { + builder.build(epr.getComponent(), epr.getReference(), binding, new BuilderContext(registry)); + } + + return epr; + } + + protected Binding map(Binding scaBinding, boolean referenceSide) { + try { + Binding binding = createDelegatingBinding(); + binding.setName(scaBinding.getName()); + if (!referenceSide) { + // Only set the binding URI for the service side + binding.setURI(scaBinding.getURI()); + } + binding.setOperationSelector(scaBinding.getOperationSelector()); + binding.setRequestWireFormat(scaBinding.getRequestWireFormat()); + binding.setResponseWireFormat(scaBinding.getResponseWireFormat()); + if (binding instanceof PolicySubject && scaBinding instanceof PolicySubject) { + PolicySubject subject1 = (PolicySubject)binding; + PolicySubject subject2 = (PolicySubject)scaBinding; + subject1.getPolicySets().addAll(subject2.getPolicySets()); + subject1.getRequiredIntents().addAll(subject2.getRequiredIntents()); + } + return binding; + } catch (Throwable e) { + throw new ServiceRuntimeException(e); + } + + } + + private Binding createDelegatingBinding() throws XMLStreamException, ContributionReadException { + if (bindingTemplate != null) { + try { + return (Binding)bindingTemplate.clone(); + } catch (CloneNotSupportedException e) { + // Ignore + } + } + // This is a hack to create an instance of the binding using the XML QName + StringBuffer xml = new StringBuffer(); + xml.append("<").append(mappedBinding.getLocalPart()).append(" xmlns:b=\"").append(mappedBinding + .getNamespaceURI()).append("\"/>"); + + StAXHelper staxHelper = StAXHelper.getInstance(registry); + XMLStreamReader reader = staxHelper.createXMLStreamReader(new StringReader(xml.toString())); + reader.nextTag(); + Binding binding = (Binding)processor.read(reader, new ProcessorContext(registry)); + return binding; + } + + public boolean isRemotable() { + return remotable; + } + +} diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java new file mode 100644 index 0000000000..a8fec07f5c --- /dev/null +++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.binding.sca.provider; + +import org.apache.tuscany.sca.interfacedef.InterfaceContract; +import org.apache.tuscany.sca.interfacedef.Operation; +import org.apache.tuscany.sca.invocation.Invoker; +import org.apache.tuscany.sca.provider.EndpointReferenceProvider; +import org.apache.tuscany.sca.provider.ReferenceBindingProvider; +import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; + +/** + * The reference binding provider for the remote sca binding implementation. + */ +public class DelegatingSCAReferenceBindingProvider implements EndpointReferenceProvider { + + private ReferenceBindingProvider provider; + + public DelegatingSCAReferenceBindingProvider(RuntimeEndpointReference endpointReference, + SCABindingMapper mapper) { + RuntimeEndpointReference epr = mapper.map(endpointReference); + if (epr != null) { + provider = epr.getBindingProvider(); + } + } + + public InterfaceContract getBindingInterfaceContract() { + return provider.getBindingInterfaceContract(); + } + + public boolean supportsOneWayInvocation() { + return provider.supportsOneWayInvocation(); + } + + public Invoker createInvoker(Operation operation) { + return provider.createInvoker(operation); + } + + public void start() { + provider.start(); + } + + public void stop() { + provider.stop(); + } + + public void configure() { + if (provider instanceof EndpointReferenceProvider) { + ((EndpointReferenceProvider)provider).configure(); + } + } +} diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java new file mode 100644 index 0000000000..47625b5d5d --- /dev/null +++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.binding.sca.provider; + +import java.util.logging.Logger; + +import org.apache.tuscany.sca.assembly.Binding; +import org.apache.tuscany.sca.interfacedef.InterfaceContract; +import org.apache.tuscany.sca.provider.ServiceBindingProvider; +import org.apache.tuscany.sca.runtime.RuntimeEndpoint; + +/** + * The service binding provider for the remote sca binding implementation. Relies on the + * binding-ws-axis implementation for providing a remote message endpoint + * + * @version $Rev$ $Date$ + */ +public class DelegatingSCAServiceBindingProvider implements ServiceBindingProvider { + + private static final Logger logger = Logger.getLogger(DelegatingSCAServiceBindingProvider.class.getName()); + + private ServiceBindingProvider provider; + protected Class<? extends Binding> bindingClass; + private boolean started = false; + + public DelegatingSCAServiceBindingProvider(RuntimeEndpoint endpoint, SCABindingMapper mapper) { + RuntimeEndpoint ep = mapper.map(endpoint); + if (ep != null) { + endpoint.setBinding(ep.getBinding()); + provider = ep.getBindingProvider(); + } + + } + + public InterfaceContract getBindingInterfaceContract() { + return provider.getBindingInterfaceContract(); + } + + public boolean supportsOneWayInvocation() { + return provider.supportsOneWayInvocation(); + } + + public void start() { + if (started) { + return; + } else { + provider.start(); + started = true; + } + } + + public void stop() { + if (!started) { + return; + } + try { + provider.stop(); + } finally { + started = false; + } + } + +} diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java index 1f84dd5d19..88c6888ba9 100644 --- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java +++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java @@ -19,14 +19,9 @@ package org.apache.tuscany.sca.binding.sca.provider; -import java.util.logging.Logger; - -import org.apache.tuscany.sca.assembly.DistributedSCABinding; import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.assembly.SCABindingFactory; import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.databinding.Mediator; import org.apache.tuscany.sca.interfacedef.Compatibility; @@ -35,9 +30,7 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.InvocationChain; import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.provider.BindingProviderFactory; import org.apache.tuscany.sca.provider.EndpointReferenceProvider; -import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint; import org.apache.tuscany.sca.provider.ReferenceBindingProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; @@ -58,19 +51,17 @@ import org.oasisopen.sca.ServiceUnavailableException; */ public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceProvider { - private static final Logger logger = Logger.getLogger(RuntimeSCAReferenceBindingProvider.class.getName()); - private RuntimeEndpointReference endpointReference; private RuntimeComponent component; private RuntimeComponentReference reference; private SCABinding binding; + private boolean remotable; private boolean started = false; - private BindingProviderFactory<DistributedSCABinding> distributedProviderFactory = null; - private ReferenceBindingProvider distributedProvider = null; - private SCABindingFactory scaBindingFactory; + private ReferenceBindingProvider distributedProvider; private Mediator mediator; private InterfaceContractMapper interfaceContractMapper; + private SCABindingMapper scaBindingMapper; public RuntimeSCAReferenceBindingProvider(ExtensionPointRegistry extensionPoints, RuntimeEndpointReference endpointReference) { @@ -78,93 +69,36 @@ public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceProv this.component = (RuntimeComponent)endpointReference.getComponent(); this.reference = (RuntimeComponentReference)endpointReference.getReference(); this.binding = (SCABinding)endpointReference.getBinding(); - this.scaBindingFactory = - extensionPoints.getExtensionPoint(FactoryExtensionPoint.class).getFactory(SCABindingFactory.class); - - // look to see if a distributed SCA binding implementation has - // been included on the classpath. This will be needed by the - // provider itself to do it's thing - ProviderFactoryExtensionPoint factoryExtensionPoint = - extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class); - distributedProviderFactory = - (BindingProviderFactory<DistributedSCABinding>)factoryExtensionPoint - .getProviderFactory(DistributedSCABinding.class); UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); this.mediator = utilities.getUtility(Mediator.class); this.interfaceContractMapper = utilities.getUtility(InterfaceContractMapper.class); + this.scaBindingMapper = utilities.getUtility(SCABindingMapper.class); + remotable = isTargetRemote(); + getDistributedProvider(); } - public boolean isTargetRemote() { + private boolean isTargetRemote() { return endpointReference.getTargetEndpoint().isRemote(); - /* - boolean targetIsRemote = false; - - // The decision is based on the results of the wiring process in the assembly model - // and there are three possibilities - // 1 - target service is running in a separate node in a separate JVM - // 2 - target service is running in a separate node in the same JVM - // 3 - target service is running in the same node - - // TODO - EPR - the method needs to be able to indicate the three cases - - - if (RemoteBindingHelper.isTargetRemote()) { - // TODO - EPR - what is this RemoteBindingHelper for? - if (reference.getInterfaceContract() != null) { - targetIsRemote = reference.getInterfaceContract().getInterface().isRemotable(); - } else { - targetIsRemote = true; - } - } if ( (endpointReference.isRemote()) && - (endpointReference.getTargetEndpoint().isRemote())){ - // case 1 - targetIsRemote = true; - } else if (endpointReference.isRemote()) { - // case 2 - targetIsRemote = false; - } else { - // case 3 - targetIsRemote = false; - } - return targetIsRemote; - */ } private ReferenceBindingProvider getDistributedProvider() { - if (isTargetRemote()) { + if (remotable) { // initialize the remote provider if it hasn't been done already if (distributedProvider == null) { - if (reference.getInterfaceContract() != null && !reference.getInterfaceContract().getInterface().isRemotable()) { + if (reference.getInterfaceContract() != null && !reference.getInterfaceContract().getInterface() + .isRemotable()) { throw new ServiceRuntimeException("Reference interface not remotable for component: " + component .getName() + " and reference: " + reference.getName()); } - if (distributedProviderFactory == null) { - throw new ServiceRuntimeException("No distributed SCA binding available for component: " + component - .getName() - + " and reference: " - + reference.getName()); + if (scaBindingMapper.isRemotable()) { + distributedProvider = + new DelegatingSCAReferenceBindingProvider(endpointReference, scaBindingMapper); } - - // create the remote provider - DistributedSCABinding distributedBinding = scaBindingFactory.createDistributedSCABinding(); - distributedBinding.setSCABinding(binding); - - // create a copy of the endpoint reference and change the binding - RuntimeEndpointReference epr = null; - try { - epr = (RuntimeEndpointReference)endpointReference.clone(); - } catch (Exception ex) { - // we know we can clone endpoint references - } - epr.setBinding(distributedBinding); - - distributedProvider = - distributedProviderFactory.createReferenceBindingProvider(epr); } } @@ -172,8 +106,8 @@ public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceProv } public InterfaceContract getBindingInterfaceContract() { - if (isTargetRemote()) { - return getDistributedProvider().getBindingInterfaceContract(); + if (remotable && distributedProvider != null) { + return distributedProvider.getBindingInterfaceContract(); } else { // Check if there is a target RuntimeEndpoint endpoint = (RuntimeEndpoint)endpointReference.getTargetEndpoint(); @@ -186,31 +120,32 @@ public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceProv } public boolean supportsOneWayInvocation() { - if (isTargetRemote()) { - return getDistributedProvider().supportsOneWayInvocation(); + if (remotable && distributedProvider != null) { + return distributedProvider.supportsOneWayInvocation(); } else { return false; } } - private Invoker getInvoker(RuntimeEndpointReference epr, Operation operation) { Endpoint target = epr.getTargetEndpoint(); if (target != null) { RuntimeComponentService service = (RuntimeComponentService)target.getService(); if (service != null) { // not a callback wire - InvocationChain chain = ((RuntimeEndpoint) target).getInvocationChain(operation); - + InvocationChain chain = ((RuntimeEndpoint)target).getInvocationChain(operation); + boolean passByValue = false; Operation targetOp = chain.getTargetOperation(); if (!operation.getInterface().isRemotable()) { if (interfaceContractMapper.isCompatibleByReference(operation, targetOp, Compatibility.SUBSET)) { - passByValue = false; + passByValue = false; } } else { // boolean allowsPBR = chain.allowsPassByReference(); TODO: TUSCANY-3479 this breaks the conformance tests as it needs to consider _both_ ends boolean allowsPBR = false; - if (allowsPBR && interfaceContractMapper.isCompatibleByReference(operation, targetOp, Compatibility.SUBSET)) { + if (allowsPBR && interfaceContractMapper.isCompatibleByReference(operation, + targetOp, + Compatibility.SUBSET)) { passByValue = false; } else if (interfaceContractMapper.isCompatibleByValue(operation, targetOp, Compatibility.SUBSET)) { passByValue = true; @@ -226,19 +161,21 @@ public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceProv } public Invoker createInvoker(Operation operation) { - if (isTargetRemote()) { - return getDistributedProvider().createInvoker(operation); + if (remotable && distributedProvider != null) { + return distributedProvider.createInvoker(operation); } else { Invoker invoker = getInvoker(endpointReference, operation); if (invoker == null) { - throw new ServiceUnavailableException("Unable to create SCA binding invoker for local target " + component.getName() - + " reference " - + reference.getName() - + " (bindingURI=" - + binding.getURI() - + " operation=" - + operation.getName() - + ")" ); + throw new ServiceUnavailableException( + "Unable to create SCA binding invoker for local target " + component + .getName() + + " reference " + + reference.getName() + + " (bindingURI=" + + binding.getURI() + + " operation=" + + operation.getName() + + ")"); } return invoker; } @@ -247,8 +184,8 @@ public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceProv public void start() { if (started) { return; - } - if (getDistributedProvider() != null) { + } + if (distributedProvider != null) { distributedProvider.start(); } started = true; @@ -257,10 +194,10 @@ public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceProv public void stop() { if (!started) { return; - } + } try { - if (getDistributedProvider() != null) { + if (distributedProvider != null) { distributedProvider.stop(); } } finally { diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java index 59e787e2d4..14d7284846 100644 --- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java +++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java @@ -19,22 +19,10 @@ package org.apache.tuscany.sca.binding.sca.provider; -import java.net.URI; -import java.util.Collection; - -import org.apache.tuscany.sca.assembly.DistributedSCABinding; -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.assembly.SCABindingFactory; import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; +import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.provider.BindingProviderFactory; -import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint; import org.apache.tuscany.sca.provider.ServiceBindingProvider; -import org.apache.tuscany.sca.runtime.DomainRegistryFactory; -import org.apache.tuscany.sca.runtime.EndpointRegistry; -import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory; import org.apache.tuscany.sca.runtime.RuntimeComponentService; import org.apache.tuscany.sca.runtime.RuntimeEndpoint; @@ -49,69 +37,39 @@ import org.apache.tuscany.sca.runtime.RuntimeEndpoint; public class RuntimeSCAServiceBindingProvider implements ServiceBindingProvider { private RuntimeEndpoint endpoint; private RuntimeComponentService service; - private SCABinding binding; - - - private BindingProviderFactory<DistributedSCABinding> distributedProviderFactory; + private ServiceBindingProvider distributedProvider; - private DistributedSCABinding distributedBinding; - + private SCABindingMapper scaBindingMapper; public RuntimeSCAServiceBindingProvider(ExtensionPointRegistry extensionPoints, RuntimeEndpoint endpoint) { this.endpoint = endpoint; this.service = (RuntimeComponentService)endpoint.getService(); - this.binding = (SCABinding)endpoint.getBinding(); - + UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); + this.scaBindingMapper = utilities.getUtility(SCABindingMapper.class); + // if there is potentially a wire to this service that crosses the node boundary // then we need to create a remote endpoint if (service.getInterfaceContract().getInterface().isRemotable()) { - // look to see if a distributed SCA binding implementation has - // been included on the classpath. This will be needed by the - // provider itself to do it's thing - ProviderFactoryExtensionPoint factoryExtensionPoint = - extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class); - distributedProviderFactory = - (BindingProviderFactory<DistributedSCABinding>)factoryExtensionPoint - .getProviderFactory(DistributedSCABinding.class); - - if (isDistributed(extensionPoints, endpoint)) { - - SCABindingFactory scaBindingFactory = - extensionPoints.getExtensionPoint(FactoryExtensionPoint.class).getFactory(SCABindingFactory.class); - - // create a nested provider to handle the remote case - distributedBinding = scaBindingFactory.createDistributedSCABinding(); - distributedBinding.setSCABinding(binding); - - // create a copy of the endpoint and change the binding - RuntimeEndpoint ep = null; - try { - ep = (RuntimeEndpoint)endpoint.clone(); - } catch (Exception ex) { - // we know we can clone endpoint - } - ep.setBinding(distributedBinding); - - distributedProvider = - distributedProviderFactory.createServiceBindingProvider(ep); - } + if (scaBindingMapper.isRemotable()) { + distributedProvider = new DelegatingSCAServiceBindingProvider(endpoint, scaBindingMapper); + } } } - + + /* protected boolean isDistributed(ExtensionPointRegistry extensionPoints, Endpoint endpoint) { // find if the node config is for distributed endpoints // TODO: temp, need a much better way to do this - if (distributedProviderFactory != null) { - DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionPoints); - Collection<EndpointRegistry> eprs = domainRegistryFactory.getEndpointRegistries(); - if (eprs.size() > 0) { - String eprName = eprs.iterator().next().getClass().getName(); - return !eprName.equals("org.apache.tuscany.sca.core.assembly.impl.EndpointRegistryImpl"); - } + DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionPoints); + Collection<EndpointRegistry> eprs = domainRegistryFactory.getEndpointRegistries(); + if (eprs.size() > 0) { + String eprName = eprs.iterator().next().getClass().getName(); + return !eprName.equals("org.apache.tuscany.sca.core.assembly.impl.EndpointRegistryImpl"); } return false; } + */ public InterfaceContract getBindingInterfaceContract() { if (distributedProvider != null) { @@ -122,6 +80,9 @@ public class RuntimeSCAServiceBindingProvider implements ServiceBindingProvider } public boolean supportsOneWayInvocation() { + if (distributedProvider != null) { + return distributedProvider.supportsOneWayInvocation(); + } return false; } @@ -135,21 +96,6 @@ public class RuntimeSCAServiceBindingProvider implements ServiceBindingProvider if (distributedProvider != null) { distributedProvider.stop(); } - - if (distributedBinding != null) { - // reset the binding URI to null so that if the composite containing the component - // with the service/binding is restarted the binding will have the correct URI set - SCABinding scaBinding = distributedBinding.getSCABinding(); - try { - URI tempURI = new URI(scaBinding.getURI()); - if (!tempURI.isAbsolute()){ - scaBinding.setURI(null); - } - } catch (Exception ex){ - scaBinding.setURI(null); - } - } - } } diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java new file mode 100644 index 0000000000..03aa44a04e --- /dev/null +++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java @@ -0,0 +1,50 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.binding.sca.provider; + +import org.apache.tuscany.sca.runtime.RuntimeEndpoint; +import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; + +/** + * SCABindingMapper allows us to map binding.sca to any of the bindings available to the runtime + */ +public interface SCABindingMapper { + + /** + * Map an endpoint with binding.sca to an endpoint + * @param endpoint The endpoint for binding.sca + * @return The endpoint for the mapped binding + */ + public RuntimeEndpoint map(RuntimeEndpoint endpoint); + + /** + * Map an endpoint reference with binding.sca to an endpoint reference with the mapped binding + * @param endpointReference + * @return The endpoint reference for the mapped binding + */ + public RuntimeEndpointReference map(RuntimeEndpointReference endpointReference); + + /** + * Check if the remote SCA binding is supported + * @return + */ + boolean isRemotable(); + +} diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper new file mode 100644 index 0000000000..2719598883 --- /dev/null +++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper @@ -0,0 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+org.apache.tuscany.sca.binding.sca.provider.DefaultSCABindingMapper
\ No newline at end of file diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java index 58e453ed37..f9db05f29f 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java @@ -56,5 +56,5 @@ public interface RuntimeEndpointReference extends EndpointReference, Invocable, InterfaceContract getComponentTypeReferenceInterfaceContract(); boolean isOutOfDate(); void rebuild(); - + boolean isStarted(); } diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java index 629d39ad3e..e7d2d5d841 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java @@ -558,17 +558,19 @@ public class CompositeActivatorImpl implements CompositeActivator { } public void stop(RuntimeEndpointReference epr) { - CompositeContext compositeContext = epr.getCompositeContext(); - if (compositeContext == null) { - throw new IllegalStateException("The endpoint reference is not bound"); - } - compositeContext.getEndpointRegistry().removeEndpointReference(epr); - ReferenceBindingProvider bindingProvider = epr.getBindingProvider(); - if (bindingProvider != null) { - bindingProvider.stop(); - } - for (PolicyProvider policyProvider : epr.getPolicyProviders()) { - policyProvider.stop(); + if (epr.isStarted()) { + CompositeContext compositeContext = epr.getCompositeContext(); + if (compositeContext == null) { + throw new IllegalStateException("The endpoint reference is not bound"); + } + compositeContext.getEndpointRegistry().removeEndpointReference(epr); + ReferenceBindingProvider bindingProvider = epr.getBindingProvider(); + if (bindingProvider != null) { + bindingProvider.stop(); + } + for (PolicyProvider policyProvider : epr.getPolicyProviders()) { + policyProvider.stop(); + } } } diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java index 156d73c82e..2e68602713 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java @@ -101,6 +101,8 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen protected InterfaceContract referenceInterfaceContract; private String xml; + private boolean started; + /** * No-arg constructor for Java serilization */ @@ -321,6 +323,7 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen policyProvider.start(); } + started = true; // InterfaceContract bindingContract = getBindingInterfaceContract(); // endpoint.setInterfaceContract(bindingContract); } @@ -532,4 +535,8 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen } } + public boolean isStarted() { + return started; + } + } diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java index f338f55ffa..ae90442e4a 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java @@ -33,6 +33,7 @@ import org.apache.tuscany.sca.assembly.ComponentReference; import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.assembly.Multiplicity; +import org.apache.tuscany.sca.assembly.builder.BindingBuilder; import org.apache.tuscany.sca.assembly.builder.BuilderContext; import org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint; import org.apache.tuscany.sca.assembly.builder.PolicyBuilder; @@ -323,12 +324,24 @@ public class EndpointReferenceBinderImpl implements EndpointReferenceBinder { return; } else { endpointReference.setTargetEndpoint(matchedEndpoint); - endpointReference.setBinding(endpointReference.getTargetEndpoint().getBinding()); + Binding binding = endpointReference.getTargetEndpoint().getBinding(); + endpointReference.setBinding(binding); + build(endpointReference); endpointReference.setStatus(EndpointReference.Status.WIRED_TARGET_FOUND_AND_MATCHED); endpointReference.setUnresolved(false); } } + private void build(EndpointReference endpointReference) { + BindingBuilder builder = builders.getBindingBuilder(endpointReference.getBinding().getType()); + if (builder != null) { + builder.build(endpointReference.getComponent(), + endpointReference.getReference(), + endpointReference.getBinding(), + new BuilderContext(extensionPoints)); + } + } + /** * Selects a callback endpoint from a list of possible candidates * diff --git a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java index 4083b4c0b4..811799e239 100644 --- a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java +++ b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java @@ -193,7 +193,7 @@ public abstract class NodeFactory extends DefaultNodeConfigurationFactory { * Configure the NodeFactory instance * @param attributes */ - protected void configure(Map<String, Map<String, String>> attributes) { + public void configure(Map<String, Map<String, String>> attributes) { } private synchronized static Class<?> getFactoryImplClass() throws Exception { diff --git a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java index 20984a9d6b..30d61b51bf 100644 --- a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java +++ b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java @@ -465,7 +465,7 @@ public class NodeFactoryImpl extends NodeFactory { } @Override - protected void configure(Map<String, Map<String, String>> attributes) { + public void configure(Map<String, Map<String, String>> attributes) { ServiceDiscovery discovery = getExtensionPoints().getServiceDiscovery(); for (Map.Entry<String, Map<String, String>> e : attributes.entrySet()) { discovery.setAttribute(e.getKey(), e.getValue()); diff --git a/sca-java-2.x/trunk/modules/sca-client-rmi/src/test/java/org/apache/tuscany/sca/client/rmi/ClientTestCase.java b/sca-java-2.x/trunk/modules/sca-client-rmi/src/test/java/org/apache/tuscany/sca/client/rmi/ClientTestCase.java index dd30719869..cbfab52b6f 100644 --- a/sca-java-2.x/trunk/modules/sca-client-rmi/src/test/java/org/apache/tuscany/sca/client/rmi/ClientTestCase.java +++ b/sca-java-2.x/trunk/modules/sca-client-rmi/src/test/java/org/apache/tuscany/sca/client/rmi/ClientTestCase.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertEquals; import java.net.URI;
+import org.apache.tuscany.sca.binding.rmi.RMIBinding;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.Ignore;
@@ -37,6 +38,7 @@ public class ClientTestCase { //@Test
public void foo() throws NoSuchServiceException, NoSuchDomainException {
+ System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
Node node = NodeFactory.newInstance().createNode(URI.create("tuscany:foo?listen=127.0.0.1:14828"), new String[]{"../../samples/calculator/target/sample-calculator.jar"});
node.start();
@@ -45,5 +47,6 @@ public class ClientTestCase { assertEquals(3, service.add(1, 2), 0);
node.stop();
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
}
|