Correcting NOTICE file to include jquery 1.3.2, as well as some minor character fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/56a1da9f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/56a1da9f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/56a1da9f Branch: refs/heads/4.0 Commit: 56a1da9f1e4cd6f4d7e6592f2b30eb5210edcedd Parents: 4a0e645 Author: Chip Childers <[email protected]> Authored: Fri Sep 7 20:09:40 2012 -0400 Committer: Chip Childers <[email protected]> Committed: Fri Sep 7 20:11:22 2012 -0400 ---------------------------------------------------------------------- LICENSE | 2 +- NOTICE | 365 +++++++++++++++++++------------------ tools/whisker/descriptor.xml | 25 ++- 3 files changed, 209 insertions(+), 183 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56a1da9f/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 7ec1f00..210f282 100644 --- a/LICENSE +++ b/LICENSE @@ -250,7 +250,7 @@ Within the awsapi directory Within the console-proxy/js directory licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) - Copyright � 2011, John Resig + Copyright � 2009, John Resig Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56a1da9f/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 9c124ab..34bcc3a 100644 --- a/NOTICE +++ b/NOTICE @@ -31,6 +31,181 @@ For + cloud-javax.persistence-2.0.0.jar + + + EclipseLink 2.0.0 + + Dec 10th, 2009 + + About + + The EclipseLink project's goal is to provide a complete persistence framework + that is both comprehensive and universal. It will run in any Java environment + and read and write objects to virtually any type of data source, including + relational databases, and XML. EclipseLink will focus on providing leading edge + support, including advanced feature extensions, for the dominant persistence + standards for each target data source; Java Persistence API (JPA) for relational + databases, Java API for XML Binding (JAXB) for XML, Service Data Objects (SDO), + and Database Web services (DBWS). + + For tips on getting started with EclipseLink, please see the following + resources: + + EclipseLink 2.0.0 Release Notes Documentation Examples and How To License + + The Eclipse Foundation makes available all content in this plug-in ("Content"). + Unless otherwise indicated below, the Content is provided to you under the terms + and conditions of the Eclipse Public License Version 1.0 ("EPL") and Eclipse + Distribution License Version 1.0 ("EDL"). A copy of the EPL is available at + http://www.eclipse.org/legal/epl-v10.html and a copy of the EDL is available at + http://www.eclipse.org/org/documents/edl-v10.php. For purposes of the EPL, + "Program" will mean the Content. + + If you did not receive this Content directly from the Eclipse Foundation, the + Content is being redistributed by another party ("Redistributor") and different + terms and conditions may apply to your use of any object code in the Content. + Check the Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated below, the + terms and conditions of the EPL and EDL still apply to any source code in the + Content and such source code may be obtained at http://www.eclipse.org. + + Third Party Content + + The Content includes items that have been sourced from third parties as set out + below. If you did not receive this Content directly from the Eclipse Foundation, + the following is provided for informational purposes only, and you should look + to the Redistributor's license for terms and conditions of use. + + Foundation Dependencies ASM EclipseLink JPA ANTLR Java Persistence API (JPA) 1.0 + - EJB 3.0 Java Persistence API (JPA) 2.0 EARLY ACCESS EclipseLink MOXy Java + Architecture for XML Binding (JAXB) Java Mail Java Activation Framework + Streaming API for XML (StAX) EclipseLink SDO Service Data Objects (SDO) + Utilities Java Connector Xerces WSDL4J 1.6.2 ASM v1.5.3 + + The EclipseLink Project includes ASM for the purpose of byte code weaving. The + AMS library is re-packaged within the source of the project + (org.persistence.eclipse.internal.libraries.asm.*) to avoid version collisions + with other usage of ASM. A custom patch has been added to the ASM 1.5.3 source + to handle an issue with other usages. This fix has also been contributed back to + the ASM project for inclusion in later projects. + + The source code is available within the project's subversion repository. The + binaries are distributed within the eclipselink.jar and in the + org.eclipse.persistence.asm_2.0.0.v*.jar bundle. + + http://asm.objectweb.org/license.html + + 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: + + 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 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, THEIMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSEARE DISCLAIMED. IN NO EVENT + SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BELIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, ORCONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OFSUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER INCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE)ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + OFTHE POSSIBILITY OF SUCH DAMAGE. + + ANTLR v3.0 + + The ANTLR library (license) is included within EclipseLink Project to enable + parsing of the Java Persistence Query language (JP QL). The ANTLR library is re- + packaged within the project in the + org.eclipse.persistence.internal.libraries.antlr.* packages. + + The source is available with the project's subversion repository. The binaries + are distributed within the eclipselink.jar and in the + org.eclipse.persistence.antlr_2.0.0.v*.jar bundle. + + Java Architecture for XML Binding (JAXB) v2.0.5 + + The JAXB libraries distributed under CDDL v1.0 are included within the + EclipseLink Project to enable the MOXY component's implementation of JAXB. + + JAXB Libraries: + + /jlib/moxy/javax.xml.bind_2.1.12.v20090708-1500.jar /jlib/moxy/jaxb-impl.jar + /jlib/moxy/jaxb.xjc.jar Java Persistence (JPA) 1.0 - EJB 3.0 + + The Java Persistence API, included with EJB 3.0, is available for download from + the ejb-api directory in the glassfish CVS repository.It is distributed under + CDDLv1.0 . The jar is being shipped as an OSGi bundle and is required for + compilation of some container based fuctionality. + + Java Persistence (JPA) 2.0. + + EclipseLink is the Java Persistence (JPA) 2.0 Reference Implementation (JSR + 317). The JPA 2.0 specification API is included in EclipseLink under the EPL and + EDL licenses. + + Java Mail v1.4 + + The Java Mail library (mail.jar) is distributed with the JAXB v2.0.5 under CDDL + v1.0 and is included within the EclipseLink Project distribution to support Web + Services attachment handling in the MOXy component. It is only required when + using Java SE 5 (Java Mail is included in Java SE 6). + + Java Activation Framework v1.1 + + The Java Activation Framework (activation.jar) is distributed with the JAXB + v2.0.5 under CDDL v1.0 and is included within the EclipseLink Project + distribution to support Web Services attachment handling in the MOXy component. + It is only required when using Java SE 5 (The Java Activation Framework is + included in Java SE 6). + + Streaming API for XML (StAX) v1.0 + + The Streaming API for XML (StAX) library (jsr173_1.0_api.jar) is distributed + with the JAXB v2.0.5 under CDDL v1.0 and is included within the EclipseLink + Project distribution as an optional XML processing approach in the MOXy + component. + + Service Data Objects (SDO) v2.1.1 + + The Service Data Objects (SDO) API is distributed under a CDDLv1.0 and custom + license. It provides the standard API implemented by the EclipseLink Project's + SDO component. + + Java Connector v1.5 + + The JCA 1.5 API is available for download from the connector-api directory in + the glassfish CVS repository. It is distributed under CDDLv1.0 . + + This jar is being shipped and required by the Workbench only. When using + EclipseLink in a container where JCA integration is required that container will + provide the necessary API libraries. + + Xerces v2.9.0 + + Xerces 2.9.0 is available from the Xerces home page. It is distributed under + Apache 2.0. + + This jar is shipped for the Workbench's use only in the reading and writing of + XML configuration files. + + WSDL4j v1.6.2 + + WSDL4J 1.6.2 is available for download from the wsdl4j project. It distributed + under CPLv1.0 . + + This jar is being shipped as a OSGi bundle and is only required for the DBWS + Builder utility. + + + For cloud-commons-logging-1.1.1.jar commons-logging-1.1.1.jar @@ -256,6 +431,21 @@ For + jquery.js + + + jQuery JavaScript Library v1.3.2 + http://jquery.com/ + + Copyright (c) 2009 John Resig + Dual licensed under the MIT and GPL licenses. + http://docs.jquery.com/License + + Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) + Revision: 6246 + + + For axis2-1.5.1.jar axis2-adb-1.5.1.jar axis2-ant-plugin-1.5.1.jar @@ -321,181 +511,6 @@ For - cloud-javax.persistence-2.0.0.jar - - - EclipseLink 2.0.0 - - Dec 10th, 2009 - - About - - The EclipseLink project's goal is to provide a complete persistence framework - that is both comprehensive and universal. It will run in any Java environment - and read and write objects to virtually any type of data source, including - relational databases, and XML. EclipseLink will focus on providing leading edge - support, including advanced feature extensions, for the dominant persistence - standards for each target data source; Java Persistence API (JPA) for relational - databases, Java API for XML Binding (JAXB) for XML, Service Data Objects (SDO), - and Database Web services (DBWS). - - For tips on getting started with EclipseLink, please see the following - resources: - - EclipseLink 2.0.0 Release Notes Documentation Examples and How To License - - The Eclipse Foundation makes available all content in this plug-in ("Content"). - Unless otherwise indicated below, the Content is provided to you under the terms - and conditions of the Eclipse Public License Version 1.0 ("EPL") and Eclipse - Distribution License Version 1.0 (âEDLâ). A copy of the EPL is available at - http://www.eclipse.org/legal/epl-v10.html and a copy of the EDL is available at - http://www.eclipse.org/org/documents/edl-v10.php. For purposes of the EPL, - "Program" will mean the Content. - - If you did not receive this Content directly from the Eclipse Foundation, the - Content is being redistributed by another party ("Redistributor") and different - terms and conditions may apply to your use of any object code in the Content. - Check the Redistributorâs license that was provided with the Content. If no such - license exists, contact the Redistributor. Unless otherwise indicated below, the - terms and conditions of the EPL and EDL still apply to any source code in the - Content and such source code may be obtained at http://www.eclipse.org. - - Third Party Content - - The Content includes items that have been sourced from third parties as set out - below. If you did not receive this Content directly from the Eclipse Foundation, - the following is provided for informational purposes only, and you should look - to the Redistributorâs license for terms and conditions of use. - - Foundation Dependencies ASM EclipseLink JPA ANTLR Java Persistence API (JPA) 1.0 - - EJB 3.0 Java Persistence API (JPA) 2.0 EARLY ACCESS EclipseLink MOXy Java - Architecture for XML Binding (JAXB) Java Mail Java Activation Framework - Streaming API for XML (StAX) EclipseLink SDO Service Data Objects (SDO) - Utilities Java Connector Xerces WSDL4J 1.6.2 ASM v1.5.3 - - The EclipseLink Project includes ASM for the purpose of byte code weaving. The - AMS library is re-packaged within the source of the project - (org.persistence.eclipse.internal.libraries.asm.*) to avoid version collisions - with other usage of ASM. A custom patch has been added to the ASM 1.5.3 source - to handle an issue with other usages. This fix has also been contributed back to - the ASM project for inclusion in later projects. - - The source code is available within the project's subversion repository. The - binaries are distributed within the eclipselink.jar and in the - org.eclipse.persistence.asm_2.0.0.v*.jar bundle. - - http://asm.objectweb.org/license.html - - 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: - - 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 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, THEIMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSEARE DISCLAIMED. IN NO EVENT - SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BELIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, ORCONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OFSUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER INCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - OR OTHERWISE)ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - OFTHE POSSIBILITY OF SUCH DAMAGE. - - ANTLR v3.0 - - The ANTLR library (license) is included within EclipseLink Project to enable - parsing of the Java Persistence Query language (JP QL). The ANTLR library is re- - packaged within the project in the - org.eclipse.persistence.internal.libraries.antlr.* packages. - - The source is available with the project's subversion repository. The binaries - are distributed within the eclipselink.jar and in the - org.eclipse.persistence.antlr_2.0.0.v*.jar bundle. - - Java Architecture for XML Binding (JAXB) v2.0.5 - - The JAXB libraries distributed under CDDL v1.0 are included within the - EclipseLink Project to enable the MOXY component's implementation of JAXB. - - JAXB Libraries: - - /jlib/moxy/javax.xml.bind_2.1.12.v20090708-1500.jar /jlib/moxy/jaxb-impl.jar - /jlib/moxy/jaxb.xjc.jar Java Persistence (JPA) 1.0 - EJB 3.0 - - The Java Persistence API, included with EJB 3.0, is available for download from - the ejb-api directory in the glassfish CVS repository.It is distributed under - CDDLv1.0 . The jar is being shipped as an OSGi bundle and is required for - compilation of some container based fuctionality. - - Java Persistence (JPA) 2.0. - - EclipseLink is the Java Persistence (JPA) 2.0 Reference Implementation (JSR - 317). The JPA 2.0 specification API is included in EclipseLink under the EPL and - EDL licenses. - - Java Mail v1.4 - - The Java Mail library (mail.jar) is distributed with the JAXB v2.0.5 under CDDL - v1.0 and is included within the EclipseLink Project distribution to support Web - Services attachment handling in the MOXy component. It is only required when - using Java SE 5 (Java Mail is included in Java SE 6). - - Java Activation Framework v1.1 - - The Java Activation Framework (activation.jar) is distributed with the JAXB - v2.0.5 under CDDL v1.0 and is included within the EclipseLink Project - distribution to support Web Services attachment handling in the MOXy component. - It is only required when using Java SE 5 (The Java Activation Framework is - included in Java SE 6). - - Streaming API for XML (StAX) v1.0 - - The Streaming API for XML (StAX) library (jsr173_1.0_api.jar) is distributed - with the JAXB v2.0.5 under CDDL v1.0 and is included within the EclipseLink - Project distribution as an optional XML processing approach in the MOXy - component. - - Service Data Objects (SDO) v2.1.1 - - The Service Data Objects (SDO) API is distributed under a CDDLv1.0 and custom - license. It provides the standard API implemented by the EclipseLink Project's - SDO component. - - Java Connector v1.5 - - The JCA 1.5 API is available for download from the connector-api directory in - the glassfish CVS repository. It is distributed under CDDLv1.0 . - - This jar is being shipped and required by the Workbench only. When using - EclipseLink in a container where JCA integration is required that container will - provide the necessary API libraries. - - Xerces v2.9.0 - - Xerces 2.9.0 is available from the Xerces home page. It is distributed under - Apache 2.0. - - This jar is shipped for the Workbench's use only in the reading and writing of - XML configuration files. - - WSDL4j v1.6.2 - - WSDL4J 1.6.2 is available for download from the wsdl4j project. It distributed - under CPLv1.0 . - - This jar is being shipped as a OSGi bundle and is only required for the DBWS - Builder utility. - - - For cloud-commons-codec-1.5.jar commons-codec-1.4.jar http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/56a1da9f/tools/whisker/descriptor.xml ---------------------------------------------------------------------- diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml index b2eb90d..ad29c69 100644 --- a/tools/whisker/descriptor.xml +++ b/tools/whisker/descriptor.xml @@ -1805,7 +1805,18 @@ this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California. </notice> - <notice id='jquery.notice'> + <notice id='jquery.notice.1.3.2'> +jQuery JavaScript Library v1.3.2 +http://jquery.com/ + +Copyright (c) 2009 John Resig +Dual licensed under the MIT and GPL licenses. +http://docs.jquery.com/License + +Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) +Revision: 6246 + </notice> + <notice id='jquery.notice.1.6.1'> jQuery JavaScript Library v1.6.1 http://jquery.com/ @@ -1954,7 +1965,7 @@ EclipseLink 2.0.0 Release Notes Documentation Examples and How To License The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL") and Eclipse -Distribution License Version 1.0 (âEDLâ). A copy of the EPL is available at +Distribution License Version 1.0 ("EDL"). A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html and a copy of the EDL is available at http://www.eclipse.org/org/documents/edl-v10.php. For purposes of the EPL, "Program" will mean the Content. @@ -1962,7 +1973,7 @@ http://www.eclipse.org/org/documents/edl-v10.php. For purposes of the EPL, If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. -Check the Redistributorâs license that was provided with the Content. If no such +Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL and EDL still apply to any source code in the Content and such source code may be obtained at http://www.eclipse.org. @@ -1972,7 +1983,7 @@ Third Party Content The Content includes items that have been sourced from third parties as set out below. If you did not receive this Content directly from the Eclipse Foundation, the following is provided for informational purposes only, and you should look -to the Redistributorâs license for terms and conditions of use. +to the Redistributor's license for terms and conditions of use. Foundation Dependencies ASM EclipseLink JPA ANTLR Java Persistence API (JPA) 1.0 - EJB 3.0 Java Persistence API (JPA) 2.0 EARLY ACCESS EclipseLink MOXy Java @@ -2437,10 +2448,10 @@ All rights reserved. <within dir='console-proxy/js'> <with-license id='MIT'> <copyright-notice> -Copyright © 2011, John Resig +Copyright © 2009, John Resig </copyright-notice> <by-organisation id='person:john.resig'> - <resource name="jquery.js" notice='jquery.notice' /> + <resource name="jquery.js" notice='jquery.notice.1.3.2' /> </by-organisation> </with-license> </within> @@ -2450,7 +2461,7 @@ Copyright © 2011, John Resig Copyright © 2011, John Resig </copyright-notice> <by-organisation id='person:john.resig'> - <resource name="jquery.js" notice='jquery.notice' /> + <resource name="jquery.js" notice='jquery.notice.1.6.1' /> </by-organisation> </with-license> <with-license id='MIT'>
