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

3 files changed, 30 insertions, 4 deletions

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>