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 2010/03/03 00:30:56 UTC
svn commit: r918261 - in /tuscany/sca-java-2.x/trunk:
itest/implementation-spring/
itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/
itest/nodes/one-jvm-hazelcast/src/test/java/itest/
itest/nodes/one-jvm-tribes/src/t...
Author: rfeng
Date: Tue Mar 2 23:30:54 2010
New Revision: 918261
URL: http://svn.apache.org/viewvc?rev=918261&view=rev
Log:
Add the ability to map binding.sca to any bindings in the runtime by configuration
Added:
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java (with props)
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java (with props)
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java (with props)
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java (with props)
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper
Modified:
tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server.xml
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
tuscany/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/test/java/test/scaclient/SCAClientTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/META-INF/MANIFEST.MF
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/test/java/org/apache/tuscany/sca/client/rmi/ClientTestCase.java
Modified: tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml Tue Mar 2 23:30:54 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java Tue Mar 2 23:30:54 2010
@@ -21,6 +21,8 @@
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 @@
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 @@
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;
}
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java Tue Mar 2 23:30:54 2010
@@ -25,6 +25,7 @@
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 @@
@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 @@
if (clientNode != null) {
clientNode.stop();
}
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
}
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java Tue Mar 2 23:30:54 2010
@@ -25,6 +25,7 @@
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 @@
@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 @@
if (clientNode != null) {
clientNode.stop();
}
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
}
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml Tue Mar 2 23:30:54 2010
@@ -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 -->
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java Tue Mar 2 23:30:54 2010
@@ -21,6 +21,7 @@
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 @@
@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 @@
if (clientNode != null) {
clientNode.stop();
}
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
public static void main(String[] args) throws Exception {
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java Tue Mar 2 23:30:54 2010
@@ -23,12 +23,14 @@
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 @@
// 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 {
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java Tue Mar 2 23:30:54 2010
@@ -21,6 +21,7 @@
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 @@
@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 @@
if (serviceNode != null) {
serviceNode.stop();
}
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
public static void main(String[] args) throws Exception {
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server.xml?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server.xml Tue Mar 2 23:30:54 2010
@@ -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"/>
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java Tue Mar 2 23:30:54 2010
@@ -21,6 +21,7 @@
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 @@
@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 @@
if (clientNode != null) {
clientNode.stop();
}
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
+
}
public static void main(String[] args) throws Exception {
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java Tue Mar 2 23:30:54 2010
@@ -21,6 +21,7 @@
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 @@
@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 @@
if (serviceNode != null) {
serviceNode.stop();
}
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
}
Modified: tuscany/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/test/java/test/scaclient/SCAClientTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/test/java/test/scaclient/SCAClientTestCase.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/test/java/test/scaclient/SCAClientTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/scaclient-api-rmi/src/test/java/test/scaclient/SCAClientTestCase.java Tue Mar 2 23:30:54 2010
@@ -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 @@
*
* @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 @@
assertEquals("Hello petra", service.sayHello("petra"));
}
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
node.stop();
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java Tue Mar 2 23:30:54 2010
@@ -38,7 +38,7 @@
@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 static void destroy() throws Exception {
nodeA.stop();
nodeB.stop();
+ // System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
@Test
Modified: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java Tue Mar 2 23:30:54 2010
@@ -36,6 +36,7 @@
@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 static void destroy() throws Exception {
nodeA.stop();
nodeB.stop();
+ // System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
//@Test
Modified: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java Tue Mar 2 23:30:54 2010
@@ -20,6 +20,7 @@
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 @@
@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 static void destroy() throws Exception {
nodeA.stop();
nodeB.stop();
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
+
}
@Test
Modified: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java Tue Mar 2 23:30:54 2010
@@ -20,6 +20,7 @@
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 @@
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 static void destroy() throws Exception {
nodeA.stop();
nodeB.stop();
+ factory.destroy();
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
@Test
Modified: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/META-INF/MANIFEST.MF?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/META-INF/MANIFEST.MF Tue Mar 2 23:30:54 2010
@@ -7,7 +7,7 @@
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 @@
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 @@
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"
Added: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java?rev=918261&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java (added)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java Tue Mar 2 23:30:54 2010
@@ -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;
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java?rev=918261&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java (added)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java Tue Mar 2 23:30:54 2010
@@ -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();
+ }
+ }
+}
Propchange: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java?rev=918261&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java (added)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java Tue Mar 2 23:30:54 2010
@@ -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;
+ }
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java Tue Mar 2 23:30:54 2010
@@ -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.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 @@
*/
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 @@
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());
- }
-
- // 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
+ if (scaBindingMapper.isRemotable()) {
+ distributedProvider =
+ new DelegatingSCAReferenceBindingProvider(endpointReference, scaBindingMapper);
}
- epr.setBinding(distributedBinding);
-
- distributedProvider =
- distributedProviderFactory.createReferenceBindingProvider(epr);
}
}
@@ -172,8 +106,8 @@
}
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 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 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 void start() {
if (started) {
return;
- }
- if (getDistributedProvider() != null) {
+ }
+ if (distributedProvider != null) {
distributedProvider.start();
}
started = true;
@@ -257,10 +194,10 @@
public void stop() {
if (!started) {
return;
- }
+ }
try {
- if (getDistributedProvider() != null) {
+ if (distributedProvider != null) {
distributedProvider.stop();
}
} finally {
Modified: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java Tue Mar 2 23:30:54 2010
@@ -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 @@
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 boolean supportsOneWayInvocation() {
+ if (distributedProvider != null) {
+ return distributedProvider.supportsOneWayInvocation();
+ }
return false;
}
@@ -135,21 +96,6 @@
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);
- }
- }
-
}
}
Added: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java?rev=918261&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java (added)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java Tue Mar 2 23:30:54 2010
@@ -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();
+
+}
Propchange: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper?rev=918261&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper (added)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper Tue Mar 2 23:30:54 2010
@@ -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
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java Tue Mar 2 23:30:54 2010
@@ -56,5 +56,5 @@
InterfaceContract getComponentTypeReferenceInterfaceContract();
boolean isOutOfDate();
void rebuild();
-
+ boolean isStarted();
}
Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java Tue Mar 2 23:30:54 2010
@@ -558,17 +558,19 @@
}
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();
+ }
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java Tue Mar 2 23:30:54 2010
@@ -101,6 +101,8 @@
protected InterfaceContract referenceInterfaceContract;
private String xml;
+ private boolean started;
+
/**
* No-arg constructor for Java serilization
*/
@@ -321,6 +323,7 @@
policyProvider.start();
}
+ started = true;
// InterfaceContract bindingContract = getBindingInterfaceContract();
// endpoint.setInterfaceContract(bindingContract);
}
@@ -532,4 +535,8 @@
}
}
+ public boolean isStarted() {
+ return started;
+ }
+
}
Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java Tue Mar 2 23:30:54 2010
@@ -33,6 +33,7 @@
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 @@
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
*
Modified: tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java Tue Mar 2 23:30:54 2010
@@ -193,7 +193,7 @@
* 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 {
Modified: tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java Tue Mar 2 23:30:54 2010
@@ -465,7 +465,7 @@
}
@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());
Modified: tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/test/java/org/apache/tuscany/sca/client/rmi/ClientTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/test/java/org/apache/tuscany/sca/client/rmi/ClientTestCase.java?rev=918261&r1=918260&r2=918261&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/test/java/org/apache/tuscany/sca/client/rmi/ClientTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/sca-client-rmi/src/test/java/org/apache/tuscany/sca/client/rmi/ClientTestCase.java Tue Mar 2 23:30:54 2010
@@ -23,6 +23,7 @@
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 @@
//@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 @@
assertEquals(3, service.add(1, 2), 0);
node.stop();
+ System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
}
}