incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [12/38] 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>
Date Mon, 18 Feb 2013 17:21:26 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6279433f/tools/whisker/descriptor-for-packaging.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml
index 29a8284..3db7418 100644
--- a/tools/whisker/descriptor-for-packaging.xml
+++ b/tools/whisker/descriptor-for-packaging.xml
@@ -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.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6279433f/tools/whisker/descriptor.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
index 8e39586..0b3e508 100644
--- a/tools/whisker/descriptor.xml
+++ b/tools/whisker/descriptor.xml
@@ -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.


Mime
View raw message