Branch for 2.0 Milestone M5

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

12 files changed, 969 insertions, 0 deletions

diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/LICENSE
new file mode 100644
index 0000000000..6e529a25c4
--- /dev/null
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/LICENSE
@@ -0,0 +1,205 @@
+

+                                 Apache License

+                           Version 2.0, January 2004

+                        http://www.apache.org/licenses/

+

+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

+

+   1. Definitions.

+

+      "License" shall mean the terms and conditions for use, reproduction,

+      and distribution as defined by Sections 1 through 9 of this document.

+

+      "Licensor" shall mean the copyright owner or entity authorized by

+      the copyright owner that is granting the License.

+

+      "Legal Entity" shall mean the union of the acting entity and all

+      other entities that control, are controlled by, or are under common

+      control with that entity. For the purposes of this definition,

+      "control" means (i) the power, direct or indirect, to cause the

+      direction or management of such entity, whether by contract or

+      otherwise, or (ii) ownership of fifty percent (50%) or more of the

+      outstanding shares, or (iii) beneficial ownership of such entity.

+

+      "You" (or "Your") shall mean an individual or Legal Entity

+      exercising permissions granted by this License.

+

+      "Source" form shall mean the preferred form for making modifications,

+      including but not limited to software source code, documentation

+      source, and configuration files.

+

+      "Object" form shall mean any form resulting from mechanical

+      transformation or translation of a Source form, including but

+      not limited to compiled object code, generated documentation,

+      and conversions to other media types.

+

+      "Work" shall mean the work of authorship, whether in Source or

+      Object form, made available under the License, as indicated by a

+      copyright notice that is included in or attached to the work

+      (an example is provided in the Appendix below).

+

+      "Derivative Works" shall mean any work, whether in Source or Object

+      form, that is based on (or derived from) the Work and for which the

+      editorial revisions, annotations, elaborations, or other modifications

+      represent, as a whole, an original work of authorship. For the purposes

+      of this License, Derivative Works shall not include works that remain

+      separable from, or merely link (or bind by name) to the interfaces of,

+      the Work and Derivative Works thereof.

+

+      "Contribution" shall mean any work of authorship, including

+      the original version of the Work and any modifications or additions

+      to that Work or Derivative Works thereof, that is intentionally

+      submitted to Licensor for inclusion in the Work by the copyright owner

+      or by an individual or Legal Entity authorized to submit on behalf of

+      the copyright owner. For the purposes of this definition, "submitted"

+      means any form of electronic, verbal, or written communication sent

+      to the Licensor or its representatives, including but not limited to

+      communication on electronic mailing lists, source code control systems,

+      and issue tracking systems that are managed by, or on behalf of, the

+      Licensor for the purpose of discussing and improving the Work, but

+      excluding communication that is conspicuously marked or otherwise

+      designated in writing by the copyright owner as "Not a Contribution."

+

+      "Contributor" shall mean Licensor and any individual or Legal Entity

+      on behalf of whom a Contribution has been received by Licensor and

+      subsequently incorporated within the Work.

+

+   2. Grant of Copyright License. Subject to the terms and conditions of

+      this License, each Contributor hereby grants to You a perpetual,

+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

+      copyright license to reproduce, prepare Derivative Works of,

+      publicly display, publicly perform, sublicense, and distribute the

+      Work and such Derivative Works in Source or Object form.

+

+   3. Grant of Patent License. Subject to the terms and conditions of

+      this License, each Contributor hereby grants to You a perpetual,

+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

+      (except as stated in this section) patent license to make, have made,

+      use, offer to sell, sell, import, and otherwise transfer the Work,

+      where such license applies only to those patent claims licensable

+      by such Contributor that are necessarily infringed by their

+      Contribution(s) alone or by combination of their Contribution(s)

+      with the Work to which such Contribution(s) was submitted. If You

+      institute patent litigation against any entity (including a

+      cross-claim or counterclaim in a lawsuit) alleging that the Work

+      or a Contribution incorporated within the Work constitutes direct

+      or contributory patent infringement, then any patent licenses

+      granted to You under this License for that Work shall terminate

+      as of the date such litigation is filed.

+

+   4. Redistribution. You may reproduce and distribute copies of the

+      Work or Derivative Works thereof in any medium, with or without

