Updates to license and notice files

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

2 files changed, 39 insertions, 4 deletions

diff --git a/branches/sca-java-1.3/distribution/src/main/release/bin/LICENSE b/branches/sca-java-1.3/distribution/src/main/release/bin/LICENSE
index fae34e6a78..8e860f0e10 100644
--- a/branches/sca-java-1.3/distribution/src/main/release/bin/LICENSE
+++ b/branches/sca-java-1.3/distribution/src/main/release/bin/LICENSE
@@ -248,7 +248,6 @@ The following components come under Apache Software License 2.0
  commons-lang-2.1.jar
  commons-logging-1.1.jar
  derby-10.3.1.4.jar
- geronimo-activation_1.1_spec-1.1.jar
  geronimo-common-1.2-beta.jar
  geronimo-commonj_1.1_spec-1.0.jar
  geronimo-connector-1.2-beta.jar
@@ -1487,9 +1486,8 @@ jaxb2-reflection-2.1.4.jar,
 jsr181-api-1.0-MR1.jar, 
 jsr250-api-1.0.jar, 
 jaxws-api-2.1.jar, 
-mail-1.4.jar, 
 servlet-api-2.5.jar, 
-stax-api-1.0-commons-cli-1.0.jar2.jar
+stax-api-1.0-2.jar
 
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 
@@ -2294,7 +2292,7 @@ No other rights are granted by implication, estoppel or otherwise.
 Revision level 1.1, last updated on 2007/11/19
 
 ================================================================================
-License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
+License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.1-incubating.jar)
 
 These files being ...
 commonj/sdo/ChangeSummary$Setting.class
@@ -2392,3 +2390,38 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 THE POSSIBILITY OF SUCH DAMAGE.
 
 ================================================================================
+
+The jaxen-1.1.1.jar:
+
+ $Id: LICENSE.txt,v 1.5 2006/02/05 21:49:04 elharo Exp $
+
+ Copyright 2003-2006 The Werken Company. 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 Jaxen Project 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.
+
+================================================================================
diff --git a/branches/sca-java-1.3/distribution/src/main/release/bin/NOTICE b/branches/sca-java-1.3/distribution/src/main/release/bin/NOTICE
index 0325a840ac..707ccc6632 100644
--- a/branches/sca-java-1.3/distribution/src/main/release/bin/NOTICE
+++ b/branches/sca-java-1.3/distribution/src/main/release/bin/NOTICE
@@ -97,3 +97,5 @@ This product includes/uses ASM (http://asm.objectweb.org)
    Copyright (c) 2000-2005 INRIA, France Telecom
    All rights reserved.
 
+This product includes/uses Jaxen (http://jaxen.codehaus.org/)
+   Copyright 2003-2006 The Werken Company. All Rights Reserved.