Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D48E6EC4D for ; Fri, 7 Dec 2012 15:13:24 +0000 (UTC) Received: (qmail 55334 invoked by uid 500); 7 Dec 2012 15:13:24 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 55063 invoked by uid 500); 7 Dec 2012 15:13:22 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 54795 invoked by uid 99); 7 Dec 2012 15:13:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Dec 2012 15:13:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Dec 2012 15:13:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EB6D523888EA; Fri, 7 Dec 2012 15:12:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1418352 - in /airavata/trunk/modules/distribution: airavata-client/src/main/resources/ airavata-server/src/main/resources/ xbaya-gui/src/main/resources/ Date: Fri, 07 Dec 2012 15:12:51 -0000 To: commits@airavata.apache.org From: smarru@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121207151252.EB6D523888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: smarru Date: Fri Dec 7 15:12:48 2012 New Revision: 1418352 URL: http://svn.apache.org/viewvc?rev=1418352&view=rev Log: Initial stab at updating L&N files. Still needs more verification. Modified: airavata/trunk/modules/distribution/airavata-client/src/main/resources/LICENSE airavata/trunk/modules/distribution/airavata-client/src/main/resources/NOTICE airavata/trunk/modules/distribution/airavata-server/src/main/resources/LICENSE airavata/trunk/modules/distribution/airavata-server/src/main/resources/NOTICE airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/LICENSE airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/NOTICE Modified: airavata/trunk/modules/distribution/airavata-client/src/main/resources/LICENSE URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/resources/LICENSE?rev=1418352&r1=1418351&r2=1418352&view=diff ============================================================================== --- airavata/trunk/modules/distribution/airavata-client/src/main/resources/LICENSE (original) +++ airavata/trunk/modules/distribution/airavata-client/src/main/resources/LICENSE Fri Dec 7 15:12:48 2012 @@ -210,29 +210,15 @@ code for Airavata is subject to the term The following components come under Apache Software License 2.0 =============================================================================== -bcel-5.1.jar, commons-codec-1.2.jar, httpcore-4.0.jar, jets3t-0.8.0.jar, -jettison-1.0-RC2.jar, neethi-2.0.4.jar, PDFBox libraries (pdfbox, jempbox, fontbox) -aws-java-sdk-1.1.8.jar, apache geronimo, apache commons, apache axis2, apache jackrabbit +apache axiom, apache axis2, apache commons, apache derby, apache geronimo, +apache httpcore components, apache log4j, apache xmlbeans, apache xmlschema, +aws-java-sdk-1.1.8.jar, bcel-5.1.jar, jets3t-0.8.0.jar, jettison-1.0-RC2.jar, +neethi-2.0.4.jar, PDFBox libraries (pdfbox, jempbox, fontbox), wstx-asl-3.2.4.jar =============================================================================== The following components use Apache based Licenses =============================================================================== -For: wstx-asl-3.2.4.jar - Containing Project URL: http://woodstox.codehaus.org/ - -This copy of Woodstox XML processor is licensed under the -Apache (Software) License, version 2.0 ("the License"). -See the License for details about distribution rights, and the -specific rights regarding derivate works. - -You may obtain a copy of the License at: - -http://www.apache.org/licenses/ - -A copy is also included in the downloadable source code package -containing Woodstox, in file "ASL2.0", under the same directory -as this file. =============================================================================== For: jdom-1.0.jar @@ -1162,66 +1148,6 @@ Last revised $Id: copyright-software-200 ========================================================================================== -XPath parser (jackrabbit-spi-commons) - Containing Project URL: - - XPath 2.0/XQuery 1.0 Parser: - http://www.w3.org/2002/11/xquery-xpath-applets/xgrammar.zip - - Copyright (C) 2002 World Wide Web Consortium, (Massachusetts Institute of - Technology, European Research Consortium for Informatics and Mathematics, - Keio University). All Rights Reserved. - - This work is distributed under the W3C(R) Software License in the hope - that it will be useful, but WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - W3C(R) SOFTWARE NOTICE AND LICENSE - http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 - - This work (and included software, documentation such as READMEs, or - other related items) is being provided by the copyright holders under - the following license. By obtaining, using and/or copying this work, - you (the licensee) agree that you have read, understood, and will comply - with the following terms and conditions. - - Permission to copy, modify, and distribute this software and its - documentation, with or without modification, for any purpose and - without fee or royalty is hereby granted, provided that you include - the following on ALL copies of the software and documentation or - portions thereof, including modifications: - - 1. The full text of this NOTICE in a location viewable to users - of the redistributed or derivative work. - - 2. Any pre-existing intellectual property disclaimers, notices, - or terms and conditions. If none exist, the W3C Software Short - Notice should be included (hypertext is preferred, text is - permitted) within the body of any redistributed or derivative code. - - 3. Notice of any changes or modifications to the files, including - the date changes were made. (We recommend you provide URIs to the - location from which the code is derived.) - - THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT - HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, - INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS - FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR - DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, - TRADEMARKS OR OTHER RIGHTS. - - COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL - OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR - DOCUMENTATION. - - The name and trademarks of copyright holders may NOT be used in - advertising or publicity pertaining to the software without specific, - written prior permission. Title to copyright in this software and - any associated documentation will at all times remain with - copyright holders. - -============================================================================== - XML API library, org.w3c classes (xml-apis) Containing Project URL: Modified: airavata/trunk/modules/distribution/airavata-client/src/main/resources/NOTICE URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/resources/NOTICE?rev=1418352&r1=1418351&r2=1418352&view=diff ============================================================================== --- airavata/trunk/modules/distribution/airavata-client/src/main/resources/NOTICE (original) +++ airavata/trunk/modules/distribution/airavata-client/src/main/resources/NOTICE Fri Dec 7 15:12:48 2012 @@ -4,34 +4,7 @@ Copyright 2012 The Apache Software Found This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -=========================================================================== -Apache Jackrabbit Notice: - -Based on source code originally developed by -Day Software (http://www.day.com/). - -This product includes software from the following contributions: - -Original BZip2 classes contributed by Keiron Liddle -, Aftex Software to the Apache Ant project - -Original Tar classes from contributors of the Apache Ant project - -Original Zip classes from contributors of the Apache Ant project - -Original CPIO classes contributed by Markus Kuss and the jRPM project -(jrpm.sourceforge.net) - -The JDBC apis for small devices and JDBC3 (under java/stubs/jsr169 and -java/stubs/jdbc3) were produced by trimming sources supplied by the -Apache Harmony project. The following notice covers the Harmony sources: - - Portions of Harmony were originally developed by - Intel Corporation and are licensed to the Apache Software - Foundation under the "Software Grant and Corporate Contribution - License Agreement", informally known as the "Intel Harmony CLA". - -========================================================================= +=============================================================================== Apache Xerces Java Notice: Portions of this software were originally based on the following: @@ -184,3 +157,7 @@ The source code is available at: OpenJPA includes software written by Miroslav Nachev OpenJPA uses test code written by Charles Tillman. ================================================================================================ +Apache XmlSchema Notice: + +Portions Copyright 2006 International Business Machines Corp. +================================================================================================ Modified: airavata/trunk/modules/distribution/airavata-server/src/main/resources/LICENSE URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/resources/LICENSE?rev=1418352&r1=1418351&r2=1418352&view=diff ============================================================================== --- airavata/trunk/modules/distribution/airavata-server/src/main/resources/LICENSE (original) +++ airavata/trunk/modules/distribution/airavata-server/src/main/resources/LICENSE Fri Dec 7 15:12:48 2012 @@ -210,31 +210,16 @@ code for Airavata is subject to the term The following components come under Apache Software License 2.0 =============================================================================== -bcel-5.1.jar, commons-codec-1.2.jar, httpcore-4.0.jar, jets3t-0.8.0.jar, -jettison-1.0-RC2.jar, neethi-2.0.4.jar, PDFBox libraries (pdfbox, jempbox, fontbox) -aws-java-sdk-1.1.8.jar, apache geronimo, apache commons, apache axis2, apache jackrabbit +apache axiom, apache axis2, apache commons, apache derby, apache geronimo, +apache httpcore components, apache log4j, apache xmlbeans, apache xmlschema, +aws-java-sdk-1.1.8.jar, bcel-5.1.jar, jets3t-0.8.0.jar, jettison-1.0-RC2.jar, +neethi-2.0.4.jar, PDFBox libraries (pdfbox, jempbox, fontbox), wstx-asl-3.2.4.jar =============================================================================== The following components use Apache based Licenses =============================================================================== -For: wstx-asl-3.2.4.jar - Containing Project URL: http://woodstox.codehaus.org/ - -This copy of Woodstox XML processor is licensed under the -Apache (Software) License, version 2.0 ("the License"). -See the License for details about distribution rights, and the -specific rights regarding derivate works. - -You may obtain a copy of the License at: - -http://www.apache.org/licenses/ - -A copy is also included in the downloadable source code package -containing Woodstox, in file "ASL2.0", under the same directory -as this file. =============================================================================== - For: jdom-1.0.jar Containing Project URL: http://www.jdom.org/ /*-- @@ -559,8 +544,14 @@ The following components are CDDL based For activation-1.1.jar, jaxb-api-2.1.jar, mail-1.4.jar, junit, Servlet Specification 2.5 API (servlet-api-2.5-6.1.14.jar), -Classfish Jasper API (jsp-api-2.1-6.1.14.jar), and +Classfish Jasper API (jsp-api-2.1-6.1.14.jar), jersey-client-1.13.jar +jersey-core-1.13.jar, jersey-json-1.13.jar, jersey-multipart-1.13.jar +jersey-server-1.13.jar, jersey-servlet-1.13.jar and JSP2.1 Jasper implementation from Glassfish (jsp-2.1-6.1.14.jar): + +NOTE: jersey is dual licensed (http://jersey.java.net/CDDL+GPL.html), +Apahce Airavata elects to include jersey in this distribution under the +[CDDLv_1.0] license. COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -1162,66 +1153,6 @@ Last revised $Id: copyright-software-200 ========================================================================================== -XPath parser (jackrabbit-spi-commons) - Containing Project URL: - - XPath 2.0/XQuery 1.0 Parser: - http://www.w3.org/2002/11/xquery-xpath-applets/xgrammar.zip - - Copyright (C) 2002 World Wide Web Consortium, (Massachusetts Institute of - Technology, European Research Consortium for Informatics and Mathematics, - Keio University). All Rights Reserved. - - This work is distributed under the W3C(R) Software License in the hope - that it will be useful, but WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - W3C(R) SOFTWARE NOTICE AND LICENSE - http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 - - This work (and included software, documentation such as READMEs, or - other related items) is being provided by the copyright holders under - the following license. By obtaining, using and/or copying this work, - you (the licensee) agree that you have read, understood, and will comply - with the following terms and conditions. - - Permission to copy, modify, and distribute this software and its - documentation, with or without modification, for any purpose and - without fee or royalty is hereby granted, provided that you include - the following on ALL copies of the software and documentation or - portions thereof, including modifications: - - 1. The full text of this NOTICE in a location viewable to users - of the redistributed or derivative work. - - 2. Any pre-existing intellectual property disclaimers, notices, - or terms and conditions. If none exist, the W3C Software Short - Notice should be included (hypertext is preferred, text is - permitted) within the body of any redistributed or derivative code. - - 3. Notice of any changes or modifications to the files, including - the date changes were made. (We recommend you provide URIs to the - location from which the code is derived.) - - THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT - HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, - INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS - FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR - DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, - TRADEMARKS OR OTHER RIGHTS. - - COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL - OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR - DOCUMENTATION. - - The name and trademarks of copyright holders may NOT be used in - advertising or publicity pertaining to the software without specific, - written prior permission. Title to copyright in this software and - any associated documentation will at all times remain with - copyright holders. - -============================================================================== - XML API library, org.w3c classes (xml-apis) Containing Project URL: Modified: airavata/trunk/modules/distribution/airavata-server/src/main/resources/NOTICE URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/resources/NOTICE?rev=1418352&r1=1418351&r2=1418352&view=diff ============================================================================== --- airavata/trunk/modules/distribution/airavata-server/src/main/resources/NOTICE (original) +++ airavata/trunk/modules/distribution/airavata-server/src/main/resources/NOTICE Fri Dec 7 15:12:48 2012 @@ -4,34 +4,7 @@ Copyright 2012 The Apache Software Found This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -=========================================================================== -Apache Jackrabbit Notice: - -Based on source code originally developed by -Day Software (http://www.day.com/). - -This product includes software from the following contributions: - -Original BZip2 classes contributed by Keiron Liddle -, Aftex Software to the Apache Ant project - -Original Tar classes from contributors of the Apache Ant project - -Original Zip classes from contributors of the Apache Ant project - -Original CPIO classes contributed by Markus Kuss and the jRPM project -(jrpm.sourceforge.net) - -The JDBC apis for small devices and JDBC3 (under java/stubs/jsr169 and -java/stubs/jdbc3) were produced by trimming sources supplied by the -Apache Harmony project. The following notice covers the Harmony sources: - - Portions of Harmony were originally developed by - Intel Corporation and are licensed to the Apache Software - Foundation under the "Software Grant and Corporate Contribution - License Agreement", informally known as the "Intel Harmony CLA". - -========================================================================= +=============================================================================== Apache Xerces Java Notice: Portions of this software were originally based on the following: @@ -184,3 +157,7 @@ The source code is available at: OpenJPA includes software written by Miroslav Nachev OpenJPA uses test code written by Charles Tillman. ================================================================================================ +Apache XmlSchema Notice: + +Portions Copyright 2006 International Business Machines Corp. +================================================================================================ \ No newline at end of file Modified: airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/LICENSE URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/LICENSE?rev=1418352&r1=1418351&r2=1418352&view=diff ============================================================================== --- airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/LICENSE (original) +++ airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/LICENSE Fri Dec 7 15:12:48 2012 @@ -203,38 +203,23 @@ =================================================================================== The Apache Airavata distribution includes a number of run time dependencies with separate copyright notices and license terms. Your use of the -code for Airavata is subject to the terms and conditions of the following licenses. +Apache Airavata code is subject to the terms and conditions of the following licenses. =================================================================================== =============================================================================== The following components come under Apache Software License 2.0 =============================================================================== -bcel-5.1.jar, commons-codec-1.2.jar, httpcore-4.0.jar, jets3t-0.8.0.jar, -jettison-1.0-RC2.jar, neethi-2.0.4.jar, PDFBox libraries (pdfbox, jempbox, fontbox) -aws-java-sdk-1.1.8.jar, apache geronimo, apache commons, apache axis2, apache jackrabbit +apache axiom, apache axis2, apache commons, apache derby, apache geronimo, +apache httpcore components, apache log4j, apache xmlbeans, apache xmlschema, +aws-java-sdk-1.1.8.jar, bcel-5.1.jar, jets3t-0.8.0.jar, jettison-1.0-RC2.jar, +neethi-2.0.4.jar, PDFBox libraries (pdfbox, jempbox, fontbox), wstx-asl-3.2.4.jar =============================================================================== The following components use Apache based Licenses =============================================================================== -For: wstx-asl-3.2.4.jar - Containing Project URL: http://woodstox.codehaus.org/ - -This copy of Woodstox XML processor is licensed under the -Apache (Software) License, version 2.0 ("the License"). -See the License for details about distribution rights, and the -specific rights regarding derivate works. - -You may obtain a copy of the License at: - -http://www.apache.org/licenses/ - -A copy is also included in the downloadable source code package -containing Woodstox, in file "ASL2.0", under the same directory -as this file. =============================================================================== - For: jdom-1.0.jar Containing Project URL: http://www.jdom.org/ /*-- @@ -1162,66 +1147,6 @@ Last revised $Id: copyright-software-200 ========================================================================================== -XPath parser (jackrabbit-spi-commons) - Containing Project URL: - - XPath 2.0/XQuery 1.0 Parser: - http://www.w3.org/2002/11/xquery-xpath-applets/xgrammar.zip - - Copyright (C) 2002 World Wide Web Consortium, (Massachusetts Institute of - Technology, European Research Consortium for Informatics and Mathematics, - Keio University). All Rights Reserved. - - This work is distributed under the W3C(R) Software License in the hope - that it will be useful, but WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - W3C(R) SOFTWARE NOTICE AND LICENSE - http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 - - This work (and included software, documentation such as READMEs, or - other related items) is being provided by the copyright holders under - the following license. By obtaining, using and/or copying this work, - you (the licensee) agree that you have read, understood, and will comply - with the following terms and conditions. - - Permission to copy, modify, and distribute this software and its - documentation, with or without modification, for any purpose and - without fee or royalty is hereby granted, provided that you include - the following on ALL copies of the software and documentation or - portions thereof, including modifications: - - 1. The full text of this NOTICE in a location viewable to users - of the redistributed or derivative work. - - 2. Any pre-existing intellectual property disclaimers, notices, - or terms and conditions. If none exist, the W3C Software Short - Notice should be included (hypertext is preferred, text is - permitted) within the body of any redistributed or derivative code. - - 3. Notice of any changes or modifications to the files, including - the date changes were made. (We recommend you provide URIs to the - location from which the code is derived.) - - THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT - HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, - INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS - FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR - DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, - TRADEMARKS OR OTHER RIGHTS. - - COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL - OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR - DOCUMENTATION. - - The name and trademarks of copyright holders may NOT be used in - advertising or publicity pertaining to the software without specific, - written prior permission. Title to copyright in this software and - any associated documentation will at all times remain with - copyright holders. - -============================================================================== - XML API library, org.w3c classes (xml-apis) Containing Project URL: Modified: airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/NOTICE URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/NOTICE?rev=1418352&r1=1418351&r2=1418352&view=diff ============================================================================== --- airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/NOTICE (original) +++ airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/NOTICE Fri Dec 7 15:12:48 2012 @@ -4,34 +4,7 @@ Copyright 2012 The Apache Software Found This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -=========================================================================== -Apache Jackrabbit Notice: - -Based on source code originally developed by -Day Software (http://www.day.com/). - -This product includes software from the following contributions: - -Original BZip2 classes contributed by Keiron Liddle -, Aftex Software to the Apache Ant project - -Original Tar classes from contributors of the Apache Ant project - -Original Zip classes from contributors of the Apache Ant project - -Original CPIO classes contributed by Markus Kuss and the jRPM project -(jrpm.sourceforge.net) - -The JDBC apis for small devices and JDBC3 (under java/stubs/jsr169 and -java/stubs/jdbc3) were produced by trimming sources supplied by the -Apache Harmony project. The following notice covers the Harmony sources: - - Portions of Harmony were originally developed by - Intel Corporation and are licensed to the Apache Software - Foundation under the "Software Grant and Corporate Contribution - License Agreement", informally known as the "Intel Harmony CLA". - -========================================================================= +=============================================================================== Apache Xerces Java Notice: Portions of this software were originally based on the following: @@ -184,3 +157,7 @@ The source code is available at: OpenJPA includes software written by Miroslav Nachev OpenJPA uses test code written by Charles Tillman. ================================================================================================ +Apache XmlSchema Notice: + +Portions Copyright 2006 International Business Machines Corp. +================================================================================================ \ No newline at end of file