From 5c4a561575759f774e82a50adce80ccc2fcb415c Mon Sep 17 00:00:00 2001 From: antelder Date: Tue, 26 Oct 2010 14:06:37 +0000 Subject: Delete old rc1 tag git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027565 13f79535-47bb-0310-9956-ffa450edef68 --- .../client/impl/SCAClientFactoryFinderImpl.java | 49 ----- .../sca/client/impl/SCAClientFactoryImpl.java | 202 -------------------- .../sca/client/impl/SCAClientFactoryImpl2.java | 77 -------- .../tuscany/sca/client/impl/SCAClientHandler.java | 210 --------------------- .../sca/client/impl/SCAClientModuleActivator.java | 37 ---- .../sca/client/impl/SCAClientProxyHandler.java | 76 -------- 6 files changed, 651 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl2.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientProxyHandler.java (limited to 'sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org') diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java deleted file mode 100644 index b8830d4d60..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. - * OASIS trademark, IPR and other policies apply. - */ -package org.apache.tuscany.sca.client.impl; - -import java.net.URI; -import java.util.Properties; - -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.ServiceRuntimeException; -import org.oasisopen.sca.client.SCAClientFactory; -import org.oasisopen.sca.client.SCAClientFactoryFinder; - -/** - * A Tuscany specific implementation of an SCAClientFactoryFinder which finds - * hard codes the use of the Tuscany SCAClientFactory instead of doscovering it. - * - * @see SCAClientFactoryFinder - * @see SCAClientFactory - */ -public class SCAClientFactoryFinderImpl implements SCAClientFactoryFinder { - - /** - * Public Constructor - */ - public SCAClientFactoryFinderImpl() { - } - - /** - * Creates an instance of the SCAClientFactorySPI implementation. - * This discovers the SCAClientFactorySPI Implementation and instantiates - * the provider's implementation. - * - * @param properties Properties that may be used when creating a new - * instance of the SCAClient - * @param classLoader ClassLoader that may be used when creating a new - * instance of the SCAClient - * @return new instance of the SCAClientFactory - * @throws ServiceRuntimeException Failed to create SCAClientFactory - * Implementation. - */ - public SCAClientFactory find(Properties properties, - ClassLoader classLoader, - URI domainURI ) throws NoSuchDomainException, ServiceRuntimeException { - return new SCAClientFactoryImpl2(domainURI); - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java deleted file mode 100644 index d32afb2acb..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java +++ /dev/null @@ -1,202 +0,0 @@ -/* - * 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.client.impl; - -import java.net.URI; -import java.util.List; -import java.util.UUID; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.ComponentReference; -import org.apache.tuscany.sca.assembly.ComponentService; -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.Service; -import org.apache.tuscany.sca.context.CompositeContext; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory; -import org.apache.tuscany.sca.core.invocation.ProxyFactory; -import org.apache.tuscany.sca.interfacedef.Interface; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -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.node.NodeFactory; -import org.apache.tuscany.sca.node.impl.NodeFactoryImpl; -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.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; -import org.oasisopen.sca.ServiceRuntimeException; -import org.oasisopen.sca.client.SCAClientFactory; -import org.oasisopen.sca.client.SCAClientFactoryFinder; - -public class SCAClientFactoryImpl extends SCAClientFactory { - - public static void setSCAClientFactoryFinder(SCAClientFactoryFinder factoryFinder) { - SCAClientFactory.factoryFinder = factoryFinder; - } - - private final ExtensionPointRegistry extensionsRegistry; - private final AssemblyFactory assemblyFactory; - private final JavaInterfaceFactory javaInterfaceFactory; - private final ProxyFactory proxyFactory; - private final EndpointRegistry endpointRegistry; - private final NodeFactoryImpl nodeFactory; - private final CompositeContext compositeContext; - - public SCAClientFactoryImpl(URI domainURI) throws NoSuchDomainException { - super(domainURI); - - this.nodeFactory = (NodeFactoryImpl)NodeFactory.getInstance(); - this.nodeFactory.init(); - this.extensionsRegistry = nodeFactory.getExtensionPointRegistry(); - DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionsRegistry); - - String registryURI = getDomainURI().toString(); - - this.endpointRegistry = domainRegistryFactory.getEndpointRegistry(registryURI, getDomainURI().toString()); // TODO: shouldnt use null for reg uri - - // TODO: if there is not an existing endpoint registry for the domain URI the - // this should create an endpoint registry client for the remote domain (eg hazelcast native client) - // for now just throw an exception - if (endpointRegistry == null) { - throw new NoSuchDomainException(domainURI.toString()); - } - FactoryExtensionPoint factories = extensionsRegistry.getExtensionPoint(FactoryExtensionPoint.class); - this.assemblyFactory = factories.getFactory(AssemblyFactory.class); - this.javaInterfaceFactory = factories.getFactory(JavaInterfaceFactory.class); - this.proxyFactory = ExtensibleProxyFactory.getInstance(extensionsRegistry); - - String client = "sca.client." + UUID.randomUUID(); - - this.compositeContext = - new CompositeContext(extensionsRegistry, - endpointRegistry, - null, - domainURI.toString(), - client, - this.nodeFactory.getDeployer().getSystemDefinitions()); - } - - @Override - public T getService(Class serviceInterface, String serviceName) throws NoSuchServiceException, NoSuchDomainException { - - List eps = endpointRegistry.findEndpoint(serviceName); - if (eps == null || eps.size() < 1) { - throw new NoSuchServiceException(serviceName); - } - Endpoint endpoint = eps.get(0); // TODO: what should be done with multiple endpoints? - - RuntimeEndpointReference epr; - try { - epr = createEndpointReference(endpoint, serviceInterface); - } catch (Exception e) { - throw new ServiceRuntimeException(e); - } - return proxyFactory.createProxy(serviceInterface, epr); - - } - - private RuntimeEndpointReference createEndpointReference(Endpoint endpoint, Class businessInterface) - throws CloneNotSupportedException, InvalidInterfaceException { - Component component = endpoint.getComponent(); - ComponentService service = endpoint.getService(); - ComponentReference componentReference = assemblyFactory.createComponentReference(); - componentReference.setName("sca.client." + service.getName()); - - componentReference.setCallback(service.getCallback()); - componentReference.getTargets().add(service); - componentReference.getPolicySets().addAll(service.getPolicySets()); - componentReference.getRequiredIntents().addAll(service.getRequiredIntents()); - componentReference.getBindings().add(endpoint.getBinding()); - - InterfaceContract interfaceContract = service.getInterfaceContract(); - Service componentTypeService = service.getService(); - if (componentTypeService != null && componentTypeService.getInterfaceContract() != null) { - interfaceContract = componentTypeService.getInterfaceContract(); - } - interfaceContract = getInterfaceContract(interfaceContract, businessInterface); - componentReference.setInterfaceContract(interfaceContract); - componentReference.setMultiplicity(Multiplicity.ONE_ONE); - // component.getReferences().add(componentReference); - - // create endpoint reference - EndpointReference endpointReference = assemblyFactory.createEndpointReference(); - endpointReference.setComponent(component); - endpointReference.setReference(componentReference); - endpointReference.setBinding(endpoint.getBinding()); - endpointReference.setUnresolved(false); - endpointReference.setStatus(EndpointReference.Status.WIRED_TARGET_FOUND_AND_MATCHED); - - endpointReference.setTargetEndpoint(endpoint); - - componentReference.getEndpointReferences().add(endpointReference); - ((RuntimeComponentReference)componentReference).setComponent((RuntimeComponent)component); - ((RuntimeEndpointReference)endpointReference).bind(compositeContext); - - return (RuntimeEndpointReference) endpointReference; - } - - /** - * @param interfaceContract - * @param businessInterface - * @return - * @throws CloneNotSupportedException - * @throws InvalidInterfaceException - */ - private InterfaceContract getInterfaceContract(InterfaceContract interfaceContract, Class businessInterface) - throws CloneNotSupportedException, InvalidInterfaceException { - if (businessInterface == null) { - return interfaceContract; - } - boolean compatible = false; - if (interfaceContract != null && interfaceContract.getInterface() != null) { - Interface interfaze = interfaceContract.getInterface(); - if (interfaze instanceof JavaInterface) { - Class cls = ((JavaInterface)interfaze).getJavaClass(); - if (cls != null && businessInterface.isAssignableFrom(cls)) { - compatible = true; - } - } - } - - if (!compatible) { - // The interface is not assignable from the interface contract - interfaceContract = javaInterfaceFactory.createJavaInterfaceContract(); - JavaInterface callInterface = javaInterfaceFactory.createJavaInterface(businessInterface); - interfaceContract.setInterface(callInterface); - if (callInterface.getCallbackClass() != null) { - interfaceContract.setCallbackInterface(javaInterfaceFactory.createJavaInterface(callInterface - .getCallbackClass())); - } - } - - return interfaceContract; - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl2.java b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl2.java deleted file mode 100644 index 8626927097..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl2.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * 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.client.impl; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Proxy; -import java.net.URI; - -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.impl.NodeFactoryImpl; -import org.apache.tuscany.sca.node.impl.NodeImpl; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; -import org.oasisopen.sca.client.SCAClientFactory; -import org.oasisopen.sca.client.SCAClientFactoryFinder; - -public class SCAClientFactoryImpl2 extends SCAClientFactory { - - public static void setSCAClientFactoryFinder(SCAClientFactoryFinder factoryFinder) { - SCAClientFactory.factoryFinder = factoryFinder; - } - - public SCAClientFactoryImpl2(URI domainURI) throws NoSuchDomainException { - super(domainURI); - } - - @SuppressWarnings("unchecked") - @Override - public T getService(Class serviceInterface, String serviceName) throws NoSuchServiceException, NoSuchDomainException { - - boolean foundDomain = false; - for (NodeFactory nodeFactory : NodeFactory.getNodeFactories()) { - for (Node node : ((NodeFactoryImpl)nodeFactory).getNodesInDomain(getDomainName())) { - foundDomain = true; - for (Endpoint ep : ((NodeImpl)node).getServiceEndpoints()) { - if (ep.matches(serviceName)) { - return node.getService(serviceInterface, serviceName); - } - } - } - } - - // assume that if a local node with the looked for domain name is found then that will - // know about all services in the domain so if the service isn't found then it doesn't exist - if (foundDomain) { - throw new NoSuchServiceException(serviceName); - } - - InvocationHandler handler = new SCAClientHandler(getDomainURI().toString(), serviceName, serviceInterface); - return (T)Proxy.newProxyInstance(serviceInterface.getClassLoader(), new Class[]{serviceInterface}, handler); - } - - private String getDomainName() { - // TODO: if the domain URI encodes config (eg uri:someDomain?bla=etc) then need to parse the domain name - String domainName = getDomainURI().toString(); - return domainName; - } -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java deleted file mode 100644 index b8cb5732fc..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * 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.client.impl; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.List; -import java.util.Properties; -import java.util.UUID; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.ComponentReference; -import org.apache.tuscany.sca.assembly.ComponentService; -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.Service; -import org.apache.tuscany.sca.context.CompositeContext; -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.core.invocation.ExtensibleProxyFactory; -import org.apache.tuscany.sca.core.invocation.ProxyFactory; -import org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint; -import org.apache.tuscany.sca.interfacedef.Interface; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -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.node.NodeFactory; -import org.apache.tuscany.sca.node.impl.NodeFactoryImpl; -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.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; -import org.apache.tuscany.sca.runtime.RuntimeProperties; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; -import org.oasisopen.sca.ServiceRuntimeException; - -public class SCAClientHandler implements InvocationHandler { - - private String domainURI; - private String serviceName; - private Class serviceInterface; - - public SCAClientHandler(String domainURI, String serviceName, Class serviceInterface) { - this.domainURI = domainURI; - this.serviceName = serviceName; - this.serviceInterface = serviceInterface; - } - - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - NodeFactoryImpl nodeFactory = (NodeFactoryImpl)NodeFactory.newInstance(domainURI); - try { - nodeFactory.init(); - - ExtensionPointRegistry extensionsRegistry = nodeFactory.getExtensionPointRegistry(); - Properties props = extensionsRegistry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(RuntimeProperties.class).getProperties(); - props.setProperty("client", "true"); - DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionsRegistry); - - String registryURI = domainURI; - - // TODO: theres better ways to do this but this gets things working for now - if (registryURI.indexOf(":") == -1) { - registryURI = "tuscanyclient:" + registryURI; - } - if (registryURI.startsWith("uri:")) { - registryURI = "tuscanyclient:" + registryURI.substring(4); - } - if (registryURI.startsWith("tuscany:")) { - registryURI = "tuscanyclient:" + registryURI.substring(8); - } - - EndpointRegistry endpointRegistry; - try { - endpointRegistry = domainRegistryFactory.getEndpointRegistry(registryURI, domainURI); - } catch (Exception e) { - throw new NoSuchDomainException(domainURI, e); - } - - FactoryExtensionPoint factories = extensionsRegistry.getExtensionPoint(FactoryExtensionPoint.class); - AssemblyFactory assemblyFactory = factories.getFactory(AssemblyFactory.class); - JavaInterfaceFactory javaInterfaceFactory = factories.getFactory(JavaInterfaceFactory.class); - ProxyFactory proxyFactory = new ExtensibleProxyFactory(extensionsRegistry.getExtensionPoint(ProxyFactoryExtensionPoint.class)); - - String client = "sca.client." + UUID.randomUUID(); - CompositeContext compositeContext = - new CompositeContext(extensionsRegistry, endpointRegistry, null, domainURI.toString(), client, nodeFactory.getDeployer().getSystemDefinitions()); - - List eps = endpointRegistry.findEndpoint(serviceName); - if (eps == null || eps.size() < 1) { - throw new NoSuchServiceException(serviceName); - } - Endpoint endpoint = eps.get(0); // TODO: what should be done with multiple endpoints? - - RuntimeEndpointReference epr; - try { - epr = createEndpointReference(javaInterfaceFactory, compositeContext, assemblyFactory, endpoint, serviceInterface); - } catch (Exception e) { - throw new ServiceRuntimeException(e); - } - - InvocationHandler handler = Proxy.getInvocationHandler(proxyFactory.createProxy(serviceInterface, epr)); - return handler.invoke(proxy, method, args); - - } finally { - nodeFactory.destroy(); - } - } - - private RuntimeEndpointReference createEndpointReference(JavaInterfaceFactory javaInterfaceFactory, CompositeContext compositeContext, AssemblyFactory assemblyFactory, Endpoint endpoint, Class businessInterface) throws CloneNotSupportedException, InvalidInterfaceException { - Component component = endpoint.getComponent(); - ComponentService service = endpoint.getService(); - ComponentReference componentReference = assemblyFactory.createComponentReference(); - componentReference.setName("sca.client." + service.getName()); - - componentReference.setCallback(service.getCallback()); - componentReference.getTargets().add(service); - componentReference.getPolicySets().addAll(service.getPolicySets()); - componentReference.getRequiredIntents().addAll(service.getRequiredIntents()); - componentReference.getBindings().add(endpoint.getBinding()); - - InterfaceContract interfaceContract = service.getInterfaceContract(); - Service componentTypeService = service.getService(); - if (componentTypeService != null && componentTypeService.getInterfaceContract() != null) { - interfaceContract = componentTypeService.getInterfaceContract(); - } - interfaceContract = getInterfaceContract(javaInterfaceFactory, interfaceContract, businessInterface); - componentReference.setInterfaceContract(interfaceContract); - componentReference.setMultiplicity(Multiplicity.ONE_ONE); - // component.getReferences().add(componentReference); - - // create endpoint reference - EndpointReference endpointReference = assemblyFactory.createEndpointReference(); - endpointReference.setComponent(component); - endpointReference.setReference(componentReference); - endpointReference.setBinding(endpoint.getBinding()); - endpointReference.setUnresolved(false); - endpointReference.setStatus(EndpointReference.Status.WIRED_TARGET_FOUND_AND_MATCHED); - - endpointReference.setTargetEndpoint(endpoint); - - componentReference.getEndpointReferences().add(endpointReference); - ((RuntimeComponentReference)componentReference).setComponent((RuntimeComponent)component); - ((RuntimeEndpointReference)endpointReference).bind(compositeContext); - - return (RuntimeEndpointReference) endpointReference; - } - - /** - * @param interfaceContract - * @param businessInterface - * @return - * @throws CloneNotSupportedException - * @throws InvalidInterfaceException - */ - private InterfaceContract getInterfaceContract(JavaInterfaceFactory javaInterfaceFactory, InterfaceContract interfaceContract, Class businessInterface) - throws CloneNotSupportedException, InvalidInterfaceException { - if (businessInterface == null) { - return interfaceContract; - } - boolean compatible = false; - if (interfaceContract != null && interfaceContract.getInterface() != null) { - Interface interfaze = interfaceContract.getInterface(); - if (interfaze instanceof JavaInterface) { - Class cls = ((JavaInterface)interfaze).getJavaClass(); - if (cls != null && businessInterface.isAssignableFrom(cls)) { - compatible = true; - } - } - } - - if (!compatible) { - // The interface is not assignable from the interface contract - interfaceContract = javaInterfaceFactory.createJavaInterfaceContract(); - JavaInterface callInterface = javaInterfaceFactory.createJavaInterface(businessInterface); - interfaceContract.setInterface(callInterface); - if (callInterface.getCallbackClass() != null) { - interfaceContract.setCallbackInterface(javaInterfaceFactory.createJavaInterface(callInterface - .getCallbackClass())); - } - } - - return interfaceContract; - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java deleted file mode 100644 index 64f982796c..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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.client.impl; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.ModuleActivator; - -public class SCAClientModuleActivator implements ModuleActivator { - - public SCAClientModuleActivator(ExtensionPointRegistry registry) { - } - - public void start() { - SCAClientFactoryImpl.setSCAClientFactoryFinder(new SCAClientFactoryFinderImpl()); - } - - public void stop() { - - } -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientProxyHandler.java b/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientProxyHandler.java deleted file mode 100644 index bc1d151d7d..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientProxyHandler.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * 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.client.impl; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.util.List; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.EndpointReference; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.runtime.EndpointRegistry; -import org.oasisopen.sca.NoSuchServiceException; - -/** - * TODO: What this wants is a way to create a generic invoker for an arbitrary binding - * that could mean extending the BindingProvider API to include something like a - * createClient method which creates an Invoker for an Endpoint - */ -public class SCAClientProxyHandler implements InvocationHandler { - - protected EndpointRegistry endpointRegistry; - protected EndpointReference endpointReference; - protected String serviceName; - - public SCAClientProxyHandler(String serviceName, ExtensionPointRegistry extensionsRegistry, EndpointRegistry endpointRegistry) { - this.endpointRegistry = endpointRegistry; - this.serviceName = serviceName; - -// 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 { - - List endpoints = endpointRegistry.findEndpoint(endpointReference); - if (endpoints.size() <1 ) { - throw new NoSuchServiceException(serviceName); - } - - String uri = endpoints.get(0).getBinding().getURI(); -// RMIBindingInvoker invoker = new RMIBindingInvoker(rmiHost, uri, method); -// -// return invoker.invokeTarget(args); - return null; - } - -} -- cgit v1.2.3