mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
CLOUDSTACK-625: Correcting legal documentation for the require.js file
that was added for the UI plugin feature. Signed-off-by: Chip Childers <chip.childers@gmail.com>
This commit is contained in:
parent
05437d0e97
commit
6279433f45
25
LICENSE
25
LICENSE
@ -471,6 +471,31 @@ Within the ui/lib directory
|
||||
from George McGinley Smith
|
||||
jquery.easing.js
|
||||
|
||||
licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows)
|
||||
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
"Software"), to deal in the Software without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Software, and to
|
||||
permit persons to whom the Software is furnished to do so, subject to
|
||||
the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
from The Dojo Foundation http://dojofoundation.org/
|
||||
require.js from http://github.com/jrburke/requirejs
|
||||
|
||||
licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows)
|
||||
|
||||
Copyright (c) 2011, John Resig
|
||||
|
||||
1
pom.xml
1
pom.xml
@ -402,6 +402,7 @@
|
||||
<exclude>ui/lib/qunit/qunit.css</exclude>
|
||||
<exclude>ui/lib/qunit/qunit.js</exclude>
|
||||
<exclude>ui/lib/reset.css</exclude>
|
||||
<exclude>ui/lib/require.js</exclude>
|
||||
<exclude>waf</exclude>
|
||||
<exclude>patches/systemvm/debian/systemvm.vmx</exclude>
|
||||
<exclude>patches/systemvm/debian/config/root/.ssh/authorized_keys</exclude>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2427,6 +2427,10 @@ Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
|
||||
id='vmware.com'
|
||||
name='VMware, Inc'
|
||||
url='http://www.vmware.com/' />
|
||||
<organisation
|
||||
id='dojofoundation.org'
|
||||
name='The Dojo Foundation'
|
||||
url='http://dojofoundation.org/' />
|
||||
</organisations>
|
||||
<primary-license id='ApacheLicenseVersion2'>
|
||||
<copyright-notice>Copyright (c) 2013 The Apache Software Foundation</copyright-notice>
|
||||
@ -2508,6 +2512,14 @@ Copyright (c) 2009, John Resig
|
||||
</with-license>
|
||||
</within>
|
||||
<within dir='ui/lib'>
|
||||
<with-license id='MIT'>
|
||||
<copyright>
|
||||
Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
|
||||
</copyright>
|
||||
<by-organisation id='dojofoundation.org'>
|
||||
<resource name='require.js' source='http://github.com/jrburke/requirejs' />
|
||||
</by-organisation>
|
||||
</with-license>
|
||||
<with-license id='ApacheLicenseVersion2'>
|
||||
<copyright-notice>
|
||||
Copyright (c) 2006 Google Inc.
|
||||
|
||||
@ -2427,6 +2427,10 @@ Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
|
||||
id='person:patrick.debois'
|
||||
name='Patrick Debois'
|
||||
url='http://www.jedi.be/blog/' />
|
||||
<organisation
|
||||
id='dojofoundation.org'
|
||||
name='The Dojo Foundation'
|
||||
url='http://dojofoundation.org/' />
|
||||
</organisations>
|
||||
<primary-license id='ApacheLicenseVersion2'>
|
||||
<copyright-notice>Copyright (c) 2013 The Apache Software Foundation</copyright-notice>
|
||||
@ -2508,6 +2512,14 @@ Copyright (c) 2009, John Resig
|
||||
</with-license>
|
||||
</within>
|
||||
<within dir='ui/lib'>
|
||||
<with-license id='MIT'>
|
||||
<copyright>
|
||||
Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
|
||||
</copyright>
|
||||
<by-organisation id='dojofoundation.org'>
|
||||
<resource name='require.js' source='http://github.com/jrburke/requirejs' />
|
||||
</by-organisation>
|
||||
</with-license>
|
||||
<with-license id='ApacheLicenseVersion2'>
|
||||
<copyright-notice>
|
||||
Copyright (c) 2006 Google Inc.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user