Added corba binding to distribution. Changed dependency on extensibility-osgi to extensiblity-equinox.

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

17 files changed, 100 insertions, 18 deletions

diff --git a/java/sca/distribution/features/all/pom.xml b/java/sca/distribution/features/all/pom.xml
index 82aebc27b1..e720a2e331 100644
--- a/java/sca/distribution/features/all/pom.xml
+++ b/java/sca/distribution/features/all/pom.xml
@@ -143,6 +143,8 @@
                 <module>../../../modules/assembly-xsd</module>
                 <module>../../../modules/binding-atom</module>
                 <module>../../../modules/binding-atom-abdera</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
                 <module>../../../modules/binding-ejb</module>
                 <module>../../../modules/binding-ejb-runtime</module>
                 <module>../../../modules/binding-http</module>
@@ -183,8 +185,10 @@
                 <module>../../../modules/domain-manager</module>
                 <module>../../../modules/endpoint</module>
                 <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-osgi</module>
+                <module>../../../modules/extensibility-equinox</module>
                 <module>../../../modules/extension-helper</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
                 <module>../../../modules/host-ejb</module>
                 <module>../../../modules/host-embedded</module>
                 <module>../../../modules/host-http</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 75042a3498..b886263676 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
@@ -29,6 +29,8 @@
                 <include>assembly-xsd/**/*</include>
                 <include>binding-atom/**/*</include>
                 <include>binding-atom-abdera/**/*</include>
+                <include>binding-corba/**/*</include>
+                <include>binding-corba-runtime/**/*</include>
                 <include>binding-ejb/**/*</include>
                 <include>binding-ejb-runtime/**/*</include>
                 <include>binding-http/**/*</include>
@@ -75,8 +77,10 @@
                 <include>domain-manager/**/*</include>
                 <include>endpoint/**/*</include>
                 <include>extensibility/**/*</include>
-                <include>extensibility-osgi/**/*</include>
+                <include>extensibility-equinox/**/*</include>
                 <include>extension-helper/**/*</include>
+                <include>host-corba/**/*</include>
+                <include>host-corba-jse/**/*</include>
                 <include>host-ejb/**/*</include>
                 <include>host-embedded/**/*</include>
                 <include>host-http/**/*</include>
diff --git a/java/sca/distribution/features/core/pom.xml b/java/sca/distribution/features/core/pom.xml
index 0625057123..53f01acf49 100644
--- a/java/sca/distribution/features/core/pom.xml
+++ b/java/sca/distribution/features/core/pom.xml
@@ -44,6 +44,13 @@
             <version>1.4-SNAPSHOT</version>
         </dependency>
 
+        <!-- Corba binding -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-corba-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
         <!-- Contribution model -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -119,7 +126,14 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility-osgi</artifactId>
+            <artifactId>tuscany-extensibility-equinox</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        
+        <!--  Corba host -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-corba-jse</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
 
@@ -271,6 +285,8 @@
                 <module>../../../modules/assembly</module>
                 <module>../../../modules/assembly-xml</module>
                 <module>../../../modules/assembly-xsd</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
                 <module>../../../modules/binding-sca</module>
                 <module>../../../modules/binding-sca-xml</module>
                 <module>../../../modules/contribution</module>
@@ -288,7 +304,9 @@
                 <module>../../../modules/definitions-xml</module>
                 <module>../../../modules/endpoint</module>
                 <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-osgi</module>
+                <module>../../../modules/extensibility-equinox</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
                 <module>../../../modules/host-embedded</module>
                 <module>../../../modules/host-http</module>
                 <module>../../../modules/implementation-java</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 0737573fc0..58d8ca1407 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
@@ -30,6 +30,8 @@
                 <exclude>org.apache.tuscany.sca:tuscany-assembly</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-assembly-xml</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-assembly-xsd</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-binding-corba</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-binding-corba-runtime</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-binding-sca</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-binding-sca-xml</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-contribution</exclude>
@@ -47,7 +49,9 @@
                 <exclude>org.apache.tuscany.sca:tuscany-definitions-xml</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-endpoint</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-extensibility</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-extensibility-osgi</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-extensibility-equinox</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-host-corba</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-host-corba-jse</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-host-embedded</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-host-http</exclude>
                 <exclude>org.apache.tuscany.sca:tuscany-implementation-java</exclude>
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 725285aa9e..f3e34d10f3 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
@@ -27,6 +27,8 @@
                 <include>assembly/**/*</include>
                 <include>assembly-xml/**/*</include>
                 <include>assembly-xsd/**/*</include>
