From 3d69118e476985dd5c6e1101a78005b7ee0505bb Mon Sep 17 00:00:00 2001 From: nash Date: Fri, 21 May 2010 09:25:00 +0000 Subject: Update NOTICE and LICENSE files git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946944 13f79535-47bb-0310-9956-ffa450edef68 --- .../distribution/src/main/release/LICENSE | 68 +++++++++--------- .../distribution/src/main/release/NOTICE | 80 ---------------------- 2 files changed, 37 insertions(+), 111 deletions(-) diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/LICENSE b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/LICENSE index 32a5914686..90394d2117 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/LICENSE +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/LICENSE @@ -203,44 +203,46 @@ =============================================================================== -APACHE TUSCANY SCA TRAVEL SAMPLE SUBCOMPONENTS: +APACHE TUSCANY SCA TRAVEL SAMPLE REDISTRIBUTED FILES: The Apache Tuscany SCA Travel Sample distribution includes a number of -subcomponents with separate copyright notices and license terms. Your use -of the code for the these subcomponents is subject to the terms and -conditions of the following licenses. +redistributed files with separate copyright notices and license terms. +Your use of these redistributed files is subject to the terms and conditions +of the following licenses. =============================================================================== -The following components come under Apache Software License 2.0 - -commons-cli-1.1.jar -commons-dbcp-all-1.3-r699049.jar -ejb31-api-experimental-3.1.2.jar -geronimo-transaction-2.1.jar -javaee-api-5.0-2.jar -openejb-api-3.1.2.jar -openejb-client-3.1.2.jar -openejb-core-3.1.2.jar -openejb-ejbd-3.1.2.jar -openejb-javaagent-3.1.2.jar -openejb-jee-3.1.2.jar -openejb-loader-3.1.2.jar -openejb-server-3.1.2.jar -xbean-asm-shaded-3.6.jar -xbean-finder-shaded-3.6.jar -xbean-reflect-3.6.jar +The following files come under Apache Software License 2.0: + commons-cli-1.1.jar + commons-dbcp-all-1.3-r699049.jar + ejb31-api-experimental-3.1.2.jar + geronimo-transaction-2.1.jar + javaee-api-5.0-2.jar + openejb-api-3.1.2.jar + openejb-client-3.1.2.jar + openejb-core-3.1.2.jar + openejb-ejbd-3.1.2.jar + openejb-javaagent-3.1.2.jar + openejb-jee-3.1.2.jar + openejb-loader-3.1.2.jar + openejb-server-3.1.2.jar + xbean-asm-shaded-3.6.jar + xbean-finder-shaded-3.6.jar + xbean-reflect-3.6.jar =============================================================================== -The jars; -http-20070405.jar, -jaxws-rt-2.1.7.jar, -jaxws-tools-2.1.7.jar, -saaj-api-1.3.jar, -saaj-impl-1.3.3.jar, -stax-ex-1.2.jar, -streambuffer-0.9.jar +The files: + http-20070405.jar, + jaxws-rt-2.1.7.jar, + jaxws-tools-2.1.7.jar, + saaj-api-1.3.jar, + saaj-impl-1.3.3.jar, + stax-ex-1.2.jar, + streambuffer-0.9.jar +are redistributed in executable form, with source code available at + https://jax-ws-sources.dev.java.net/source/browse/jax-ws-sources/ +and are licensed under the following terms: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -629,7 +631,11 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 =============================================================================== -JUnit (junit-4.5.jar): +The file: + junit-4.5.jar +is redistributed in object code form, with source code available at + http://sourceforge.net/projects/junit/files/ +and is licensed under the following terms: Common Public License - v 1.0 diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/NOTICE b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/NOTICE index df749725fd..5346498b7c 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/NOTICE +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/release/NOTICE @@ -3,83 +3,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation This product includes/uses software developed at The Apache Software Foundation (http://www.apache.org/). - -This product includes/uses JSON-RPC-Java (http://oss.metaparadigm.com/jsonrpc/) - -This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) - Copyright (c) 2003-2004 Jan-Klaas Kollhof - Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd -This product includes/uses Axion : the Open Source Java Database (http://axion.tigris.org/) - Copyright (c) 2002-2003 Axion Development Team. All rights reserved. - -This product includes/uses XmlSchema developed at -The Apache Software Foundation (http://ws.apache.org/commons/XmlSchema) - Portions Copyright 2006 International Business Machines Corp. - -This product includes/uses the Jetty Servlet Engine (http://jetty.mortbay.org), -developed by Mort Bay Consulting (http://www.mortbay.com) - -This product includes/uses DOM4J : the flexible XML framework for java (http://www.dom4j.org/) - Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved. - -This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net) -License: Public Domain - -This product includes/uses javacc (https://javacc.dev.java.net/) - Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved. - -This product includes/uses software from the GlassFish project (https://glassfish.dev.java.net/) - Copyright (c) 2006, Sun Microsystems, Inc. - -This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/) - -This product includes/uses JDOM (http://www.jdom.org/) - Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved. - -This product includes/uses javacc (https://javacc.dev.java.net/) - Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved. - -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. - -This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license: - Copyright (c) 2002, A. Abram White. All rights reserved. - -This product also includes/uses software under the BSD license -with the following copyright: - Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved. - -The Program includes/uses all or portions of the following software: "The -Saxon XSLT and XQuery Processor from Saxonica Limited" distributed under -an MPL v1.0 license. Please refer to the homepage URL at -http://www.saxonica.com/. - -This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license: - Copyright (c) 2002, A. Abram White. All rights reserved. - -This product also includes/uses "OSGi Materials." - Copyright (c) 2000, 2006 - OSGi Alliance Bishop Ranch 6 - 2400 Camino Ramon, Suite 375 - San Ramon, CA 94583 USA - All Rights Reserved. - -This product includes/uses software under the Service Component Architecture JavaDoc, -Interface Definition files and XSD files license. - (c) Copyright SCA Collaboration 2006, 2007 - -This product includes/uses software under the Service Data Objects JavaDoc and -Interface Definition file license - -(c) Copyright BEA Systems, Inc., International Business Machines Corporation, -Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., -Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, -2005, 2006. All rights reserved. - -This product includes/uses software under the OASIS license -Copyright (C) OASIS(R) 2005, 2010. All Rights Reserved. - -This product includes/uses JUnit (http://www.junit.org/) -- cgit v1.2.3