You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2012/12/21 16:22:58 UTC
[3/3] CLOUDSTACK-697: Reordered the LICENSE and NOTICE file content
(as well as descriptor.xml).
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1434ade3/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 1867958..e310584 100644
--- a/NOTICE
+++ b/NOTICE
@@ -6,10 +6,85 @@
- This distribution contains third party resources requiring the following notices:
+ Source code distribution if this software contains third party resources requiring
+ the following notices:
For
+ jquery.md5.js
+
+
+ jQuery MD5 Plugin 1.2.1
+ https://github.com/blueimp/jQuery-MD5
+
+ Copyright 2010, Sebastian Tschan
+ https://blueimp.net
+
+ Licensed under the MIT license:
+ http://creativecommons.org/licenses/MIT/
+
+ Based on
+ A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ Digest Algorithm, as defined in RFC 1321.
+ Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
+ Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ Distributed under the BSD License
+ See http://pajhome.org.uk/crypt/md5 for more info.
+
+
+ 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
+ jquery.js
+
+
+ jQuery JavaScript Library v1.6.1
+ http://jquery.com/
+
+ Copyright 2011, John Resig
+ Dual licensed under the MIT or GPL Version 2 licenses.
+ http://jquery.org/license
+
+ Includes Sizzle.js
+ http://sizzlejs.com/
+ Copyright 2011, The Dojo Foundation
+ Released under the MIT, BSD, and GPL Licenses.
+
+ Date: Thu May 12 15:04:36 2011 -0400
+
+
+ For
+ jquery.colorhelpers.js
+
+
+ Plugin for jQuery for working with colors.
+
+ Version 1.1.
+
+ Inspiration from jQuery color animation plugin by John Resig.
+
+ Released under the MIT license by Ole Laursen, October 2009.
+
+
+********************************************************************************
+
+ Binary or packaged versions of this software (including versions built from source)
+ contains third party resources requiring the following notices:
+
+ For
cloud-ejb-api-3.0.jar
cloud-email.jar
cloud-jstl-1.2.jar
@@ -338,28 +413,6 @@
For
- jquery.md5.js
-
-
- jQuery MD5 Plugin 1.2.1
- https://github.com/blueimp/jQuery-MD5
-
- Copyright 2010, Sebastian Tschan
- https://blueimp.net
-
- Licensed under the MIT license:
- http://creativecommons.org/licenses/MIT/
-
- Based on
- A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
- Digest Algorithm, as defined in RFC 1321.
- Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
- Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
- Distributed under the BSD License
- See http://pajhome.org.uk/crypt/md5 for more info.
-
-
- For
XmlSchema-1.4.3.jar
@@ -431,21 +484,6 @@
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
@@ -533,25 +571,6 @@
For
- jquery.js
-
-
- jQuery JavaScript Library v1.6.1
- http://jquery.com/
-
- Copyright 2011, John Resig
- Dual licensed under the MIT or GPL Version 2 licenses.
- http://jquery.org/license
-
- Includes Sizzle.js
- http://sizzlejs.com/
- Copyright 2011, The Dojo Foundation
- Released under the MIT, BSD, and GPL Licenses.
-
- Date: Thu May 12 15:04:36 2011 -0400
-
-
- For
rampart-lib
@@ -589,19 +608,6 @@
For
- jquery.colorhelpers.js
-
-
- Plugin for jQuery for working with colors.
-
- Version 1.1.
-
- Inspiration from jQuery color animation plugin by John Resig.
-
- Released under the MIT license by Ole Laursen, October 2009.
-
-
- For
woden-api-1.0M8.jar
woden-impl-dom-1.0M8.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1434ade3/tools/whisker/descriptor.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
index 2bb6912..01c9111 100644
--- a/tools/whisker/descriptor.xml
+++ b/tools/whisker/descriptor.xml
@@ -2623,6 +2623,29 @@ Copyright (c) 2004 Clinton Begin
</by-organisation>
</with-license>
</within>
+ <within dir='scripts/storage/secondary'>
+ <with-license id='ApacheLicenseVersion2'>
+ <copyright-notice>
+Copyright (c) 2010-2011 OpenStack, LLC.
+ </copyright-notice>
+ <by-organisation id='openstack.org'>
+ <resource name='swift' />
+ </by-organisation>
+ </with-license>
+ </within>
+ <within dir='scripts/vm/hypervisor/xenserver'>
+ <with-license id='ApacheLicenseVersion2'>
+ <copyright-notice>
+Copyright (c) 2010-2011 OpenStack, LLC.
+ </copyright-notice>
+ <by-organisation id='openstack.org'>
+ <resource name='swift' />
+ </by-organisation>
+ </with-license>
+ </within>
+
+<!-- Resources below this line are binary dependencies that are only pulled in during the build process. -->
+
<within dir='target/jar'>
<with-license id="ApacheLicenseVersion2">
<copyright-notice>
@@ -2768,26 +2791,6 @@ All rights reserved.
</by-organisation>
</public-domain>
</within>
- <within dir='scripts/storage/secondary'>
- <with-license id='ApacheLicenseVersion2'>
- <copyright-notice>
-Copyright (c) 2010-2011 OpenStack, LLC.
- </copyright-notice>
- <by-organisation id='openstack.org'>
- <resource name='swift' />
- </by-organisation>
- </with-license>
- </within>
- <within dir='scripts/vm/hypervisor/xenserver'>
- <with-license id='ApacheLicenseVersion2'>
- <copyright-notice>
-Copyright (c) 2010-2011 OpenStack, LLC.
- </copyright-notice>
- <by-organisation id='openstack.org'>
- <resource name='swift' />
- </by-organisation>
- </with-license>
- </within>
<within dir='deps/awsapi-lib'>
<with-license id='ApacheLicenseVersion2'>
<copyright-notice>