Added node-launcher-equinox to the distro to test integration with OSGi/Equinox. Added SDO databinding to the Web Service distribution as I had missed it before.

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

15 files changed, 40 insertions, 20 deletions

diff --git a/java/sca/distribution/features/all/pom.xml b/java/sca/distribution/features/all/pom.xml
index b53a091d7f..8e108a6e61 100644
--- a/java/sca/distribution/features/all/pom.xml
+++ b/java/sca/distribution/features/all/pom.xml
@@ -149,6 +149,7 @@
                 <module>../../../modules/databinding-json</module>
                 <module>../../../modules/databinding-saxon</module>
                 <module>../../../modules/databinding-sdo</module>
+                <module>../../../modules/databinding-sdo-axiom</module>
                 <module>../../../modules/definitions</module>
                 <module>../../../modules/definitions-xml</module>
                 <module>../../../modules/domain-manager</module>
@@ -186,7 +187,7 @@
                 <module>../../../modules/node-api</module>
                 <module>../../../modules/node-impl</module>
                 <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-osgi</module>
+                <module>../../../modules/node-launcher-equinox</module>
                 <module>../../../modules/node-launcher-webapp</module>
                 <module>../../../modules/node-manager</module>
                 <module>../../../modules/policy</module>
diff --git a/java/sca/distribution/features/all/src/main/components/src-modules.xml b/java/sca/distribution/features/all/src/main/components/src-modules.xml
index 17cf7b4384..1b939484f0 100644
--- a/java/sca/distribution/features/all/src/main/components/src-modules.xml
+++ b/java/sca/distribution/features/all/src/main/components/src-modules.xml
@@ -63,6 +63,7 @@
                 <include>databinding-json/**/*</include>
                 <include>databinding-saxon/**/*</include>
                 <include>databinding-sdo/**/*</include>
+                <include>databinding-sdo-axiom/**/*</include>
                 <include>definitions/**/*</include>
                 <include>definitions-xml/**/*</include>
                 <include>distribution-core/**/*</include>
@@ -106,7 +107,7 @@
                 <include>node-api/**/*</include>
                 <include>node-impl/**/*</include>
                 <include>node-launcher/**/*</include>
-                <include>node-launcher-osgi/**/*</include>
+                <include>node-launcher-equinox/**/*</include>
                 <include>node-launcher-webapp/**/*</include>
                 <include>node-manager/**/*</include>
                 <include>policy/**/*</include>
diff --git a/java/sca/distribution/features/core/pom.xml b/java/sca/distribution/features/core/pom.xml
index 24cf8437cb..0625057123 100644
--- a/java/sca/distribution/features/core/pom.xml
+++ b/java/sca/distribution/features/core/pom.xml
@@ -170,7 +170,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher-osgi</artifactId>
+            <artifactId>tuscany-node-launcher-equinox</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
         <dependency>
@@ -307,7 +307,7 @@
                 <module>../../../modules/node-api</module>
                 <module>../../../modules/node-impl</module>
                 <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-osgi</module>
+                <module>../../../modules/node-launcher-equinox</module>
                 <module>../../../modules/node-launcher-webapp</module>
                 <module>../../../modules/policy</module>
                 <module>../../../modules/policy-security</module>
diff --git a/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml b/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
index 5906d0e343..0737573fc0 100644
--- a/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
+++ b/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
@@ -66,7 +66,7 @@
                 <exclude>org.apache.tuscany.sca:tuscany-node-api</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-node-impl</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-node-launcher</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-node-launcher-osgi</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-node-launcher-equinox</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-node-launcher-webapp</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-policy</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-policy-security</exclude>
@@ -91,13 +91,17 @@
                 <exclude>javax.xml.bind:jaxb-api</exclude>
                 <exclude>javax.xml.stream:stax-api</exclude>
                 <exclude>javax.xml.ws:jaxws-api</exclude>
-                <exclude>org.apache.felix:org.apache.felix.framework</exclude>
-                <exclude>org.apache.felix:org.osgi.compendium</exclude>
-                <exclude>org.apache.felix:org.osgi.core</exclude>
-                <exclude>org.apache.felix:org.osgi.foundation</exclude>
                 <exclude>org.apache.geronimo.specs:geronimo-commonj_1.1_spec</exclude>
                 <exclude>org.apache.ws.commons.schema:XmlSchema</exclude>
                 <exclude>org.codehaus.woodstox:wstx-asl</exclude>
