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 2013/02/15 16:24:40 UTC
[3/3] git commit: refs/heads/master - CLOUDSTACK-625: Correcting
legal documentation for the require.js file that was added for the UI plugin
feature. Signed-off-by: Chip Childers
Updated Branches:
refs/heads/master 05437d0e9 -> 6279433f4
CLOUDSTACK-625: Correcting legal documentation for the require.js file
that was added for the UI plugin feature.
Signed-off-by: Chip Childers <ch...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6279433f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6279433f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6279433f
Branch: refs/heads/master
Commit: 6279433f458263e845b3c6f03975e8392f49ccef
Parents: 05437d0
Author: Chip Childers <ch...@gmail.com>
Authored: Fri Feb 15 10:22:56 2013 -0500
Committer: Chip Childers <ch...@gmail.com>
Committed: Fri Feb 15 10:24:16 2013 -0500
----------------------------------------------------------------------
LICENSE | 25 +
pom.xml | 1 +
tools/whisker/LICENSE | 4958 ++++++++++++++++++++++-
tools/whisker/descriptor-for-packaging.xml | 12 +
tools/whisker/descriptor.xml | 12 +
5 files changed, 4918 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6279433f/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index eda9587..5e29e2b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -472,6 +472,31 @@ Within the ui/lib directory
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
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6279433f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index eb7a790..1ee8891 100644
--- a/pom.xml
+++ b/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>