Add missing jars to bin LICENSE. Add OSOA license to implementation-web-runtime/LICENSE&NOTICE. Remove OSOA license from host-webapp/LICENSE&NOTICE

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

5 files changed, 50 insertions, 44 deletions

diff --git a/branches/sca-java-2.0-M2/distribution/all/src/main/release/bin/LICENSE b/branches/sca-java-2.0-M2/distribution/all/src/main/release/bin/LICENSE
index 54e60de287..9c2105cb87 100644
--- a/branches/sca-java-2.0-M2/distribution/all/src/main/release/bin/LICENSE
+++ b/branches/sca-java-2.0-M2/distribution/all/src/main/release/bin/LICENSE
@@ -256,9 +256,12 @@ The following components come under Apache Software License 2.0
  geronimo-j2ee-jacc_1.0_spec-1.1.jar

  geronimo-j2ee-management_1.0_spec-1.1.jar

  geronimo-ejb_3.0_spec-1.0.jar

+ geronimo-el_1.0_spec-1.0.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

+ geronimo-jsp_2.1_spec-1.0.1.jar

+ geronimo-jta_1.1_spec-1.1.1.jar

  geronimo-kernel-1.2-beta.jar

  geronimo-management-1.2-beta.jar

  geronimo-naming-1.2-beta.jar

@@ -297,7 +300,7 @@ The following components come under Apache Software License 2.0
  rampart-core-1.4.jar

  rampart-policy-1.4.jar

  rampart-trust-1.4.jar

- regexp-1.3

+ regexp-1.3.jar

  stripes-1.5.jar

  tranql-connector-1.1.jar

  woden-api-1.0M8.jar

diff --git a/branches/sca-java-2.0-M2/modules/host-webapp/LICENSE b/branches/sca-java-2.0-M2/modules/host-webapp/LICENSE
index 0085d7e5ee..8aa906c321 100644
--- a/branches/sca-java-2.0-M2/modules/host-webapp/LICENSE
+++ b/branches/sca-java-2.0-M2/modules/host-webapp/LICENSE
@@ -201,41 +201,5 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-===============================================================================
-
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
-
-The Tuscany SCA for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-===============================================================================
-The module host-webapp includes files under the following license:
-
-Permission to copy, display and distribute the Service Component Architecture Specification and/or
-portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
-that you include the following on ALL copies of the Service Component Architecture Specification, or
-portions thereof, that you make:
-
-1. A link or URL to the Service Component Architecture Specification at this location:
-· http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
-
-2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
-
-BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
-SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
-royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
-necessary to implement the Service Component Architecture Specification.
-THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
-AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
-REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
-DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or
-publicity pertaining to the Service Component Architecture Specification or its contents without specific,
+
 
diff --git a/branches/sca-java-2.0-M2/modules/host-webapp/NOTICE b/branches/sca-java-2.0-M2/modules/host-webapp/NOTICE
index d989435591..f5efe99703 100644
--- a/branches/sca-java-2.0-M2/modules/host-webapp/NOTICE
+++ b/branches/sca-java-2.0-M2/modules/host-webapp/NOTICE
@@ -4,9 +4,4 @@ Copyright (c) 2005 - 2009 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-This product also includes software under the Service Component Architecture specification license
-(see the LICENSE file contained in this distribution) with the following copyright
 
-(c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA
-Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens
-AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved.
diff --git a/branches/sca-java-2.0-M2/modules/implementation-web-runtime/LICENSE b/branches/sca-java-2.0-M2/modules/implementation-web-runtime/LICENSE
index 6b0b1270ff..0085d7e5ee 100644
--- a/branches/sca-java-2.0-M2/modules/implementation-web-runtime/LICENSE
+++ b/branches/sca-java-2.0-M2/modules/implementation-web-runtime/LICENSE
@@ -201,3 +201,41 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+===============================================================================
+
+Apache Tuscany SCA for Java Subcomponents
+=========================================: 
+
+The Tuscany SCA for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+===============================================================================
+The module host-webapp includes files under the following license:
+
+Permission to copy, display and distribute the Service Component Architecture Specification and/or
+portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+that you include the following on ALL copies of the Service Component Architecture Specification, or
+portions thereof, that you make:
+
+1. A link or URL to the Service Component Architecture Specification at this location:
+· http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+
+2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+
+BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+necessary to implement the Service Component Architecture Specification.
+THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+publicity pertaining to the Service Component Architecture Specification or its contents without specific,
+
diff --git a/branches/sca-java-2.0-M2/modules/implementation-web-runtime/NOTICE b/branches/sca-java-2.0-M2/modules/implementation-web-runtime/NOTICE
index fdfa0e9faa..d989435591 100644
--- a/branches/sca-java-2.0-M2/modules/implementation-web-runtime/NOTICE
+++ b/branches/sca-java-2.0-M2/modules/implementation-web-runtime/NOTICE
@@ -1,6 +1,12 @@
 ${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
+Copyright (c) 2005 - 2009 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+This product also includes software under the Service Component Architecture specification license
+(see the LICENSE file contained in this distribution) with the following copyright
+
+(c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA
+Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens
+AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved.