Refactor tuscany-endpoint module into tuscany-core

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

28 files changed, 49 insertions, 787 deletions

diff --git a/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointReferenceBuilderImpl.java
index 8fb02d40a3..e1bb50a2b9 100644
--- a/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointReferenceBuilderImpl.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.tuscany.sca.endpoint.impl;
+package org.apache.tuscany.sca.core.assembly.impl;
 
 import java.util.List;
 
diff --git a/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java
index 847794f436..1317c3fc8f 100644
--- a/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.tuscany.sca.endpoint.impl;
+package org.apache.tuscany.sca.core.assembly.impl;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/java/sca/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.EndpointReferenceBuilder b/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.EndpointReferenceBuilder
index 37f34b9aba..8f721db536 100644
--- a/java/sca/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.EndpointReferenceBuilder
+++ b/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.EndpointReferenceBuilder
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations

 # under the License. 

 

-org.apache.tuscany.sca.endpoint.impl.EndpointReferenceBuilderImpl
\ No newline at end of file
+org.apache.tuscany.sca.core.assembly.impl.EndpointReferenceBuilderImpl
\ No newline at end of file
diff --git a/java/sca/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry b/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
index 75a909199e..9a52ac0355 100644
--- a/java/sca/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
+++ b/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations

 # under the License.

 

-org.apache.tuscany.sca.endpoint.impl.EndpointRegistryImpl;ranking=100
\ No newline at end of file
+org.apache.tuscany.sca.core.assembly.impl.EndpointRegistryImpl;ranking=100,scheme=vm
\ No newline at end of file
diff --git a/java/sca/modules/endpoint/src/main/resources/endpoint-validation-messages.properties b/java/sca/modules/core/src/main/resources/endpoint-validation-messages.properties
index 7be0f2b4a2..7be0f2b4a2 100644
--- a/java/sca/modules/endpoint/src/main/resources/endpoint-validation-messages.properties
+++ b/java/sca/modules/core/src/main/resources/endpoint-validation-messages.properties
diff --git a/java/sca/modules/domain-node/pom.xml b/java/sca/modules/domain-node/pom.xml
index 0a2d3c274c..59a3bfac48 100644
--- a/java/sca/modules/domain-node/pom.xml
+++ b/java/sca/modules/domain-node/pom.xml
@@ -40,13 +40,6 @@
         

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-sca-client-impl</artifactId>

             <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

diff --git a/java/sca/modules/endpoint-tribes/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry b/java/sca/modules/endpoint-tribes/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
index 3bea847c70..13d7c54d9d 100644
--- a/java/sca/modules/endpoint-tribes/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
+++ b/java/sca/modules/endpoint-tribes/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the

 # specific language governing permissions and limitations

 # under the License.

-org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpointRegistry;ranking=150,address=228.0.0.100,port=50000,timeout=50
\ No newline at end of file
+org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpointRegistry;ranking=150,address=228.0.0.100,port=50000,timeout=50,scheme=tribes
\ No newline at end of file
diff --git a/java/sca/modules/endpoint-wrapper/META-INF/MANIFEST.MF b/java/sca/modules/endpoint-wrapper/META-INF/MANIFEST.MF
index 4d358f3884..fc99ede258 100644
--- a/java/sca/modules/endpoint-wrapper/META-INF/MANIFEST.MF
+++ b/java/sca/modules/endpoint-wrapper/META-INF/MANIFEST.MF
@@ -10,10 +10,8 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Default Endpoint Wrapper

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

- org.apache.tuscany.sca.assembly.builder;version="2.0.0";resolution:=optional,

  org.apache.tuscany.sca.core;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.endpoint.impl;version="2.0.0",

- org.apache.tuscany.sca.endpoint.tribes;version="2.0.0",

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

  org.apache.tuscany.sca.management;version="2.0.0",

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

 Bundle-SymbolicName: org.apache.tuscany.sca.endpoint.wrapper

diff --git a/java/sca/modules/endpoint-wrapper/pom.xml b/java/sca/modules/endpoint-wrapper/pom.xml
index 339e0a7e38..f62ea86442 100644
--- a/java/sca/modules/endpoint-wrapper/pom.xml
+++ b/java/sca/modules/endpoint-wrapper/pom.xml
@@ -40,50 +40,41 @@
         

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-endpoint</artifactId>

+            <artifactId>tuscany-assembly-xml</artifactId>

             <version>2.0-SNAPSHOT</version>

+            <scope>test</scope>

         </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-endpoint-tribes</artifactId>

+            <artifactId>tuscany-core-spi</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

-

+        

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-assembly-xml</artifactId>

+            <artifactId>tuscany-monitor</artifactId>

             <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

         </dependency>

+                

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-core</artifactId>

             <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

+

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-extensibility</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-monitor</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

+

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-contribution</artifactId>

             <version>2.0-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>2.0-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

 </project>

diff --git a/java/sca/modules/endpoint-wrapper/src/main/java/org/apache/tuscany/sca/endpoint/wrapper/EndpointRegistryWrapper.java b/java/sca/modules/endpoint-wrapper/src/main/java/org/apache/tuscany/sca/endpoint/wrapper/EndpointRegistryWrapper.java
index bfa7a4410a..25330b229c 100644
--- a/java/sca/modules/endpoint-wrapper/src/main/java/org/apache/tuscany/sca/endpoint/wrapper/EndpointRegistryWrapper.java
+++ b/java/sca/modules/endpoint-wrapper/src/main/java/org/apache/tuscany/sca/endpoint/wrapper/EndpointRegistryWrapper.java
@@ -19,7 +19,10 @@
 

 package org.apache.tuscany.sca.endpoint.wrapper;

 

+import java.lang.reflect.Constructor;

+import java.util.Collection;

 import java.util.List;

+import java.util.Map;

 import java.util.logging.Logger;

 

 import org.apache.tuscany.sca.assembly.Endpoint;

@@ -27,8 +30,8 @@ import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;

 import org.apache.tuscany.sca.core.LifeCycleListener;

 import org.apache.tuscany.sca.core.UtilityExtensionPoint;

-import org.apache.tuscany.sca.endpoint.impl.EndpointRegistryImpl;

-import org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpointRegistry;

+import org.apache.tuscany.sca.extensibility.ServiceDeclaration;

+import org.apache.tuscany.sca.extensibility.ServiceDiscovery;

 import org.apache.tuscany.sca.management.ConfigAttributes;

 import org.apache.tuscany.sca.runtime.EndpointListener;

 import org.apache.tuscany.sca.runtime.EndpointRegistry;

