Skip to content

Commit 6279433

Browse files
committed
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>
1 parent 05437d0 commit 6279433

5 files changed

Lines changed: 4918 additions & 90 deletions

File tree

LICENSE

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,31 @@ Within the ui/lib directory
471471
from George McGinley Smith
472472
jquery.easing.js
473473

474+
licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows)
475+
476+
477+
Permission is hereby granted, free of charge, to any person obtaining
478+
a copy of this software and associated documentation files (the
479+
"Software"), to deal in the Software without restriction, including
480+
without limitation the rights to use, copy, modify, merge, publish,
481+
distribute, sublicense, and/or sell copies of the Software, and to
482+
permit persons to whom the Software is furnished to do so, subject to
483+
the following conditions:
484+
485+
The above copyright notice and this permission notice shall be
486+
included in all copies or substantial portions of the Software.
487+
488+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
489+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
490+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
491+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
492+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
493+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
494+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
495+
496+
from The Dojo Foundation http://dojofoundation.org/
497+
require.js from http://github.com/jrburke/requirejs
498+
474499
licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows)
475500

476501
Copyright (c) 2011, John Resig

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@
402402
<exclude>ui/lib/qunit/qunit.css</exclude>
403403
<exclude>ui/lib/qunit/qunit.js</exclude>
404404
<exclude>ui/lib/reset.css</exclude>
405+
<exclude>ui/lib/require.js</exclude>
405406
<exclude>waf</exclude>
406407
<exclude>patches/systemvm/debian/systemvm.vmx</exclude>
407408
<exclude>patches/systemvm/debian/config/root/.ssh/authorized_keys</exclude>

0 commit comments

Comments
 (0)