diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-02 21:27:11 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-02 21:27:11 +0000 |
| commit | 75d0f6c142c6b8bfd6f6de8d4919ea4b70921542 (patch) | |
| tree | 6979856dfed7f91c71759b233ee3db524677cbdf /sca-java-1.x/trunk/modules/web-javascript-dojo | |
| parent | 82559b1bbb5f3a5e093f21fd59392e7cacd29e16 (diff) | |
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
Diffstat (limited to 'sca-java-1.x/trunk/modules/web-javascript-dojo')
| -rw-r--r-- | sca-java-1.x/trunk/modules/web-javascript-dojo/LICENSE | 14 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/modules/web-javascript-dojo/NOTICE | 5 |
2 files changed, 12 insertions, 7 deletions
diff --git a/sca-java-1.x/trunk/modules/web-javascript-dojo/LICENSE b/sca-java-1.x/trunk/modules/web-javascript-dojo/LICENSE index 422e5f7033..8b6be3373a 100644 --- a/sca-java-1.x/trunk/modules/web-javascript-dojo/LICENSE +++ b/sca-java-1.x/trunk/modules/web-javascript-dojo/LICENSE @@ -202,9 +202,19 @@ limitations under the License. -========================================================================== +================================================================================ + +APACHE TUSCANY SCA SUBCOMPONENTS: + +Apache Tuscany SCA for Java includes a number of subcomponents with +separate copyright notices and license terms. Your use of these subcomponents +is subject to the terms and conditions of the following licenses. + +================================================================================ -dojotoolkit V1.3.0: +This module web-javascript-dojo includes a redistribution of + dojotoolkit V1.3.0 +under the following copyright and license: The "New" BSD License: ********************** diff --git a/sca-java-1.x/trunk/modules/web-javascript-dojo/NOTICE b/sca-java-1.x/trunk/modules/web-javascript-dojo/NOTICE index 55cb8b86a8..ad2ba40961 100644 --- a/sca-java-1.x/trunk/modules/web-javascript-dojo/NOTICE +++ b/sca-java-1.x/trunk/modules/web-javascript-dojo/NOTICE @@ -4,8 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). -This product includes dojotoolkit files (http://dojotoolkit.org/) under the -"New" BSD License (see the LICENSE file contained in this distribution) under the -following copyright - Copyright (c) 2005, The Dojo Foundation. All rights reserved. - |