+                <include>binding-corba/**/*</include>
+                <include>binding-corba-runtime/**/*</include>
                 <include>binding-sca/**/*</include>
                 <include>binding-sca-xml/**/*</include>
                 <include>contribution/**/*</include>
@@ -44,7 +46,9 @@
                 <include>definitions-xml/**/*</include>
                 <include>endpoint/**/*</include>
                 <include>extensibility/**/*</include>
-                <include>extensibility-osgi/**/*</include>
+                <include>extensibility-equinox/**/*</include>
+                <include>host-corba/**/*</include>
+                <include>host-corba-jse/**/*</include>
                 <include>host-embedded/**/*</include>
                 <include>host-http/**/*</include>
                 <include>implementation-java/**/*</include>
diff --git a/java/sca/distribution/features/ejava/pom.xml b/java/sca/distribution/features/ejava/pom.xml
index 06e1b37ee7..1ff6baa336 100644
--- a/java/sca/distribution/features/ejava/pom.xml
+++ b/java/sca/distribution/features/ejava/pom.xml
@@ -114,6 +114,8 @@
                 <module>../../../modules/assembly</module>
                 <module>../../../modules/assembly-xml</module>
                 <module>../../../modules/assembly-xsd</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
                 <module>../../../modules/binding-ejb</module>
                 <module>../../../modules/binding-ejb-runtime</module>
                 <module>../../../modules/binding-jms</module>
@@ -136,8 +138,10 @@
                 <module>../../../modules/definitions-xml</module>
                 <module>../../../modules/endpoint</module>
                 <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-osgi</module>
+                <module>../../../modules/extensibility-equinox</module>
                 <module>../../../modules/extension-helper</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
                 <module>../../../modules/host-ejb</module>
                 <module>../../../modules/host-embedded</module>
                 <module>../../../modules/host-http</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 37a48fa19e..2b4bd22d87 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
@@ -27,6 +27,8 @@
                 <include>assembly/**/*</include>
                 <include>assembly-xml/**/*</include>
                 <include>assembly-xsd/**/*</include>
+                <include>binding-corba/**/*</include>
+                <include>binding-corba-runtime/**/*</include>
                 <include>binding-ejb/**/*</include>
                 <include>binding-ejb-runtime/**/*</include>
                 <include>binding-jms/**/*</include>
@@ -50,8 +52,10 @@
                 <include>distribution-core/**/*</include>
                 <include>endpoint/**/*</include>
                 <include>extensibility/**/*</include>
-                <include>extensibility-osgi/**/*</include>
+                <include>extensibility-equinox/**/*</include>
                 <include>extension-helper/**/*</include>
+                <include>host-corba/**/*</include>
+                <include>host-corba-jse/**/*</include>
                 <include>host-ejb/**/*</include>
                 <include>host-embedded/**/*</include>
                 <include>host-http/**/*</include>
diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/distribution/features/manager/pom.xml
index 77b05ec58f..cc594256c9 100644
--- a/java/sca/distribution/features/manager/pom.xml
+++ b/java/sca/distribution/features/manager/pom.xml
@@ -183,6 +183,8 @@
                 <module>../../../modules/assembly-xsd</module>
                 <module>../../../modules/binding-atom</module>
                 <module>../../../modules/binding-atom-abdera</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
                 <module>../../../modules/binding-ejb</module>
                 <module>../../../modules/binding-http</module>
                 <module>../../../modules/binding-http-runtime</module>
@@ -210,7 +212,9 @@
                 <module>../../../modules/domain-manager</module>
                 <module>../../../modules/endpoint</module>
                 <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-osgi</module>
+                <module>../../../modules/extensibility-equinox</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
                 <module>../../../modules/host-embedded</module>
                 <module>../../../modules/host-http</module>
                 <module>../../../modules/host-jetty</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 d82a5b9cde..9a68e7a938 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
@@ -29,6 +29,8 @@
                 <include>assembly-xsd/**/*</include>
                 <include>binding-atom/**/*</include>
                 <include>binding-atom-abdera/**/*</include>
+                <include>binding-corba/**/*</include>
+                <include>binding-corba-runtime/**/*</include>
                 <include>binding-ejb/**/*</include>
                 <include>binding-http/**/*</include>
                 <include>binding-http-runtime/**/*</include>
