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

2 files changed, 52 insertions, 0 deletions

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