+                <exclude>org.eclipse.core:contenttype</exclude>
+                <exclude>org.eclipse.core:jobs</exclude>
+                <exclude>org.eclipse.core:runtime</exclude>
+                <exclude>org.eclipse.equinox:app</exclude>
+                <exclude>org.eclipse.equinox:common</exclude>
+                <exclude>org.eclipse.equinox:preferences</exclude>
+                <exclude>org.eclipse.equinox:registry</exclude>
+                <exclude>org.eclipse:osgi</exclude>
                 <exclude>wsdl4j:wsdl4j</exclude>
                 <exclude>org.apache.tuscany.sca:*</exclude>
             </excludes>
diff --git a/java/sca/distribution/features/core/src/main/components/src-modules.xml b/java/sca/distribution/features/core/src/main/components/src-modules.xml
index 1d1faab9dc..725285aa9e 100644
--- a/java/sca/distribution/features/core/src/main/components/src-modules.xml
+++ b/java/sca/distribution/features/core/src/main/components/src-modules.xml
@@ -63,7 +63,7 @@
                 <include>node-api/**/*</include>
                 <include>node-impl/**/*</include>
                 <include>node-launcher/**/*</include>
-                <include>node-launcher-osgi/**/*</include>
+                <include>node-launcher-equinox/**/*</include>
                 <include>node-launcher-webapp/**/*</include>
                 <include>policy/**/*</include>
                 <include>policy-security/**/*</include>
diff --git a/java/sca/distribution/features/ejava/pom.xml b/java/sca/distribution/features/ejava/pom.xml
index 34a3faf9f4..06e1b37ee7 100644
--- a/java/sca/distribution/features/ejava/pom.xml
+++ b/java/sca/distribution/features/ejava/pom.xml
@@ -160,7 +160,7 @@
                 <module>../../../modules/node-api</module>
                 <module>../../../modules/node-impl</module>
                 <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-osgi</module>
+                <module>../../../modules/node-launcher-equinox</module>
                 <module>../../../modules/node-launcher-webapp</module>
                 <module>../../../modules/policy</module>
                 <module>../../../modules/policy-security</module>
diff --git a/java/sca/distribution/features/ejava/src/main/components/src-modules.xml b/java/sca/distribution/features/ejava/src/main/components/src-modules.xml
index 7932a54b08..37a48fa19e 100644
--- a/java/sca/distribution/features/ejava/src/main/components/src-modules.xml
+++ b/java/sca/distribution/features/ejava/src/main/components/src-modules.xml
@@ -74,7 +74,7 @@
                 <include>node-api/**/*</include>
                 <include>node-impl/**/*</include>
                 <include>node-launcher/**/*</include>
-                <include>node-launcher-osgi/**/*</include>
+                <include>node-launcher-equinox/**/*</include>
                 <include>node-launcher-webapp/**/*</include>
                 <include>policy/**/*</include>
                 <include>policy-security/**/*</include>
diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/distribution/features/manager/pom.xml
index 1350976317..bbe06c665f 100644
--- a/java/sca/distribution/features/manager/pom.xml
+++ b/java/sca/distribution/features/manager/pom.xml
@@ -234,7 +234,7 @@
                 <module>../../../modules/node-api</module>
                 <module>../../../modules/node-impl</module>
                 <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-osgi</module>
+                <module>../../../modules/node-launcher-equinox</module>
                 <module>../../../modules/node-launcher-webapp</module>
                 <module>../../../modules/node-manager</module>
                 <module>../../../modules/policy</module>
diff --git a/java/sca/distribution/features/manager/src/main/components/src-modules.xml b/java/sca/distribution/features/manager/src/main/components/src-modules.xml
index 7886bc9b68..b6e5c10fea 100644
--- a/java/sca/distribution/features/manager/src/main/components/src-modules.xml
+++ b/java/sca/distribution/features/manager/src/main/components/src-modules.xml
@@ -81,7 +81,7 @@
                 <include>node-api/**/*</include>
                 <include>node-impl/**/*</include>
                 <include>node-launcher/**/*</include>
-                <include>node-launcher-osgi/**/*</include>
+                <include>node-launcher-equinox/**/*</include>
                 <include>node-launcher-webapp/**/*</include>
                 <include>node-manager/**/*</include>
                 <include>policy/**/*</include>
diff --git a/java/sca/distribution/features/process/pom.xml b/java/sca/distribution/features/process/pom.xml
index c6291771e5..b83282c8c1 100644
--- a/java/sca/distribution/features/process/pom.xml
+++ b/java/sca/distribution/features/process/pom.xml
@@ -136,7 +136,7 @@
                 <module>../../../modules/node-api</module>
                 <module>../../../modules/node-impl</module>
                 <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-osgi</module>
+                <module>../../../modules/node-launcher-equinox</module>
                 <module>../../../modules/node-launcher-webapp</module>
                 <module>../../../modules/policy</module>
                 <module>../../../modules/policy-security</module>