+      modifications, and in Source or Object form, provided that You

+      meet the following conditions:

+

+      (a) You must give any other recipients of the Work or

+          Derivative Works a copy of this License; and

+

+      (b) You must cause any modified files to carry prominent notices

+          stating that You changed the files; and

+

+      (c) You must retain, in the Source form of any Derivative Works

+          that You distribute, all copyright, patent, trademark, and

+          attribution notices from the Source form of the Work,

+          excluding those notices that do not pertain to any part of

+          the Derivative Works; and

+

+      (d) If the Work includes a "NOTICE" text file as part of its

+          distribution, then any Derivative Works that You distribute must

+          include a readable copy of the attribution notices contained

+          within such NOTICE file, excluding those notices that do not

+          pertain to any part of the Derivative Works, in at least one

+          of the following places: within a NOTICE text file distributed

+          as part of the Derivative Works; within the Source form or

+          documentation, if provided along with the Derivative Works; or,

+          within a display generated by the Derivative Works, if and

+          wherever such third-party notices normally appear. The contents

+          of the NOTICE file are for informational purposes only and

+          do not modify the License. You may add Your own attribution

+          notices within Derivative Works that You distribute, alongside

+          or as an addendum to the NOTICE text from the Work, provided

+          that such additional attribution notices cannot be construed

+          as modifying the License.

+

+      You may add Your own copyright statement to Your modifications and

+      may provide additional or different license terms and conditions

+      for use, reproduction, or distribution of Your modifications, or

+      for any such Derivative Works as a whole, provided Your use,

+      reproduction, and distribution of the Work otherwise complies with

+      the conditions stated in this License.

+

+   5. Submission of Contributions. Unless You explicitly state otherwise,

+      any Contribution intentionally submitted for inclusion in the Work

+      by You to the Licensor shall be under the terms and conditions of

+      this License, without any additional terms or conditions.

+      Notwithstanding the above, nothing herein shall supersede or modify

+      the terms of any separate license agreement you may have executed

+      with Licensor regarding such Contributions.

+

+   6. Trademarks. This License does not grant permission to use the trade

+      names, trademarks, service marks, or product names of the Licensor,

+      except as required for reasonable and customary use in describing the

+      origin of the Work and reproducing the content of the NOTICE file.

+

+   7. Disclaimer of Warranty. Unless required by applicable law or

+      agreed to in writing, Licensor provides the Work (and each

+      Contributor provides its Contributions) on an "AS IS" BASIS,

+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

+      implied, including, without limitation, any warranties or conditions

+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

+      PARTICULAR PURPOSE. You are solely responsible for determining the

+      appropriateness of using or redistributing the Work and assume any

+      risks associated with Your exercise of permissions under this License.

+

+   8. Limitation of Liability. In no event and under no legal theory,

+      whether in tort (including negligence), contract, or otherwise,

+      unless required by applicable law (such as deliberate and grossly

+      negligent acts) or agreed to in writing, shall any Contributor be

+      liable to You for damages, including any direct, indirect, special,

+      incidental, or consequential damages of any character arising as a

+      result of this License or out of the use or inability to use the

+      Work (including but not limited to damages for loss of goodwill,

+      work stoppage, computer failure or malfunction, or any and all

+      other commercial damages or losses), even if such Contributor

+      has been advised of the possibility of such damages.

+

+   9. Accepting Warranty or Additional Liability. While redistributing

+      the Work or Derivative Works thereof, You may choose to offer,

+      and charge a fee for, acceptance of support, warranty, indemnity,

+      or other liability obligations and/or rights consistent with this

+      License. However, in accepting such obligations, You may act only

+      on Your own behalf and on Your sole responsibility, not on behalf

+      of any other Contributor, and only if You agree to indemnify,

+      defend, and hold each Contributor harmless for any liability

+      incurred by, or claims asserted against, such Contributor by reason

+      of your accepting any such warranty or additional liability.

+

+   END OF TERMS AND CONDITIONS

+

+   APPENDIX: How to apply the Apache License to your work.

+

+      To apply the Apache License to your work, attach the following

+      boilerplate notice, with the fields enclosed by brackets "[]"

+      replaced with your own identifying information. (Don't include

+      the brackets!)  The text should be enclosed in the appropriate

+      comment syntax for the file format. We also recommend that a

