You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/04/09 12:10:59 UTC
svn commit: r763583 - in /tuscany/java/sca:
distribution/all/src/main/release/bin/LICENSE modules/host-webapp/LICENSE
modules/host-webapp/NOTICE modules/implementation-web-runtime/LICENSE
modules/implementation-web-runtime/NOTICE
Author: antelder
Date: Thu Apr 9 10:10:58 2009
New Revision: 763583
URL: http://svn.apache.org/viewvc?rev=763583&view=rev
Log:
Merge license changes in r763560 from m2 branch to trunk
Modified:
tuscany/java/sca/distribution/all/src/main/release/bin/LICENSE (contents, props changed)
tuscany/java/sca/modules/host-webapp/LICENSE (contents, props changed)
tuscany/java/sca/modules/host-webapp/NOTICE (contents, props changed)
tuscany/java/sca/modules/implementation-web-runtime/LICENSE (contents, props changed)
tuscany/java/sca/modules/implementation-web-runtime/NOTICE (contents, props changed)
Modified: tuscany/java/sca/distribution/all/src/main/release/bin/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/all/src/main/release/bin/LICENSE?rev=763583&r1=763582&r2=763583&view=diff
==============================================================================
--- tuscany/java/sca/distribution/all/src/main/release/bin/LICENSE (original)
+++ tuscany/java/sca/distribution/all/src/main/release/bin/LICENSE Thu Apr 9 10:10:58 2009
@@ -256,9 +256,12 @@
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 @@
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
Propchange: tuscany/java/sca/distribution/all/src/main/release/bin/LICENSE
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 9 10:10:58 2009
@@ -0,0 +1,4 @@
+/tuscany/branches/sca-equinox/distribution/all/src/main/release/bin/LICENSE:695308-714142
+/tuscany/branches/sca-java-1.3/distribution/all/src/main/release/bin/LICENSE:671193,680620-680628
+/tuscany/branches/sca-java-2.0-M2/distribution/all/src/main/release/bin/LICENSE:763560
+/tuscany/sandbox/ant/sca/branches/foo/distribution/all/src/main/release/bin/LICENSE:755273
Modified: tuscany/java/sca/modules/host-webapp/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/LICENSE?rev=763583&r1=763582&r2=763583&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-webapp/LICENSE (original)
+++ tuscany/java/sca/modules/host-webapp/LICENSE Thu Apr 9 10:10:58 2009
@@ -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,
Propchange: tuscany/java/sca/modules/host-webapp/LICENSE
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 9 10:10:58 2009
@@ -0,0 +1,4 @@
+/tuscany/branches/sca-java-1.3/modules/host-webapp/LICENSE:671193
+/tuscany/branches/sca-java-1.x/modules/host-webapp/LICENSE:713805-714043
+/tuscany/branches/sca-java-2.0-M2/modules/host-webapp/LICENSE:763560
+/tuscany/java/sca/modules/host-webapp/LICENSE:694816-713804
Modified: tuscany/java/sca/modules/host-webapp/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/NOTICE?rev=763583&r1=763582&r2=763583&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-webapp/NOTICE (original)
+++ tuscany/java/sca/modules/host-webapp/NOTICE Thu Apr 9 10:10:58 2009
@@ -4,9 +4,4 @@
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.
Propchange: tuscany/java/sca/modules/host-webapp/NOTICE
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 9 10:10:58 2009
@@ -0,0 +1,4 @@
+/tuscany/branches/sca-java-1.3/modules/host-webapp/NOTICE:671193
+/tuscany/branches/sca-java-1.x/modules/host-webapp/NOTICE:713805-714043
+/tuscany/branches/sca-java-2.0-M2/modules/host-webapp/NOTICE:763560
+/tuscany/java/sca/modules/host-webapp/NOTICE:694816-713804
Modified: tuscany/java/sca/modules/implementation-web-runtime/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web-runtime/LICENSE?rev=763583&r1=763582&r2=763583&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web-runtime/LICENSE (original)
+++ tuscany/java/sca/modules/implementation-web-runtime/LICENSE Thu Apr 9 10:10:58 2009
@@ -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,
+
Propchange: tuscany/java/sca/modules/implementation-web-runtime/LICENSE
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 9 10:10:58 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-web-runtime/LICENSE:671193
+/tuscany/branches/sca-java-2.0-M2/modules/implementation-web-runtime/LICENSE:763560
Modified: tuscany/java/sca/modules/implementation-web-runtime/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web-runtime/NOTICE?rev=763583&r1=763582&r2=763583&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web-runtime/NOTICE (original)
+++ tuscany/java/sca/modules/implementation-web-runtime/NOTICE Thu Apr 9 10:10:58 2009
@@ -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.
Propchange: tuscany/java/sca/modules/implementation-web-runtime/NOTICE
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 9 10:10:58 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-web-runtime/NOTICE:671193
+/tuscany/branches/sca-java-2.0-M2/modules/implementation-web-runtime/NOTICE:763560