Changes in LICENSE

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

2 files changed, 40 insertions, 20 deletions

diff --git a/branches/sca-java-1.4/distribution/bundle/pom.xml b/branches/sca-java-1.4/distribution/bundle/pom.xml
index 9f2b4765d8..0ef61b6c87 100644
--- a/branches/sca-java-1.4/distribution/bundle/pom.xml
+++ b/branches/sca-java-1.4/distribution/bundle/pom.xml
@@ -54,21 +54,11 @@
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-corba</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-binding-corba-runtime</artifactId>
             <version>${pom.version}</version>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-gdata</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-binding-gdata-runtime</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -94,6 +84,11 @@
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-binding-jms-policy</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -142,11 +137,11 @@
             <artifactId>tuscany-binding-sca-corba</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        <dependency>
+        <!-- dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-binding-sca-jms</artifactId>
             <version>${pom.version}</version>
-        </dependency>
+        </dependency -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
@@ -283,16 +278,21 @@
             <artifactId>tuscany-databinding-sdo-axiom</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        <dependency>
+        <!-- dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-databinding-xmlbeans</artifactId>
             <version>${pom.version}</version>
-        </dependency>
+        </dependency -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <!-- dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-host-corba</artifactId>
+            <version>${pom.version}</version>
+        </dependency -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-host-http</artifactId>
@@ -449,6 +449,11 @@
             <artifactId>tuscany-node-launcher</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <!-- dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-node-launcher-webapp</artifactId>
+            <version>${pom.version}</version>
+        </dependency -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-node-manager</artifactId>
@@ -612,10 +617,13 @@
                                     <resource>META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory</resource>
                                 </transformer>
                                 <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory</resource>
+                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory</resource>
                                 </transformer>
                                 <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory</resource>
+                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory</resource>
+                                </transformer>
+                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory</resource>
                                 </transformer>
                                 <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
                                     <resource>META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory</resource>
@@ -689,6 +697,9 @@
                                 <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
                                     <resource>META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator</resource>
                                 </transformer>
+                                <!-- transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint</resource>
+                                </transformer -->
                                 <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
                                     <resource>META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint</resource>
                                 </transformer>
@@ -699,6 +710,9 @@
                                     <resource>META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory</resource>
                                 </transformer>
                                 <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory</resource>
+                                </transformer>
+                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
                                     <resource>META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory</resource>
                                 </transformer>
                                 <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
@@ -714,6 +728,12 @@
                                     <resource>META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory</resource>
                                 </transformer>
                                 <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory</resource>
+                                </transformer>
+                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory</resource>
+                                </transformer>
+                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
                                     <resource>META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory</resource>
                                 </transformer>
                                 <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
diff --git a/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE b/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE
index f26c3ce342..8866b6cc63 100644
--- a/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE
+++ b/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE
@@ -268,7 +268,7 @@ The following components come under Apache Software License 2.0
  geronimo-j2ee-1.2-beta.jar
  geronimo-j2ee-connector_1.5_spec-1.1.jar
  geronimo-j2ee-jacc_1.0_spec-1.1.jar
- geronimo-j2ee-management_1.0_spec-1.0.jar
+ geronimo-j2ee-management_1.0_spec-1.1.jar
  geronimo-javamail_1.4_spec-1.2.jar
  geronimo-jms_1.1_spec-1.1.jar
  geronimo-jpa_3.0_spec-1.0.jar
@@ -328,7 +328,7 @@ The following components come under Apache Software License 2.0
  tuscany-sdo-tools-1.1.1.jar
  woden-api-1.0M8.jar
  woden-impl-dom-1.0M8.jar
- wss4j-1.6.2.jar
+ wss4j-1.5.4.jar
  wstx-asl-3.2.4.jar
  xalan-2.7.0.jar
  xbean-naming-2.7.jar
@@ -337,7 +337,7 @@ The following components come under Apache Software License 2.0
  xmlbeans-2.3.0.jar
  xml-resolver-1.1.jar
  xmlsec-1.4.2.jar
- XmlSchema-1.3.2.jar
+ XmlSchema-1.4.2.jar
 
 ===============================================================================
 axion-1.0-M3-dev.jar 
@@ -1888,7 +1888,7 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 
 ===============================================================================
 
-JRuby (jruby-complete-1.0.jar), wsdl4j (wsdl4j-1.6.2.jar):
+JRuby (jruby-complete-1.1.3.jar), wsdl4j (wsdl4j-1.6.2.jar):
 
 Common Public License - v 1.0