mirror of https://github.com/apache/cloudstack.git
Corrected CAStorSDK.jar license documentation approach, as well as some minor descriptor.xml fixes.
This commit is contained in:
Chip Childers
parent
517722ef95
commit
a246a7ac8a
41
LICENSE
41
LICENSE
|
|
@ -375,7 +375,7 @@ Within the deps/awsapi-lib directory
|
|||
cloud-gson.jar http://code.google.com/p/google-gson/
|
||||
|
||||
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
|
||||
$license.CopyrightNotice
|
||||
|
||||
from Json.simple Project http://code.google.com/p/json-simple/
|
||||
json_simple-1.1.jar http://code.google.com/p/json-simple/source/checkout
|
||||
|
||||
|
|
@ -2368,7 +2368,8 @@ Within the target/jar directory
|
|||
cloud-backport-util-concurrent-3.0.jar
|
||||
|
||||
licensed under the Apache License, Version 1.1 http://www.apache.org/licenses/LICENSE-1.1 (as follows)
|
||||
|
||||
|
||||
Copyright © 2012 The Apache Software Foundation
|
||||
|
||||
/* ====================================================================
|
||||
* The Apache Software License, Version 1.1
|
||||
|
|
@ -2462,11 +2463,42 @@ Within the target/jar directory
|
|||
cloud-google-gson-1.7.1.jar http://code.google.com/p/google-gson/
|
||||
|
||||
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
|
||||
$license.CopyrightNotice
|
||||
|
||||
from Jetty Committers http://jetty.codehaus.org/jetty/
|
||||
jetty-6.1.26.jar http://repo1.maven.org/maven2/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26-sources.jar
|
||||
jetty-util-6.1.26.jar http://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26-sources.jar
|
||||
|
||||
licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows)
|
||||
|
||||
Copyright © 2009, Caringo, Inc.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
1. Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
2. 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.
|
||||
3. 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, 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.
|
||||
|
||||
from Caringo, Inc. http://www.caringo.com/
|
||||
CAStorSDK.jar http://www.castor.org/download.html
|
||||
|
||||
licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows)
|
||||
|
||||
Copyright © 2002-2011 Atsuhiko Yamanaka, JCraft,Inc.
|
||||
|
|
@ -4118,7 +4150,8 @@ Within the ui/lib/jquery-ui directory
|
|||
|
||||
Within the ui/lib/qunit directory
|
||||
licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows)
|
||||
|
||||
|
||||
Copyright © 2012 John Resig, Jörn Zaefferer
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
|
|
|
|||
37
NOTICE
37
NOTICE
|
|
@ -657,40 +657,3 @@
|
|||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
================================================================================
|
||||
|
||||
|
||||
For
|
||||
CAStorSDK.jar
|
||||
|
||||
This product includes CAStorSDK (http://www.caringo.com/)
|
||||
under the BSD License
|
||||
|
||||
================================================================================
|
||||
Copyright (c) 2009, Caringo, Inc.
|
||||
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 Caringo, Inc. 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.
|
||||
================================================================================
|
||||
|
|
|
|||
|
|
@ -2400,6 +2400,10 @@ this distribution.
|
|||
id='citrix.com'
|
||||
name='Citrix Systems, Inc'
|
||||
url='http://www.citrix.com/' />
|
||||
<organisation
|
||||
id='caringo.com'
|
||||
name='Caringo, Inc.'
|
||||
url='http://www.caringo.com/' />
|
||||
</organisations>
|
||||
<primary-license id='ApacheLicenseVersion2'>
|
||||
<copyright-notice>Copyright (c) 2012 The Apache Software Foundation</copyright-notice>
|
||||
|
|
@ -2516,6 +2520,7 @@ Updated November 2009 with contributions from: btburnett3, Anthony Aragues and X
|
|||
</by-organisation>
|
||||
</with-license>
|
||||
<with-license id='MIT'>
|
||||
<copyright-notice />
|
||||
<by-organisation id='person:ole.laursen'>
|
||||
<resource name="jquery.colorhelpers.js" notice='jquery.colorhelpers.notice' />
|
||||
</by-organisation>
|
||||
|
|
@ -2523,6 +2528,7 @@ Updated November 2009 with contributions from: btburnett3, Anthony Aragues and X
|
|||
</within>
|
||||
<within dir='ui/lib/jquery-ui'>
|
||||
<with-license id='MIT'>
|
||||
<copyright-notice />
|
||||
<by-organisation id='jqueryui.com'>
|
||||
<resource name="css/jquery-ui.css" />
|
||||
<resource name="js/jquery-ui.js" />
|
||||
|
|
@ -2531,10 +2537,10 @@ Updated November 2009 with contributions from: btburnett3, Anthony Aragues and X
|
|||
</with-license>
|
||||
</within>
|
||||
<within dir='ui/lib/qunit'>
|
||||
<copyright-notice>
|
||||
Copyright © 2012 John Resig, Jörn Zaefferer
|
||||
</copyright-notice>
|
||||
<with-license id='MIT'>
|
||||
<copyright-notice>
|
||||
Copyright © 2012 John Resig, Jörn Zaefferer
|
||||
</copyright-notice>
|
||||
<by-organisation id='person:jorn.zaefferer'>
|
||||
<resource name="qunit.css" source='http://docs.jquery.com/QUnit' />
|
||||
<resource name="qunit.js" source='http://docs.jquery.com/QUnit' />
|
||||
|
|
@ -2585,6 +2591,9 @@ Copyright © 2012 The Apache Software Foundation
|
|||
</by-organisation>
|
||||
</with-license>
|
||||
<with-license id="ApacheLicenseVersion1.1">
|
||||
<copyright-notice>
|
||||
Copyright © 2012 The Apache Software Foundation
|
||||
</copyright-notice>
|
||||
<by-organisation id="apache.org">
|
||||
<resource name="cloud-commons-discovery.jar" source="http://commons.apache.org/discovery/" />
|
||||
</by-organisation>
|
||||
|
|
@ -2640,6 +2649,14 @@ Copyright © 2012 The Eclipse Foundation.
|
|||
</with-license>
|
||||
<with-license id='BSD3ClauseGeneric'>
|
||||
<copyright-notice>
|
||||
Copyright © 2009, Caringo, Inc.
|
||||
</copyright-notice>
|
||||
<by-organisation id='caringo.com'>
|
||||
<resource name='CAStorSDK.jar' source='http://www.castor.org/download.html' />
|
||||
</by-organisation>
|
||||
</with-license>
|
||||
<with-license id='BSD3ClauseGeneric'>
|
||||
<copyright-notice>
|
||||
Copyright © 2002-2011 Atsuhiko Yamanaka, JCraft,Inc.
|
||||
</copyright-notice>
|
||||
<by-organisation id='jcraft.com'>
|
||||
|
|
@ -2656,11 +2673,13 @@ Copyright © IBM Corp 2006
|
|||
</by-organisation>
|
||||
</with-license>
|
||||
<with-license id='xstream.bsd'>
|
||||
<copyright-notice />
|
||||
<by-organisation id='xstream.codehaus.com'>
|
||||
<resource name='cloud-xstream-1.3.1.jar' source='http://xstream.codehaus.org/repository.html' />
|
||||
</by-organisation>
|
||||
</with-license>
|
||||
<with-license id='bouncy.mit'>
|
||||
<copyright-notice />
|
||||
<by-organisation id='bouncy.castle'>
|
||||
<resource name='cloud-bcprov-jdk16-1.45.jar' source='http://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.45/bcprov-jdk16-1.45-sources.jar' />
|
||||
</by-organisation>
|
||||
|
|
@ -2675,12 +2694,14 @@ All rights reserved.
|
|||
</by-organisation>
|
||||
</with-license>
|
||||
<with-license id='ApacheLicenseVersion2'>
|
||||
<copyright-notice />
|
||||
<by-organisation id='jetty.codehaus.com'>
|
||||
<resource name='jetty-6.1.26.jar' source='http://repo1.maven.org/maven2/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26-sources.jar' />
|
||||
<resource name='jetty-util-6.1.26.jar' source='http://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26-sources.jar' />
|
||||
</by-organisation>
|
||||
</with-license>
|
||||
<with-license id='CPL1'>
|
||||
<copyright-notice />
|
||||
<by-organisation id='junit.org'>
|
||||
<resource name='cloud-junit.jar' source='http://kentbeck.github.com/junit/' />
|
||||
</by-organisation>
|
||||
|
|
@ -2731,6 +2752,7 @@ Copyright © 2004-2008 The Apache Software Foundation
|
|||
</by-organisation>
|
||||
</with-license>
|
||||
<with-license id='antlr2'>
|
||||
<copyright-notice />
|
||||
<by-organisation id='antlr2.org'>
|
||||
<resource name='antlr-2.7.6.jar' source='http://repo1.maven.org/maven2/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar' />
|
||||
</by-organisation>
|
||||
|
|
@ -2788,6 +2810,7 @@ Copyright © 2009 Google Inc.
|
|||
</by-organisation>
|
||||
</with-license>
|
||||
<with-license id='dom4j.license'>
|
||||
<copyright-notice />
|
||||
<by-organisation id='dom4j.sourceforge.net'>
|
||||
<!-- TODO: Need to have a review of this license! -->
|
||||
<resource name='dom4j-1.6.1.jar' source='http://dom4j.sourceforge.net/source-repository.html' />
|
||||
|
|
@ -2820,6 +2843,7 @@ Copyright © 2002-2011 Atsuhiko Yamanaka, JCraft,Inc.
|
|||
</by-organisation>
|
||||
</with-license>
|
||||
<with-license id='ApacheLicenseVersion2'>
|
||||
<copyright-notice />
|
||||
<by-organisation id='json-simple'>
|
||||
<resource name='json_simple-1.1.jar' source='http://code.google.com/p/json-simple/source/checkout' />
|
||||
</by-organisation>
|
||||
|
|
@ -2833,11 +2857,13 @@ Copyright © 1997-2010 Oracle and/or its affiliates. All rights reserved.
|
|||
</by-organisation>
|
||||
</with-license>
|
||||
<with-license id='CPL1'>
|
||||
<copyright-notice />
|
||||
<by-organisation id='junit.org'>
|
||||
<resource name='junit-4.8.1.jar' source='http://kentbeck.github.com/junit/' />
|
||||
</by-organisation>
|
||||
</with-license>
|
||||
<with-license id='MPL1'>
|
||||
<copyright-notice />
|
||||
<license-parameters>
|
||||
<parameter><name>PROJECT</name><value>Javassist</value></parameter>
|
||||
<parameter><name>INITIAL_DEVELOPER</name><value>Shigeru Chiba</value></parameter>
|
||||
|
|
|
|||
Loading…
Reference in New Issue