svn commit: r673996 - in /tuscany/java/sca/distribution/src/main/release/bin: LICENSE NOTICE

[an...@apache.org]

Author: antelder
Date: Fri Jul  4 03:37:22 2008
New Revision: 673996

URL: http://svn.apache.org/viewvc?rev=673996&view=rev
Log:
Merge ASM legal from 1.3 branch to trunk

Modified:
    tuscany/java/sca/distribution/src/main/release/bin/LICENSE
    tuscany/java/sca/distribution/src/main/release/bin/NOTICE

Modified: tuscany/java/sca/distribution/src/main/release/bin/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/src/main/release/bin/LICENSE?rev=673996&r1=673995&r2=673996&view=diff
==============================================================================
--- tuscany/java/sca/distribution/src/main/release/bin/LICENSE (original)
+++ tuscany/java/sca/distribution/src/main/release/bin/LICENSE Fri Jul  4 03:37:22 2008
@@ -2359,4 +2359,38 @@
 No other rights are granted by implication, estoppel or otherwise.
 ================================================================================
 
+The asm-all-3.1.jar:
+
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. 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.
+
+3. Neither the name of the copyright holders 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.
+
+================================================================================
+
 

Modified: tuscany/java/sca/distribution/src/main/release/bin/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/src/main/release/bin/NOTICE?rev=673996&r1=673995&r2=673996&view=diff
==============================================================================
--- tuscany/java/sca/distribution/src/main/release/bin/NOTICE (original)
+++ tuscany/java/sca/distribution/src/main/release/bin/NOTICE Fri Jul  4 03:37:22 2008
@@ -93,3 +93,7 @@
 Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
 2005, 2006. All rights reserved.
 
+This product includes/uses ASM (http://asm.objectweb.org)
+   Copyright (c) 2000-2005 INRIA, France Telecom
+   All rights reserved.
+