Merge r1030212 TUSCANY-3764: Fix problems and inconsistencies in LICENSE and NOTICE files

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

2 files changed, 37 insertions, 37 deletions

diff --git a/sca-java-1.x/trunk/distribution/src/main/release/bin/LICENSE b/sca-java-1.x/trunk/distribution/src/main/release/bin/LICENSE
index a7797760b0..7f2c190189 100644
--- a/sca-java-1.x/trunk/distribution/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/trunk/distribution/src/main/release/bin/LICENSE
@@ -424,7 +424,42 @@ include the file jsonrpc.js which is under the following copyright and license:
  * - JSONRpcClient_createMethod changed so callback is last arg
  */
 
-===============================================================================
+=================================================================================
+
+The tuscany-web-javascript-dojo and demo-bigbank jars include a redistribution of
+ dojotoolkit V1.3.0
+under the following copyright and license:
+
+The "New" BSD License:
+**********************
+
+Copyright (c) 2005, The Dojo Foundation
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+  * Neither the name of the Dojo Foundation nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=================================================================================
 
 APACHE TUSCANY SCA REDISTRIBUTED FILES: 
 
@@ -2458,41 +2493,6 @@ is redistributed in executable form and is licensed under the following terms:
 * limitations under the License.
 */
 
-==========================================================================
-
-The file:
- dojotoolkit V1.3.0
-is redistributed in executable form and is licensed under the following terms:
-
-The "New" BSD License:
-**********************
-
-Copyright (c) 2005, The Dojo Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-	list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-	this list of conditions and the following disclaimer in the documentation
-	and/or other materials provided with the distribution.
-  * Neither the name of the Dojo Foundation nor the names of its contributors
-	may be used to endorse or promote products derived from this software
-	without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 ================================================================================
 
 The file:
diff --git a/sca-java-1.x/trunk/distribution/src/main/release/src/LICENSE b/sca-java-1.x/trunk/distribution/src/main/release/src/LICENSE
index fbdea79bbe..a0ab15a279 100644
--- a/sca-java-1.x/trunk/distribution/src/main/release/src/LICENSE
+++ b/sca-java-1.x/trunk/distribution/src/main/release/src/LICENSE
@@ -367,7 +367,7 @@ includes the file wsdli.xsd from http://www.w3.org/2004/08/wsdl-instance
 
 The ipo.xsd and wsdli.xsd files are included under the following license:
 
-Copyright (c) 2008 World Wide Web Consortium, (Massachusetts Institute of Technology, 
+Copyright (c) 2004 World Wide Web Consortium, (Massachusetts Institute of Technology, 
 European Research Consortium for Informatics and Mathematics, Keio University). 
 All Rights Reserved. This work is distributed under the W3C(c) Software License [1] in 
 the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied