etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-697: Reordered the LICENSE and NOTICE file content (as well as descriptor.xml). 

Signed-off-by: Chip Childers <chip.childers@gmail.com>

Conflicts:

	LICENSE
	tools/whisker/descriptor.xml
This commit is contained in:
Chip Childers 2012-12-21 10:09:31 -05:00
parent 8acc85ca53
commit 67f9467c5d
3 changed files with 1999 additions and 2014 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3816
LICENSE
View File

File diff suppressed because it is too large Load Diff

146
NOTICE
View File

@ -6,9 +6,84 @@
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
@ -337,28 +412,6 @@
without prior written authorization of the copyright holder.
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
@ -430,21 +483,6 @@
THE SOFTWARE.
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
@ -532,25 +570,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
@ -588,19 +607,6 @@
software copyright (c) 1999.
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

43
tools/whisker/descriptor.xml
View File

@ -2634,6 +2634,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='MIT'>
<copyright-notice>
@ -2789,26 +2812,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>