License/notice/header Changes from M3 branch r787159, r787162 and r787164

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

8 files changed, 235 insertions, 3 deletions

diff --git a/java/sca/LICENSE b/java/sca/LICENSE
index 144d8ae692..ddd30126af 100644
--- a/java/sca/LICENSE
+++ b/java/sca/LICENSE
@@ -297,7 +297,7 @@ The module implementation-script temporarily includes one file under the followi
 
 =================================================================================================================
 
-The module assembly-xsd includes XSD files under the following SCA Collaboration license:
+The module assembly-xsd includes XSD files under the following license:
 
 License for the Service Component Architecture JavaDoc, Interface 
 Definition files and XSD files.
@@ -341,6 +341,94 @@ No other rights are granted by implication, estoppel or otherwise.
 Revision level 1.1, last updated on 2007/11/19
 
 =================================================================================================================
+
+The modules assembly-xsd and definitions-xml includes XSD and XML files under the following license:
+
+Copyright OASIS 2005, 2009. All Rights Reserved.
+All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual 
+Property Rights Policy (the "OASIS IPR Policy"). The full Policy may be found at the OASIS website.
+This document and translations of it may be copied and furnished to others, and derivative works that 
+comment on or otherwise explain it or assist in its implementation may be prepared, copied, published, 
+and distributed, in whole or in part, without restriction of any kind, provided that the above copyright 
+notice and this section are included on all such copies and derivative works. However, this document 
+itself may not be modified in any way, including by removing the copyright notice or references to OASIS, 
+except as needed for the purpose of developing any document or deliverable produced by an OASIS 
+Technical Committee (in which case the rules applicable to copyrights, as set forth in the OASIS IPR 
+Policy, must be followed) or as required to translate it into languages other than English.
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors 
+or assigns.
+This document and the information contained herein is provided on an "AS IS" basis and OASIS 
+DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY 
+WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP 
+RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR 
+PURPOSE.
+OASIS requests that any OASIS Party or any other party that believes it has patent claims that would 
+necessarily be infringed by implementations of this OASIS Committee Specification or OASIS Standard, 
+to notify OASIS TC Administrator and provide an indication of its willingness to grant patent licenses to 
+such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that 
+produced this specification.
+OASIS invites any party to contact the OASIS TC Administrator if it is aware of a claim of ownership of 
+any patent claims that would necessarily be infringed by implementations of this specification by a patent 
+holder that is not willing to provide a license to such patent claims in a manner consistent with the IPR 
+Mode of the OASIS Technical Committee that produced this specification. OASIS may include such 
+claims on its website, but disclaims any obligation to do so.
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that 
+might be claimed to pertain to the implementation or use of the technology described in this document or 
+the extent to which any license under such rights might or might not be available; neither does it represent 
+that it has made any effort to identify any such rights. Information on OASIS' procedures with respect to 
+rights in any document or deliverable produced by an OASIS Technical Committee can be found on the 
+OASIS website. Copies of claims of rights made available for publication and any assurances of licenses 
+to be made available, or the result of an attempt made to obtain a general license or permission for the use 
+of such proprietary rights by implementers or users of this OASIS Committee Specification or OASIS 
+Standard, can be obtained from the OASIS TC Administrator. OASIS makes no representation that any 
+information or list of intellectual property rights will at any time be complete, or that any claims in such list 
+are, in fact, Essential Claims.
+The names "OASIS",  are trademarks of OASIS, the owner and developer of this specification, and should 
+be used only to refer to the organization and its official outputs. OASIS welcomes reference to, and 
+implementation and use of, specifications, while reserving the right to enforce its marks against misleading 
+uses. Please see http://www.oasis-open.org/who/trademark.php for above guidance.
+
+=================================================================================================================
+
+The module assembly-xsd includes XSD files under the following license:
+
+http://www.w3.org/Consortium/Legal/copyright-software-19980720
+
+W3CŪ SOFTWARE NOTICE AND LICENSE
+Copyright (c) 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche 
+en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
+
+This W3C work (including software, documents, or other related items) is being provided by the copyright holders under 
+the following license. By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, 
+and will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,  
+for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies 
+of the software and documentation or portions thereof, including modifications, that you make:
+
+   1. The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+   2. Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short 
+notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed 
+or derivative code: "Copyright (c) [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of Technology, 
+Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/"
+   3. Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs 
+to the location from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, 
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE 
+OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE 
+OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software 
+without specific, written prior permission. Title to copyright in this software and any associated documentation will 
+at all times remain with copyright holders.
+
+=================================================================================================================
+
+The module assembly-xsd includes XSD files under the following license:
+
 The modules 
 
 binding-ws-xml
@@ -357,7 +445,7 @@ Include the ipo.xsd and address.xsd information from the XML Schema Primer
 (http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) combined into the 
 file ipo.xsd and extended with UK postcode structures.
 
-The ipo.xsd file is include under the following license:
+The ipo.xsd file is also included under the following license:
 
 W3C(c) SOFTWARE NOTICE AND LICENSE
 http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
diff --git a/java/sca/NOTICE b/java/sca/NOTICE
index f3d8ddc5b8..dd283ca1fd 100644
--- a/java/sca/NOTICE
+++ b/java/sca/NOTICE
@@ -21,6 +21,12 @@ Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
 Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
 2005, 2006. All rights reserved.
 
+This product includes software under the OASIS specification License
+with the following copyright:
+
+Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+OASIS trademark, IPR and other policies apply.
+
 This product includes software under the W3C(c) Software License
 with the following copyright:
     
@@ -32,4 +38,18 @@ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 
+This product includes software under the W3C(c) Software License
+with the following copyright:
+
+Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+of Technology, Institut National de Recherche en Informatique et en
+Automatique, Keio University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+This document is governed by the W3C Software License [1] as described
+in the FAQ [2].
+
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+
 
diff --git a/java/sca/distribution/all/src/main/release/launcher/README b/java/sca/distribution/all/src/main/release/launcher/README
index 3d042d0e3f..2d16a081c7 100644
--- a/java/sca/distribution/all/src/main/release/launcher/README
+++ b/java/sca/distribution/all/src/main/release/launcher/README
@@ -15,7 +15,7 @@ for help enter use the "/?" parameter, eg:
 To simplify the use of the script add the absolute file path of the bin 

 folder to your environment path:

 

-set PATH=%PATH%;\Tuscany\tuscany-sca-2.0-M1\bin

+set PATH=%PATH%;\Tuscany\tuscany-sca-2.0-M3\bin

 

 and that enables running the script by just "tuscany", for example, in the 

 implementation-java-calculator sample again you can enter:

diff --git a/java/sca/modules/assembly-xsd/LICENSE b/java/sca/modules/assembly-xsd/LICENSE
index a48d7d44cc..2ea1dcc129 100644
--- a/java/sca/modules/assembly-xsd/LICENSE
+++ b/java/sca/modules/assembly-xsd/LICENSE
@@ -298,3 +298,40 @@ The name and trademarks of copyright holders may NOT be used in advertising or p
 pertaining to the software without specific, written prior permission. Title to copyright 
 in this software and any associated documentation will at all times remain with copyright 
 holders.
+
+=============================================================================== 
+
+This module includes XSD files under the following license:
+
+http://www.w3.org/Consortium/Legal/copyright-software-19980720
+
+W3CŪ SOFTWARE NOTICE AND LICENSE
+Copyright (c) 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche 
+en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
+
+This W3C work (including software, documents, or other related items) is being provided by the copyright holders under 
+the following license. By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, 
+and will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,  
+for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies 
+of the software and documentation or portions thereof, including modifications, that you make:
+
+   1. The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+   2. Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short 
+notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed 
+or derivative code: "Copyright (c) [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of Technology, 
+Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/"
+   3. Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs 
+to the location from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, 
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE 
+OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE 
+OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software 
+without specific, written prior permission. Title to copyright in this software and any associated documentation will 
+at all times remain with copyright holders.
diff --git a/java/sca/modules/assembly-xsd/NOTICE b/java/sca/modules/assembly-xsd/NOTICE
index b5ca438931..78da9f5010 100644
--- a/java/sca/modules/assembly-xsd/NOTICE
+++ b/java/sca/modules/assembly-xsd/NOTICE
@@ -9,6 +9,7 @@ This product also includes software under the OASIS license
 copyright:
 
 Copyright (C) OASIS(R) 2005, 2009. All Rights Reserved.