+      file or class name and description of purpose be included on the

+      same "printed page" as the copyright notice for easier

+      identification within third-party archives.

+

+   Copyright [yyyy] [name of copyright owner]

+

+   Licensed 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.

+

+

+

diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..e96d9c6c54
--- /dev/null
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/META-INF/MANIFEST.MF
@@ -0,0 +1,24 @@
+Manifest-Version: 1.0

+SCA-Version: 1.1

+Bundle-Name: Apache Tuscany SCA Client Impl

+Bundle-Vendor: The Apache Software Foundation

+Bundle-Version: 2.0.0

+Bundle-ManifestVersion: 2

+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

+Bundle-Description: Apache Tuscany SCA Client Impl

+Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",

+ org.apache.tuscany.sca.context;version="2.0.0",

+ org.apache.tuscany.sca.core;version="2.0.0",

+ org.apache.tuscany.sca.core.invocation;version="2.0.0",

+ org.apache.tuscany.sca.interfacedef;version="2.0.0",

+ org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

+ org.apache.tuscany.sca.node;version="2.0.0",

+ org.apache.tuscany.sca.node.configuration;version="2.0.0",

+ org.apache.tuscany.sca.node.impl;version="2.0.0",

+ org.apache.tuscany.sca.policy;version="2.0.0",

+ org.apache.tuscany.sca.runtime;version="2.0.0",

+ org.oasisopen.sca;version="2.0.0",

+ org.oasisopen.sca.client;version="2.0.0"

+Bundle-SymbolicName: org.apache.tuscany.sca.client.impl

+Bundle-DocURL: http://www.apache.org/

+

diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/NOTICE
new file mode 100644
index 0000000000..9ddba06a32
--- /dev/null
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}

+Copyright (c) 2005 - 2010 The Apache Software Foundation

+

+This product includes software developed by

+The Apache Software Foundation (http://www.apache.org/).

+

diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/pom.xml
new file mode 100644
index 0000000000..2657e1b466
--- /dev/null
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<project>
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-sca-client-impl</artifactId>
+    <name>Apache Tuscany SCA Client Impl</name>
+
+    <dependencies>   
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java
new file mode 100644
index 0000000000..81152cf0a7
--- /dev/null
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java
@@ -0,0 +1,49 @@
+/*

+ * 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/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
new file mode 100644
index 0000000000..d32afb2acb
--- /dev/null
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
@@ -0,0 +1,202 @@
+/*
+ * 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> T getService(Class<T> serviceInterface, String serviceName) throws NoSuchServiceException, NoSuchDomainException {
+        
+        List<Endpoint> 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/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl2.java b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl2.java
new file mode 100644
index 0000000000..b1f7b37f8f
--- /dev/null
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl2.java
@@ -0,0 +1,77 @@
+/*

+ * 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> T getService(Class<T> 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/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java
new file mode 100644
index 0000000000..4fb38e4ca6
--- /dev/null
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java
@@ -0,0 +1,210 @@
+/*

+ * 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<Endpoint> 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/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java
new file mode 100644
index 0000000000..64f982796c
--- /dev/null
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java
@@ -0,0 +1,37 @@
+/*
+ * 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/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientProxyHandler.java b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientProxyHandler.java
new file mode 100644
index 0000000000..c5913070e8
--- /dev/null
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientProxyHandler.java
@@ -0,0 +1,76 @@
+/*

+ * 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<Endpoint> 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;

+    }

+

+}

diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
new file mode 100644
index 0000000000..97a05b05a4
--- /dev/null
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
@@ -0,0 +1,18 @@
+# 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.
+# Implementation class for the ModuleActivator
+org.apache.tuscany.sca.client.impl.SCAClientModuleActivator;ranking=100
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/resources/META-INF/services/org.oasisopen.sca.client.SCAClientFactory b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/resources/META-INF/services/org.oasisopen.sca.client.SCAClientFactory
new file mode 100644
index 0000000000..bcae8b1296
--- /dev/null
+++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/sca-client-impl/src/main/resources/META-INF/services/org.oasisopen.sca.client.SCAClientFactory
@@ -0,0 +1,18 @@
+# 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.

+# Implementation class for the ModuleActivator

+org.apache.tuscany.sca.client.impl.SCAClientFactoryImpl2