Update tomcat distro license for recent changes

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

1 files changed, 3 insertions, 43 deletions

diff --git a/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE b/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
index 7d66c3d6cc..50515f4143 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
+++ b/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
@@ -214,14 +214,9 @@ conditions of the following licenses.
 ===============================================================================

 

 The following components come under Apache Software License 2.0

-
- axiom-api-1.2.8.jar
- axiom-impl-1.2.8.jar

+

  cglib-2.2.jar

- commons-logging-api-1.1.jar
- commons-logging-1.1.1.jar
- geronimo-activation_1.1_spec-1.0.1.jar
- geronimo-javamail_1.4_spec-1.2.jar

+ commons-logging-api-1.1.jar

  hazelcast-1.8.3.jar

  hazelcast-client-1.8.3.jar

  swizzle-stream-1.0.2.jar

@@ -229,41 +224,6 @@ The following components come under Apache Software License 2.0
 

 ===============================================================================

 

-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.

-

-================================================================================

-

 WSDL4j (wsdl4j-1.6.2.jar):

 

 Common Public License - v 1.0

@@ -390,7 +350,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
 

 ================================================================================

 

-The tuscany-assembly-xsd-osoa jar includes XSD files under the following SCA Collaboration license:

+The tuscany-base jar includes XSD files under the following SCA Collaboration license:

 

 License for the Service Component Architecture JavaDoc, Interface 

 Definition files and XSD files.