Skip to content

Commit a246a7a

Browse files
chipchilderschipchilders
committed
Corrected CAStorSDK.jar license documentation approach, as well as some minor descriptor.xml fixes.
1 parent 517722e commit a246a7a

3 files changed

Lines changed: 66 additions & 44 deletions

File tree

‎LICENSE‎

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ Within the deps/awsapi-lib directory
375375
cloud-gson.jar http://code.google.com/p/google-gson/
376376

377377
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
378-
$license.CopyrightNotice
378+
379379
from Json.simple Project http://code.google.com/p/json-simple/
380380
json_simple-1.1.jar http://code.google.com/p/json-simple/source/checkout
381381

@@ -2368,7 +2368,8 @@ Within the target/jar directory
23682368
cloud-backport-util-concurrent-3.0.jar
23692369

23702370
licensed under the Apache License, Version 1.1 http://www.apache.org/licenses/LICENSE-1.1 (as follows)
2371-
2371+
2372+
Copyright � 2012 The Apache Software Foundation
23722373

23732374
/* ====================================================================
23742375
* The Apache Software License, Version 1.1
@@ -2462,11 +2463,42 @@ Within the target/jar directory
24622463
cloud-google-gson-1.7.1.jar http://code.google.com/p/google-gson/
24632464

24642465
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
2465-
$license.CopyrightNotice
2466+
24662467
from Jetty Committers http://jetty.codehaus.org/jetty/
24672468
jetty-6.1.26.jar http://repo1.maven.org/maven2/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26-sources.jar
24682469
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
24692470

2471+
licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows)
2472+
2473+
Copyright � 2009, Caringo, Inc.
2474+
2475+
Redistribution and use in source and binary forms, with or without
2476+
modification, are permitted provided that the following conditions
2477+
are met:
2478+
1. Redistributions of source code must retain the above copyright
2479+
notice, this list of conditions and the following disclaimer.
2480+
2. Redistributions in binary form must reproduce the above copyright
2481+
notice, this list of conditions and the following disclaimer in the
2482+
documentation and/or other materials provided with the distribution.
2483+
3. Neither the name of the copyright holders nor the names of its
2484+
contributors may be used to endorse or promote products derived from
2485+
this software without specific prior written permission.
2486+
2487+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
2488+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
2489+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
2490+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
2491+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
2492+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
2493+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
2494+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
2495+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
2496+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
2497+
THE POSSIBILITY OF SUCH DAMAGE.
2498+
2499+
from Caringo, Inc. http://www.caringo.com/
2500+
CAStorSDK.jar http://www.castor.org/download.html
2501+
24702502
licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows)
24712503

24722504
Copyright � 2002-2011 Atsuhiko Yamanaka, JCraft,Inc.
@@ -4118,7 +4150,8 @@ Within the ui/lib/jquery-ui directory
41184150

41194151
Within the ui/lib/qunit directory
41204152
licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows)
4121-
4153+
4154+
Copyright � 2012 John Resig, J�rn Zaefferer
41224155

41234156
Permission is hereby granted, free of charge, to any person obtaining
41244157
a copy of this software and associated documentation files (the

‎NOTICE‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -657,40 +657,3 @@
657657
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
658658

659659
================================================================================
660-
661-
662-
For
663-
CAStorSDK.jar
664-
665-
This product includes CAStorSDK (http://www.caringo.com/)
666-
under the BSD License
667-
668-
================================================================================
669-
Copyright (c) 2009, Caringo, Inc.
670-
All rights reserved.
671-
672-
Redistribution and use in source and binary forms, with or without
673-
modification, are permitted provided that the following conditions are met:
674-
675-
* Redistributions of source code must retain the above copyright notice,
676-
this list of conditions and the following disclaimer.
677-
678-
* Redistributions in binary form must reproduce the above copyright notice,
679-
this list of conditions and the following disclaimer in the documentation
680-
and/or other materials provided with the distribution.
681-
682-
* Neither the name of Caringo, Inc. nor the names of its contributors may
683-
be used to endorse or promote products derived from this software without
684-
specific prior written permission.
685-
686-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
687-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
688-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
689-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
690-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
691-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
692-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
693-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
694-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
695-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
696-
================================================================================

‎tools/whisker/descriptor.xml‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2400,6 +2400,10 @@ this distribution.
24002400
id='citrix.com'
24012401
name='Citrix Systems, Inc'
24022402
url='http://www.citrix.com/' />
2403+
<organisation
2404+
id='caringo.com'
2405+
name='Caringo, Inc.'
2406+
url='http://www.caringo.com/' />
24032407
</organisations>
24042408
<primary-license id='ApacheLicenseVersion2'>
24052409
<copyright-notice>Copyright (c) 2012 The Apache Software Foundation</copyright-notice>
@@ -2516,13 +2520,15 @@ Updated November 2009 with contributions from: btburnett3, Anthony Aragues and X
25162520
</by-organisation>
25172521
</with-license>
25182522
<with-license id='MIT'>
2523+
<copyright-notice />
25192524
<by-organisation id='person:ole.laursen'>
25202525
<resource name="jquery.colorhelpers.js" notice='jquery.colorhelpers.notice' />
25212526
</by-organisation>
25222527
</with-license>
25232528
</within>
25242529
<within dir='ui/lib/jquery-ui'>
25252530
<with-license id='MIT'>
2531+
<copyright-notice />
25262532
<by-organisation id='jqueryui.com'>
25272533
<resource name="css/jquery-ui.css" />
25282534
<resource name="js/jquery-ui.js" />
@@ -2531,10 +2537,10 @@ Updated November 2009 with contributions from: btburnett3, Anthony Aragues and X
25312537
</with-license>
25322538
</within>
25332539
<within dir='ui/lib/qunit'>
2534-
<copyright-notice>
2535-
Copyright © 2012 John Resig, Jörn Zaefferer
2536-
</copyright-notice>
25372540
<with-license id='MIT'>
2541+
<copyright-notice>
2542+
Copyright © 2012 John Resig, Jörn Zaefferer
2543+
</copyright-notice>
25382544
<by-organisation id='person:jorn.zaefferer'>
25392545
<resource name="qunit.css" source='http://docs.jquery.com/QUnit' />
25402546
<resource name="qunit.js" source='http://docs.jquery.com/QUnit' />
@@ -2585,6 +2591,9 @@ Copyright © 2012 The Apache Software Foundation
25852591
</by-organisation>
25862592
</with-license>
25872593
<with-license id="ApacheLicenseVersion1.1">
2594+
<copyright-notice>
2595+
Copyright © 2012 The Apache Software Foundation
2596+
</copyright-notice>
25882597
<by-organisation id="apache.org">
25892598
<resource name="cloud-commons-discovery.jar" source="http://commons.apache.org/discovery/" />
25902599
</by-organisation>
@@ -2640,6 +2649,14 @@ Copyright © 2012 The Eclipse Foundation.
26402649
</with-license>
26412650
<with-license id='BSD3ClauseGeneric'>
26422651
<copyright-notice>
2652+
Copyright © 2009, Caringo, Inc.
2653+
</copyright-notice>
2654+
<by-organisation id='caringo.com'>
2655+
<resource name='CAStorSDK.jar' source='http://www.castor.org/download.html' />
2656+
</by-organisation>
2657+
</with-license>
2658+
<with-license id='BSD3ClauseGeneric'>
2659+
<copyright-notice>
26432660
Copyright © 2002-2011 Atsuhiko Yamanaka, JCraft,Inc.
26442661
</copyright-notice>
26452662
<by-organisation id='jcraft.com'>
@@ -2656,11 +2673,13 @@ Copyright © IBM Corp 2006
26562673
</by-organisation>
26572674
</with-license>
26582675
<with-license id='xstream.bsd'>
2676+
<copyright-notice />
26592677
<by-organisation id='xstream.codehaus.com'>
26602678
<resource name='cloud-xstream-1.3.1.jar' source='http://xstream.codehaus.org/repository.html' />
26612679
</by-organisation>
26622680
</with-license>
26632681
<with-license id='bouncy.mit'>
2682+
<copyright-notice />
26642683
<by-organisation id='bouncy.castle'>
26652684
<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' />
26662685
</by-organisation>
@@ -2675,12 +2694,14 @@ All rights reserved.
26752694
</by-organisation>
26762695
</with-license>
26772696
<with-license id='ApacheLicenseVersion2'>
2697+
<copyright-notice />
26782698
<by-organisation id='jetty.codehaus.com'>
26792699
<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' />
26802700
<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' />
26812701
</by-organisation>
26822702
</with-license>
26832703
<with-license id='CPL1'>
2704+
<copyright-notice />
26842705
<by-organisation id='junit.org'>
26852706
<resource name='cloud-junit.jar' source='http://kentbeck.github.com/junit/' />
26862707
</by-organisation>
@@ -2731,6 +2752,7 @@ Copyright © 2004-2008 The Apache Software Foundation
27312752
</by-organisation>
27322753
</with-license>
27332754
<with-license id='antlr2'>
2755+
<copyright-notice />
27342756
<by-organisation id='antlr2.org'>
27352757
<resource name='antlr-2.7.6.jar' source='http://repo1.maven.org/maven2/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar' />
27362758
</by-organisation>
@@ -2788,6 +2810,7 @@ Copyright © 2009 Google Inc.
27882810
</by-organisation>
27892811
</with-license>
27902812
<with-license id='dom4j.license'>
2813+
<copyright-notice />
27912814
<by-organisation id='dom4j.sourceforge.net'>
27922815
<!-- TODO: Need to have a review of this license! -->
27932816
<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.
28202843
</by-organisation>
28212844
</with-license>
28222845
<with-license id='ApacheLicenseVersion2'>
2846+
<copyright-notice />
28232847
<by-organisation id='json-simple'>
28242848
<resource name='json_simple-1.1.jar' source='http://code.google.com/p/json-simple/source/checkout' />
28252849
</by-organisation>
@@ -2833,11 +2857,13 @@ Copyright © 1997-2010 Oracle and/or its affiliates. All rights reserved.
28332857
</by-organisation>
28342858
</with-license>
28352859
<with-license id='CPL1'>
2860+
<copyright-notice />
28362861
<by-organisation id='junit.org'>
28372862
<resource name='junit-4.8.1.jar' source='http://kentbeck.github.com/junit/' />
28382863
</by-organisation>
28392864
</with-license>
28402865
<with-license id='MPL1'>
2866+
<copyright-notice />
28412867
<license-parameters>
28422868
<parameter><name>PROJECT</name><value>Javassist</value></parameter>
28432869
<parameter><name>INITIAL_DEVELOPER</name><value>Shigeru Chiba</value></parameter>

0 commit comments

Comments
 (0)