From fcf5fd5bac40a7b013c8f42f254a582a00cc6601 Mon Sep 17 00:00:00 2001 From: antelder Date: Wed, 15 Aug 2012 18:25:06 +0000 Subject: Add method to get DOMInvoker for a service and testcase for that git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1373552 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/tuscany/sca/Node.java | 3 +++ .../java/org/apache/tuscany/sca/impl/NodeImpl.java | 6 +++++ .../org/apache/tuscany/sca/impl/ServiceHelper.java | 26 ++++++++++++++++++++++ 3 files changed, 35 insertions(+) (limited to 'sca-java-2.x/trunk/modules/domain-node/src/main/java') diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java index b316ae7cbd..a71611ecef 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java @@ -32,6 +32,7 @@ import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.monitor.ValidationException; import org.apache.tuscany.sca.runtime.ActivationException; import org.apache.tuscany.sca.runtime.ContributionDescription; +import org.apache.tuscany.sca.runtime.DOMInvoker; import org.oasisopen.sca.NoSuchServiceException; /** @@ -215,6 +216,8 @@ public interface Node { * Would also be convenient to get service proxys as from SCAClientFactory */ T getService(Class interfaze, String serviceURI) throws NoSuchServiceException; + + DOMInvoker getDOMInvoker(String serviceURI) throws NoSuchServiceException; /** * Get the URIs of any composites that have been started in the domain diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java index 52a6c7ede5..c5ae8277a5 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java @@ -61,6 +61,7 @@ import org.apache.tuscany.sca.runtime.ActiveNodes; import org.apache.tuscany.sca.runtime.CompositeActivator; import org.apache.tuscany.sca.runtime.ContributionDescription; import org.apache.tuscany.sca.runtime.ContributionListener; +import org.apache.tuscany.sca.runtime.DOMInvoker; import org.apache.tuscany.sca.runtime.DomainRegistry; import org.apache.tuscany.sca.runtime.RuntimeProperties; import org.oasisopen.sca.NoSuchServiceException; @@ -653,4 +654,9 @@ public class NodeImpl implements Node { endpointsIncludeDomainName = b; } + @Override + public DOMInvoker getDOMInvoker(String serviceURI) throws NoSuchServiceException { + return ServiceHelper.getDOMInvoker(serviceURI, domainRegistry, extensionPointRegistry, deployer); + } + } diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/ServiceHelper.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/ServiceHelper.java index 3ada1bbbb1..274b15d063 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/ServiceHelper.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/ServiceHelper.java @@ -45,10 +45,12 @@ import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; import org.apache.tuscany.sca.runtime.ContributionDescription; +import org.apache.tuscany.sca.runtime.DOMInvoker; import org.apache.tuscany.sca.runtime.DomainRegistry; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; +import org.apache.tuscany.sca.runtime.TuscanyServiceReference; import org.oasisopen.sca.NoSuchServiceException; import org.oasisopen.sca.ServiceRuntimeException; import org.oasisopen.sca.annotation.Remotable; @@ -85,6 +87,30 @@ public class ServiceHelper { } } + public static DOMInvoker getDOMInvoker(String serviceURI, DomainRegistry domainRegistry, ExtensionPointRegistry extensionPointRegistry, Deployer deployer) throws NoSuchServiceException { + + List endpoints = domainRegistry.findEndpoint(serviceURI); + if (endpoints.size() < 1) { + throw new NoSuchServiceException(serviceURI); + } + + String serviceName = null; + if (serviceURI.contains("/")) { + int i = serviceURI.indexOf("/"); + if (i < serviceURI.length() - 1) { + serviceName = serviceURI.substring(i + 1); + } + } + + Endpoint ep = endpoints.get(0); + if (((RuntimeComponent)ep.getComponent()).getComponentContext() != null) { + return ((TuscanyServiceReference)((RuntimeComponent)ep.getComponent()).getServiceReference(null, serviceName)).getDOMInvoker(); + } else { + throw new NoSuchServiceException(serviceURI); +// return getRemoteProxy(interfaze, ep, domainRegistry, extensionPointRegistry, deployer); + } + } + private static T getRemoteProxy(Class serviceInterface, Endpoint endpoint, DomainRegistry domainRegistry, ExtensionPointRegistry extensionPointRegistry, Deployer deployer) throws NoSuchServiceException { FactoryExtensionPoint factories = extensionPointRegistry.getExtensionPoint(FactoryExtensionPoint.class); AssemblyFactory assemblyFactory = factories.getFactory(AssemblyFactory.class); -- cgit v1.2.3