@@ -38,7 +41,7 @@ import org.apache.tuscany.sca.runtime.EndpointRegistry;
  */

 public class EndpointRegistryWrapper implements EndpointRegistry, LifeCycleListener {

     private final Logger logger = Logger.getLogger(EndpointRegistryWrapper.class.getName());

-    

+

     private ExtensionPointRegistry extensionPoints;

     private EndpointRegistry delegateEndpointRegistry;

 

@@ -49,12 +52,34 @@ public class EndpointRegistryWrapper implements EndpointRegistry, LifeCycleListe
     public void start() {

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

         ConfigAttributes domainConfig = utilities.getUtility(ConfigAttributes.class);

-        if (domainConfig != null && "tribes".equals(domainConfig.getAttributes().get("domainScheme"))) {

-            logger.info("Using Tribes based EndpointRegistry");

-            delegateEndpointRegistry = new ReplicatedEndpointRegistry(extensionPoints, null);

-        } else {

-            logger.info("Using in-VM EndpointRegistry");

-            delegateEndpointRegistry = new EndpointRegistryImpl(extensionPoints);

+        String scheme = null;

+        if (domainConfig != null) {

+            scheme = domainConfig.getAttributes().get("domainScheme");

+        }

+        if (scheme == null) {

+            scheme = "vm";

+        }

+        try {

+            Collection<ServiceDeclaration> sds =

+                ServiceDiscovery.getInstance().getServiceDeclarations(EndpointRegistry.class);

+            for (ServiceDeclaration sd : sds) {

+                if (scheme.equals(sd.getAttributes().get("scheme"))) {

+                    logger.info("EndpointRegistry found: " + sd.getClassName());

+                    Class<?> implClass = sd.loadClass();

+                    Constructor<?> constructor = null;

+                    try {

+                        constructor = implClass.getConstructor(ExtensionPointRegistry.class);

+                        delegateEndpointRegistry = (EndpointRegistry)constructor.newInstance(extensionPoints);

+                    } catch (NoSuchMethodException e) {

+                        constructor = implClass.getConstructor(ExtensionPointRegistry.class, Map.class);

+                        delegateEndpointRegistry =

+                            (EndpointRegistry)constructor.newInstance(extensionPoints, sd.getAttributes());

+                    }

+                    break;

+                }

+            }

+        } catch (Exception e) {

+            throw new IllegalStateException(e);

         }

         if (delegateEndpointRegistry instanceof LifeCycleListener) {

             ((LifeCycleListener)delegateEndpointRegistry).start();

diff --git a/java/sca/modules/endpoint-wrapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry b/java/sca/modules/endpoint-wrapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
index bc66c8c0dc..8ba40ef648 100644
--- a/java/sca/modules/endpoint-wrapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
+++ b/java/sca/modules/endpoint-wrapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations

 # under the License.

 

-org.apache.tuscany.sca.endpoint.wrapper.EndpointRegistryWrapper;ranking=200

+org.apache.tuscany.sca.endpoint.wrapper.EndpointRegistryWrapper;ranking=200,scheme=wrapper

diff --git a/java/sca/modules/endpoint/LICENSE b/java/sca/modules/endpoint/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/java/sca/modules/endpoint/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 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/java/sca/modules/endpoint/META-INF/MANIFEST.MF b/java/sca/modules/endpoint/META-INF/MANIFEST.MF
deleted file mode 100644
index a1aa335968..0000000000
--- a/java/sca/modules/endpoint/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: apache.tuscany.sca.endpoint.impl;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Default Endpoint Implementation

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397237968

-Bundle-ManifestVersion: 2

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

-Bundle-Description: Apache Tuscany SCA Default Endpoint Implementation

-Import-Package: javax.xml.stream;resolution:=optional,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.assembly.builder;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.contribution;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.contribution.processor;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.contribution.resolver;version="2.0.0";resolution:=optional,

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

- org.apache.tuscany.sca.core.assembly;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.definitions;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.interfacedef;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.monitor;version="2.0.0";resolution:=optional,

- org.apache.tuscany.sca.policy;version="2.0.0";resolution:=optional,

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

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

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional

-Bundle-SymbolicName: org.apache.tuscany.sca.endpoint

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

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
-Export-Package: org.apache.tuscany.sca.endpoint.impl;version="2.0.0"

diff --git a/java/sca/modules/endpoint/NOTICE b/java/sca/modules/endpoint/NOTICE
deleted file mode 100644
index 25bb89c9b2..0000000000
--- a/java/sca/modules/endpoint/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/java/sca/modules/endpoint/pom.xml b/java/sca/modules/endpoint/pom.xml
deleted file mode 100644
index 1d5218c361..0000000000
--- a/java/sca/modules/endpoint/pom.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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-endpoint</artifactId>
-    <name>Apache Tuscany SCA Endpoint Default Runtime</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-assembly</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>  
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency> 
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency> 
-    </dependencies>
-
-</project>
diff --git a/java/sca/modules/endpoint/src/test/java/calculator/AddService.java b/java/sca/modules/endpoint/src/test/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/java/sca/modules/endpoint/src/test/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/java/sca/modules/endpoint/src/test/java/calculator/AddServiceImpl.java b/java/sca/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/java/sca/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
-        return n1 + n2;
-    }
-
-}
diff --git a/java/sca/modules/endpoint/src/test/java/calculator/CalculatorService.java b/java/sca/modules/endpoint/src/test/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/java/sca/modules/endpoint/src/test/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java b/java/sca/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 17fad7de6b..0000000000
--- a/java/sca/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +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 calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/java/sca/modules/endpoint/src/test/java/calculator/DivideService.java b/java/sca/modules/endpoint/src/test/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/java/sca/modules/endpoint/src/test/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/java/sca/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java b/java/sca/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/java/sca/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
-        return n1 / n2;
-    }
-
-}
diff --git a/java/sca/modules/endpoint/src/test/java/calculator/MultiplyService.java b/java/sca/modules/endpoint/src/test/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/java/sca/modules/endpoint/src/test/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/java/sca/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java b/java/sca/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/java/sca/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
-        return n1 * n2;
-    }
-
-}
diff --git a/java/sca/modules/endpoint/src/test/java/calculator/SubtractService.java b/java/sca/modules/endpoint/src/test/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/java/sca/modules/endpoint/src/test/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +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 calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/java/sca/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java b/java/sca/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/java/sca/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        Logger logger = Logger.getLogger("calculator");
-        logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
-        return n1 - n2;
-    }
-
-}
diff --git a/java/sca/modules/endpoint/src/test/resources/Calculator.composite b/java/sca/modules/endpoint/src/test/resources/Calculator.composite
deleted file mode 100644
index cd17d6b0fb..0000000000
--- a/java/sca/modules/endpoint/src/test/resources/Calculator.composite
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:calc="http://calc"
-    targetNamespace="http://calc"
-    name="Calculator">
-    
-    <component name="CalculatorServiceComponent">
-        <implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent"/>
-        <reference name="subtractService" target="SubtractServiceComponent"/>
-        <reference name="multiplyService" target="MultiplyServiceComponent"/>
-        <reference name="divideService" target="DivideServiceComponent"/>
-    </component>
-    
-    <component name="AddServiceComponentOff">
-        <implementation.java class="calculator.AddServiceImpl"/>
-        <service name="AddServiceImpl">
-            <interface.java interface="calculator.AddService"/>
-        </service>        
-    </component>
-    
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-    
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-    
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-
-</composite>
\ No newline at end of file
diff --git a/java/sca/modules/node-impl/pom.xml b/java/sca/modules/node-impl/pom.xml
index 185499eaec..87d3910b7f 100644
--- a/java/sca/modules/node-impl/pom.xml
+++ b/java/sca/modules/node-impl/pom.xml
@@ -103,13 +103,6 @@
             <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-endpoint</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency> 
                
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml
index 33a8a9ec5a..16132bd9aa 100644
--- a/java/sca/modules/pom.xml
+++ b/java/sca/modules/pom.xml
@@ -59,7 +59,6 @@
         <module>databinding-jaxb-axiom</module>
         <module>definitions-xml</module>
         <module>domain-node</module>
-        <module>endpoint</module>
         <module>endpoint-tribes</module>
         <module>endpoint-wrapper</module>
         <module>extensibility</module>