Updated Branches: refs/heads/master c657962ec -> 754d965fc
Added license file tracking reference for the jQuery copy living in the console-proxy folder. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/754d965f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/754d965f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/754d965f Branch: refs/heads/master Commit: 754d965fc9d9c96a95b0c3bb01fef35d86cd8fb9 Parents: da45ae1 Author: Chip Childers <[email protected]> Authored: Mon Aug 20 11:27:50 2012 -0400 Committer: Chip Childers <[email protected]> Committed: Mon Aug 20 11:27:50 2012 -0400 ---------------------------------------------------------------------- LICENSE | 28 ++++++++++++++++++++++++++++ tools/whisker/descriptor.xml | 10 ++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/754d965f/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 9d10bf7..3af322b 100644 --- a/LICENSE +++ b/LICENSE @@ -247,6 +247,34 @@ Within the awsapi directory waf +Within the console-proxy/js directory + licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) + + Copyright � 2011, John Resig + + 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 John Resig + jquery.js + + Within the target/jar directory placed in the public domain by Distributed Computing Laboratory at Emory University http://creativecommons.org/licenses/publicdomain/ http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/754d965f/tools/whisker/descriptor.xml ---------------------------------------------------------------------- diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml index 59381bf..12458aa 100644 --- a/tools/whisker/descriptor.xml +++ b/tools/whisker/descriptor.xml @@ -1605,6 +1605,16 @@ Copyright © 2005-2010 Thomas Nagy </by-organisation> </with-license> </within> + <within dir='console-proxy/js'> + <with-license id='MIT'> + <copyright-notice> +Copyright © 2011, John Resig + </copyright-notice> + <by-organisation id='person:john.resig'> + <resource name="jquery.js" notice='jquery.notice' /> + </by-organisation> + </with-license> + </within> <within dir='ui/lib'> <with-license id='MIT'> <copyright-notice>