@@ -57,7 +59,9 @@
                 <include>domain-manager/**/*</include>
                 <include>endpoint/**/*</include>
                 <include>extensibility/**/*</include>
-                <include>extensibility-osgi/**/*</include>
+                <include>extensibility-equinox/**/*</include>
+                <include>host-corba/**/*</include>
+                <include>host-corba-jse/**/*</include>
                 <include>host-embedded/**/*</include>
                 <include>host-http/**/*</include>
                 <include>host-jetty/**/*</include>
diff --git a/java/sca/distribution/features/process/pom.xml b/java/sca/distribution/features/process/pom.xml
index b83282c8c1..4310034a0f 100644
--- a/java/sca/distribution/features/process/pom.xml
+++ b/java/sca/distribution/features/process/pom.xml
@@ -95,6 +95,8 @@
                 <module>../../../modules/assembly</module>
                 <module>../../../modules/assembly-xml</module>
                 <module>../../../modules/assembly-xsd</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
                 <module>../../../modules/binding-sca</module>
                 <module>../../../modules/binding-sca-xml</module>
                 <module>../../../modules/contribution</module>
@@ -114,7 +116,9 @@
                 <module>../../../modules/definitions-xml</module>
                 <module>../../../modules/endpoint</module>
                 <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-osgi</module>
+                <module>../../../modules/extensibility-equinox</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
                 <module>../../../modules/host-embedded</module>
                 <module>../../../modules/host-http</module>
                 <module>../../../modules/implementation-bpel</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 fd6427f8df..dfcf7d4ca0 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
@@ -27,6 +27,8 @@
                 <include>assembly/**/*</include>
                 <include>assembly-xml/**/*</include>
                 <include>assembly-xsd/**/*</include>
+                <include>binding-corba/**/*</include>
+                <include>binding-corba-runtime/**/*</include>
                 <include>binding-sca/**/*</include>
                 <include>binding-sca-xml/**/*</include>
                 <include>contribution/**/*</include>
@@ -47,7 +49,9 @@
                 <include>distribution-core/**/*</include>
                 <include>endpoint/**/*</include>
                 <include>extensibility/**/*</include>
-                <include>extensibility-osgi/**/*</include>
+                <include>extensibility-equinox/**/*</include>
+                <include>host-corba/**/*</include>
+                <include>host-corba-jse/**/*</include>
                 <include>host-embedded/**/*</include>
                 <include>host-http/**/*</include>
                 <include>implementation-bpel/**/*</include>
diff --git a/java/sca/distribution/features/repository/pom.xml b/java/sca/distribution/features/repository/pom.xml
index 19570ddf29..cfee564971 100644
--- a/java/sca/distribution/features/repository/pom.xml
+++ b/java/sca/distribution/features/repository/pom.xml
@@ -83,6 +83,8 @@
                 <module>../../../modules/assembly-xsd</module>
                 <module>../../../modules/binding-atom</module>
                 <module>../../../modules/binding-atom-abdera</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
                 <module>../../../modules/binding-ejb</module>
                 <module>../../../modules/binding-ejb-runtime</module>
                 <module>../../../modules/binding-http</module>
@@ -123,8 +125,10 @@
                 <module>../../../modules/domain-manager</module>
                 <module>../../../modules/endpoint</module>
                 <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-osgi</module>
+                <module>../../../modules/extensibility-equinox</module>
                 <module>../../../modules/extension-helper</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
                 <module>../../../modules/host-ejb</module>
                 <module>../../../modules/host-embedded</module>
                 <module>../../../modules/host-http</module>
diff --git a/java/sca/distribution/features/repository/src/main/components/src-modules.xml b/java/sca/distribution/features/repository/src/main/components/src-modules.xml
index e99ab61655..a893bf5ce8 100644
--- a/java/sca/distribution/features/repository/src/main/components/src-modules.xml
+++ b/java/sca/distribution/features/repository/src/main/components/src-modules.xml
@@ -29,6 +29,8 @@
                 <include>assembly-xsd/**/*</include>
                 <include>binding-atom/**/*</include>
                 <include>binding-atom-abdera/**/*</include>
+                <include>binding-corba/**/*</include>
+                <include>binding-corba-runtime/**/*</include>
                 <include>binding-ejb/**/*</include>
                 <include>binding-ejb-runtime/**/*</include>
                 <include>binding-http/**/*</include>
@@ -76,8 +78,10 @@
                 <include>domain-manager/**/*</include>
                 <include>endpoint/**/*</include>
                 <include>extensibility/**/*</include>