+OASIS trademark, IPR and other policies apply.
 
 This product also includes software under the W3C(r) Software License
 (see the LICENSE file contained in this distribution), with the following
@@ -21,3 +22,17 @@ in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the i
 warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
     [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This product also includes software under the W3C(c) Software License
+with the following copyright:
+
+Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+of Technology, Institut National de Recherche en Informatique et en
+Automatique, Keio University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+This document is governed by the W3C Software License [1] as described
+in the FAQ [2].
+
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
index 54554bcc4e..726f933d84 100644
--- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
+++ b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.tuscany.sca.contribution.java.impl;
 
 import java.io.File;
diff --git a/java/sca/modules/definitions-xml/LICENSE b/java/sca/modules/definitions-xml/LICENSE
index 6e529a25c4..9100141e4e 100644
--- a/java/sca/modules/definitions-xml/LICENSE
+++ b/java/sca/modules/definitions-xml/LICENSE
@@ -201,5 +201,53 @@
    See the License for the specific language governing permissions and

    limitations under the License.

 

+=================================================================================================================

+

+This module also includes files under the following license:

+

+Copyright OASIS 2005, 2009. All Rights Reserved.

+All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual 

+Property Rights Policy (the "OASIS IPR Policy"). The full Policy may be found at the OASIS website.

+This document and translations of it may be copied and furnished to others, and derivative works that 

+comment on or otherwise explain it or assist in its implementation may be prepared, copied, published, 

+and distributed, in whole or in part, without restriction of any kind, provided that the above copyright 

+notice and this section are included on all such copies and derivative works. However, this document 

+itself may not be modified in any way, including by removing the copyright notice or references to OASIS, 

+except as needed for the purpose of developing any document or deliverable produced by an OASIS 

+Technical Committee (in which case the rules applicable to copyrights, as set forth in the OASIS IPR 

+Policy, must be followed) or as required to translate it into languages other than English.

+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors 

+or assigns.

+This document and the information contained herein is provided on an "AS IS" basis and OASIS 

+DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY 

+WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP 

+RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR 

+PURPOSE.

+OASIS requests that any OASIS Party or any other party that believes it has patent claims that would 

+necessarily be infringed by implementations of this OASIS Committee Specification or OASIS Standard, 

+to notify OASIS TC Administrator and provide an indication of its willingness to grant patent licenses to 

+such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that 

+produced this specification.

+OASIS invites any party to contact the OASIS TC Administrator if it is aware of a claim of ownership of 

+any patent claims that would necessarily be infringed by implementations of this specification by a patent 

+holder that is not willing to provide a license to such patent claims in a manner consistent with the IPR 

+Mode of the OASIS Technical Committee that produced this specification. OASIS may include such 

+claims on its website, but disclaims any obligation to do so.

+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that 

+might be claimed to pertain to the implementation or use of the technology described in this document or 

+the extent to which any license under such rights might or might not be available; neither does it represent 

+that it has made any effort to identify any such rights. Information on OASIS' procedures with respect to 

+rights in any document or deliverable produced by an OASIS Technical Committee can be found on the 

+OASIS website. Copies of claims of rights made available for publication and any assurances of licenses 

+to be made available, or the result of an attempt made to obtain a general license or permission for the use 

+of such proprietary rights by implementers or users of this OASIS Committee Specification or OASIS 

+Standard, can be obtained from the OASIS TC Administrator. OASIS makes no representation that any 

+information or list of intellectual property rights will at any time be complete, or that any claims in such list 

+are, in fact, Essential Claims.

+The names "OASIS",  are trademarks of OASIS, the owner and developer of this specification, and should 

+be used only to refer to the organization and its official outputs. OASIS welcomes reference to, and 

+implementation and use of, specifications, while reserving the right to enforce its marks against misleading 

+uses. Please see http://www.oasis-open.org/who/trademark.php for above guidance.

+

 

 

diff --git a/java/sca/modules/definitions-xml/NOTICE b/java/sca/modules/definitions-xml/NOTICE
index 51042eab05..bc1a8c6d74 100644
--- a/java/sca/modules/definitions-xml/NOTICE
+++ b/java/sca/modules/definitions-xml/NOTICE
@@ -4,3 +4,9 @@ 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 OASIS specification License

+with the following copyright:

+

+Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 

+OASIS trademark, IPR and other policies apply.

+