Change the tuscanyClient scheme to pbe all lower case so it works with the toLowerCase in the DefaultEndpointRegistryFactory, and move all the remote code in the scaclient to happen at invocation time. This now works for multiple local and remote nodes in one or separate JVMs

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

1 files changed, 14 insertions, 13 deletions

diff --git a/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientProxyHandler.java b/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientProxyHandler.java
index 6d182c61a7..b65f311da2 100644
--- a/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientProxyHandler.java
+++ b/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientProxyHandler.java
@@ -55,25 +55,26 @@ public class SCAClientProxyHandler implements InvocationHandler {
         this.nodeFactory = nodeFactory;

         this.domainURI = domainURI;

         this.serviceName = serviceName;

-        this.extensionsRegistry = nodeFactory.getExtensionPoints();

-        RMIHostExtensionPoint rmiHosts = extensionsRegistry.getExtensionPoint(RMIHostExtensionPoint.class);

-        this.rmiHost = new ExtensibleRMIHost(rmiHosts);

-

-        FactoryExtensionPoint factories = extensionsRegistry.getExtensionPoint(FactoryExtensionPoint.class);

-        AssemblyFactory assemblyFactory = factories.getFactory(AssemblyFactory.class);

-

-        this.endpointReference = assemblyFactory.createEndpointReference();

-        endpointReference.setReference(assemblyFactory.createComponentReference());

-        Endpoint targetEndpoint = assemblyFactory.createEndpoint();

-        targetEndpoint.setURI(serviceName);

-        endpointReference.setTargetEndpoint(targetEndpoint);

     }

 

     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {

         Node node = null;

         try {

 

-            node = NodeFactory.newInstance().createNode(URI.create(domainURI)).start();

+            nodeFactory = (NodeFactoryImpl)NodeFactory.newInstance();

+            node = nodeFactory.createNode(URI.create(domainURI)).start();

+            this.extensionsRegistry = nodeFactory.getExtensionPoints();

+            RMIHostExtensionPoint rmiHosts = extensionsRegistry.getExtensionPoint(RMIHostExtensionPoint.class);

+            this.rmiHost = new ExtensibleRMIHost(rmiHosts);

+

+            FactoryExtensionPoint factories = extensionsRegistry.getExtensionPoint(FactoryExtensionPoint.class);

+            AssemblyFactory assemblyFactory = factories.getFactory(AssemblyFactory.class);

+

+            this.endpointReference = assemblyFactory.createEndpointReference();

+            endpointReference.setReference(assemblyFactory.createComponentReference());

+            Endpoint targetEndpoint = assemblyFactory.createEndpoint();

+            targetEndpoint.setURI(serviceName);

+            endpointReference.setTargetEndpoint(targetEndpoint);

             UtilityExtensionPoint utilities = extensionsRegistry.getExtensionPoint(UtilityExtensionPoint.class);

             DomainRegistryFactory domainRegistryFactory = utilities.getUtility(DomainRegistryFactory.class);

             this.endpointRegistry = domainRegistryFactory.getEndpointRegistry(null, domainURI);