-                <include>extensibility-osgi/**/*</include>
+                <include>extensibility-equinox/**/*</include>
                 <include>extension-helper/**/*</include>
+                <include>host-corba/**/*</include>
+                <include>host-corba-jse/**/*</include>
                 <include>host-ejb/**/*</include>
                 <include>host-embedded/**/*</include>
                 <include>host-http/**/*</include>
diff --git a/java/sca/distribution/features/web20/pom.xml b/java/sca/distribution/features/web20/pom.xml
index 2b0bb559d5..58fe78edd4 100644
--- a/java/sca/distribution/features/web20/pom.xml
+++ b/java/sca/distribution/features/web20/pom.xml
@@ -140,6 +140,8 @@
                 <module>../../../modules/assembly-xsd</module>
                 <module>../../../modules/binding-atom</module>
                 <module>../../../modules/binding-atom-abdera</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
                 <module>../../../modules/binding-http</module>
                 <module>../../../modules/binding-http-runtime</module>
                 <module>../../../modules/binding-jsonrpc</module>
@@ -165,7 +167,9 @@
                 <module>../../../modules/definitions-xml</module>
                 <module>../../../modules/endpoint</module>
                 <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-osgi</module>
+                <module>../../../modules/extensibility-equinox</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
                 <module>../../../modules/host-embedded</module>
                 <module>../../../modules/host-http</module>
                 <module>../../../modules/host-jetty</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 6631f884d2..99082280ad 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
@@ -29,6 +29,8 @@
                 <include>assembly-xsd/**/*</include>
                 <include>binding-atom/**/*</include>
                 <include>binding-atom-abdera/**/*</include>
+                <include>binding-corba/**/*</include>
+                <include>binding-corba-runtime/**/*</include>
                 <include>binding-http/**/*</include>
                 <include>binding-http-runtime/**/*</include>
                 <include>binding-jsonrpc/**/*</include>
@@ -55,7 +57,9 @@
                 <include>distribution-core/**/*</include>
                 <include>endpoint/**/*</include>
                 <include>extensibility/**/*</include>
-                <include>extensibility-osgi/**/*</include>
+                <include>extensibility-equinox/**/*</include>
+                <include>host-corba/**/*</include>
+                <include>host-corba-jse/**/*</include>
                 <include>host-embedded/**/*</include>
                 <include>host-http/**/*</include>
                 <include>host-jetty/**/*</include>
diff --git a/java/sca/distribution/features/webservice/pom.xml b/java/sca/distribution/features/webservice/pom.xml
index 6b70970c76..7768813b0d 100644
--- a/java/sca/distribution/features/webservice/pom.xml
+++ b/java/sca/distribution/features/webservice/pom.xml
@@ -162,6 +162,8 @@
                 <module>../../../modules/assembly</module>
                 <module>../../../modules/assembly-xml</module>
                 <module>../../../modules/assembly-xsd</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
                 <module>../../../modules/binding-sca</module>
                 <module>../../../modules/binding-sca-axis2</module>
                 <module>../../../modules/binding-sca-xml</module>
@@ -188,7 +190,9 @@
                 <module>../../../modules/definitions-xml</module>
                 <module>../../../modules/endpoint</module>
                 <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-osgi</module>
+                <module>../../../modules/extensibility-equinox</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
                 <module>../../../modules/host-embedded</module>
                 <module>../../../modules/host-http</module>
                 <module>../../../modules/host-jetty</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 1a97291775..e551ca97ba 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
@@ -27,6 +27,8 @@
                 <include>assembly/**/*</include>
                 <include>assembly-xml/**/*</include>
                 <include>assembly-xsd/**/*</include>
+                <include>binding-corba/**/*</include>
+                <include>binding-corba-runtime/**/*</include>
                 <include>binding-sca/**/*</include>
                 <include>binding-sca-axis2/**/*</include>
                 <include>binding-sca-xml/**/*</include>
@@ -54,7 +56,9 @@
                 <include>distribution-core/**/*</include>
                 <include>endpoint/**/*</include>
                 <include>extensibility/**/*</include>
-                <include>extensibility-osgi/**/*</include>
+                <include>extensibility-equinox/**/*</include>
+                <include>host-corba/**/*</include>
+                <include>host-corba-jse/**/*</include>
                 <include>host-embedded/**/*</include>
                 <include>host-http/**/*</include>
                 <include>host-jetty/**/*</include>