diff --git a/java/sca/distribution/features/process/src/main/components/src-modules.xml b/java/sca/distribution/features/process/src/main/components/src-modules.xml
index 9681a9bda9..fd6427f8df 100644
--- a/java/sca/distribution/features/process/src/main/components/src-modules.xml
+++ b/java/sca/distribution/features/process/src/main/components/src-modules.xml
@@ -69,7 +69,7 @@
                 <include>node-api/**/*</include>
                 <include>node-impl/**/*</include>
                 <include>node-launcher/**/*</include>
-                <include>node-launcher-osgi/**/*</include>
+                <include>node-launcher-equinox/**/*</include>
                 <include>node-launcher-webapp/**/*</include>
                 <include>policy/**/*</include>
                 <include>policy-security/**/*</include>
diff --git a/java/sca/distribution/features/web20/pom.xml b/java/sca/distribution/features/web20/pom.xml
index ecd556c666..2b0bb559d5 100644
--- a/java/sca/distribution/features/web20/pom.xml
+++ b/java/sca/distribution/features/web20/pom.xml
@@ -189,7 +189,7 @@
                 <module>../../../modules/node-api</module>
                 <module>../../../modules/node-impl</module>
                 <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-osgi</module>
+                <module>../../../modules/node-launcher-equinox</module>
                 <module>../../../modules/node-launcher-webapp</module>
                 <module>../../../modules/policy</module>
                 <module>../../../modules/policy-security</module>
diff --git a/java/sca/distribution/features/web20/src/main/components/src-modules.xml b/java/sca/distribution/features/web20/src/main/components/src-modules.xml
index 15b3f2a522..6631f884d2 100644
--- a/java/sca/distribution/features/web20/src/main/components/src-modules.xml
+++ b/java/sca/distribution/features/web20/src/main/components/src-modules.xml
@@ -79,7 +79,7 @@
                 <include>node-api/**/*</include>
                 <include>node-impl/**/*</include>
                 <include>node-launcher/**/*</include>
-                <include>node-launcher-osgi/**/*</include>
+                <include>node-launcher-equinox/**/*</include>
                 <include>node-launcher-webapp/**/*</include>
                 <include>policy/**/*</include>
                 <include>policy-security/**/*</include>
diff --git a/java/sca/distribution/features/webservice/pom.xml b/java/sca/distribution/features/webservice/pom.xml
index 809dba0f0d..6b70970c76 100644
--- a/java/sca/distribution/features/webservice/pom.xml
+++ b/java/sca/distribution/features/webservice/pom.xml
@@ -89,6 +89,16 @@
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo-axiom</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
 
         <!-- Hosts -->
         <dependency>
@@ -172,6 +182,8 @@
                 <module>../../../modules/databinding-axiom</module>
                 <module>../../../modules/databinding-jaxb</module>
                 <module>../../../modules/databinding-jaxb-axiom</module>
+                <module>../../../modules/databinding-sdo</module>
+                <module>../../../modules/databinding-sdo-axiom</module>
                 <module>../../../modules/definitions</module>
                 <module>../../../modules/definitions-xml</module>
                 <module>../../../modules/endpoint</module>
@@ -196,7 +208,7 @@
                 <module>../../../modules/node-api</module>
                 <module>../../../modules/node-impl</module>
                 <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-osgi</module>
+                <module>../../../modules/node-launcher-equinox</module>
                 <module>../../../modules/node-launcher-webapp</module>
                 <module>../../../modules/policy</module>
                 <module>../../../modules/policy-security</module>
diff --git a/java/sca/distribution/features/webservice/src/main/components/src-modules.xml b/java/sca/distribution/features/webservice/src/main/components/src-modules.xml
index d2ae2a0da9..1a97291775 100644
--- a/java/sca/distribution/features/webservice/src/main/components/src-modules.xml
+++ b/java/sca/distribution/features/webservice/src/main/components/src-modules.xml
@@ -47,6 +47,8 @@
                 <include>databinding-axiom/**/*</include>
                 <include>databinding-jaxb/**/*</include>
                 <include>databinding-jaxb-axiom/**/*</include>
+                <include>databinding-sdo/**/*</include>
+                <include>databinding-sdo-axiom/**/*</include>
                 <include>definitions/**/*</include>
                 <include>definitions-xml/**/*</include>
                 <include>distribution-core/**/*</include>
@@ -72,7 +74,7 @@
                 <include>node-api/**/*</include>
                 <include>node-impl/**/*</include>
                 <include>node-launcher/**/*</include>
-                <include>node-launcher-osgi/**/*</include>
+                <include>node-launcher-equinox/**/*</include>
                 <include>node-launcher-webapp/**/*</include>
                 <include>policy/**/*</include>
                 <include>policy-security/**/*</include>