incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject git commit: refs/heads/4.1 - CLOUDSTACK-1233: Fixed veewee config file legal documentation
Date Tue, 12 Feb 2013 02:57:27 GMT
Updated Branches:
  refs/heads/4.1 203fb466d -> 86f5b424b


CLOUDSTACK-1233: Fixed veewee config file legal documentation

The veewee configuration files used for the devcloud base-box build, as
well as the newly introduced files used to create a system vm, were
inappropriately identified as ASLv2 licensed and copyrighted by the ASF.

The fixes:
- The ASF headers stripped to match the source.
- The files are now excluded from RAT checks in the root pom.
- The tools/whisker/descriptor.xml file updated
- The root LICENSE and NOTICE were re-generated

Changes in the Apache Whisker templates for LICENSE and NOTICE files
caused a good bit of whitespace oddness in this commit for those 2
files.

Signed-off-by: Chip Childers <chip.childers@gmail.com>

Conflicts:

	tools/appliance/definitions/systemvmtemplate/base.sh
	tools/appliance/definitions/systemvmtemplate/cleanup.sh
	tools/appliance/definitions/systemvmtemplate/zerodisk.sh


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/86f5b424
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/86f5b424
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/86f5b424

Branch: refs/heads/4.1
Commit: 86f5b424b5a0a0580ab5090c577021ea98c59320
Parents: 203fb46
Author: Chip Childers <chip.childers@gmail.com>
Authored: Mon Feb 11 21:40:06 2013 -0500
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Mon Feb 11 21:54:49 2013 -0500

----------------------------------------------------------------------
 LICENSE                                            |  185 +++++++++------
 NOTICE                                             |   49 ++--
 pom.xml                                            |   10 +-
 .../definitions/systemvmtemplate/definition.rb     |   17 --
 .../definitions/systemvmtemplate/preseed.cfg       |   17 --
 .../src/deps/boxes/basebox-build/definition.rb     |   17 --
 .../src/deps/boxes/basebox-build/preseed.cfg       |   17 --
 tools/whisker/descriptor.xml                       |   31 +++-
 8 files changed, 177 insertions(+), 166 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/86f5b424/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 73bc738..eda9587 100644
--- a/LICENSE
+++ b/LICENSE
@@ -180,7 +180,6 @@ Copyright (c) 2013 The Apache Software Foundation
             
 
 This distribution contains third party resources.
-
 Within the . directory
     licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause  (as
follows)
 
@@ -209,10 +208,9 @@ Within the . directory
               CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
               ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
               THE POSSIBILITY OF SUCH DAMAGE.
-                            
+                        
         from Thomas Nagy  http://code.google.com/p/waf/ 
-            waf             
-
+            waf 
 
 Within the awsapi directory
     licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause  (as
follows)
@@ -242,10 +240,9 @@ Within the awsapi directory
               CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
               ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
               THE POSSIBILITY OF SUCH DAMAGE.
-                            
+                        
         from Thomas Nagy  http://code.google.com/p/waf/ 
-            waf             
-
+            waf 
 
 Within the console-proxy/js directory
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
@@ -270,10 +267,9 @@ Within the console-proxy/js directory
             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             
-
+            jquery.js 
 
 Within the deps directory
     licensed under the BSD (2-clause) for XenServerJava http://www.opensource.org/licenses/BSD-2-Clause
 (as follows)
@@ -304,28 +300,27 @@ Within the deps directory
             THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
             (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
             OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-                            
+                        
         from Citrix Systems, Inc  http://www.citrix.com/ 
-            XenServerJava  http://community.citrix.com/cdn/xs/sdks/             
-
+            XenServerJava  from http://community.citrix.com/cdn/xs/sdks/
 
 Within the patches/systemvm/debian/config/etc directory
     placed in the public domain
+        by Adiscon GmbH  http://www.adiscon.com/ 
+            rsyslog.conf 
         by Simon Kelley   
-            dnsmasq.conf
-            vpcdnsmasq.conf
-
+            dnsmasq.conf 
+            vpcdnsmasq.conf 
 
 Within the patches/systemvm/debian/config/etc/apache2 directory
     licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt
 (as above)
     Copyright (c) 2012 The Apache Software Foundation
         from The Apache Software Foundation  http://www.apache.org/ 
-            httpd.conf             
-            ports.conf             
-            sites-available/default             
-            sites-available/default-ssl             
-            vhostexample.conf             
-
+            httpd.conf 
+            ports.conf 
+            sites-available/default 
+            sites-available/default-ssl 
+            vhostexample.conf 
 
 Within the patches/systemvm/debian/config/etc/ssh/ directory
     licensed under the BSD (2-clause) http://www.opensource.org/licenses/BSD-2-Clause  (as
follows)
@@ -354,40 +349,95 @@ Within the patches/systemvm/debian/config/etc/ssh/ directory
             ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
             (INCLUDING  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
             SOFTWARE, EVEN IF ADVISED  OF THE POSSIBILITY OF SUCH DAMAGE.
-                            
+                        
         from OpenSSH Project  http://www.openssh.org/ 
-            sshd_config             
-
+            sshd_config 
 
 Within the patches/systemvm/debian/config/root/redundant_router directory
     placed in the public domain
         by The netfilter.org project  http://www.netfilter.org/ 
-            conntrackd.conf.templ
-
+            conntrackd.conf.templ 
 
 Within the scripts/storage/secondary directory
     licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt
 (as above)
     Copyright (c) 2010-2011 OpenStack, LLC.
         from OpenStack, LLC  http://www.openstack.org 
-            swift             
-
+            swift 
 
 Within the scripts/vm/hypervisor/xenserver directory
     licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt
 (as above)
     Copyright (c) 2010-2011 OpenStack, LLC.
         from OpenStack, LLC  http://www.openstack.org 
-            swift             
+            swift 
 
+Within the tools/appliance/definitions/systemvmtemplate directory
+    licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
+
+            Copyright (c) 2010-2012 Patrick Debois 
+            
+            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 Patrick Debois  http://www.jedi.be/blog/ 
+            base.sh  from https://github.com/jedi4ever/veewee
+            cleanup.sh  from https://github.com/jedi4ever/veewee
+            definition.rb  from https://github.com/jedi4ever/veewee
+            preseed.cfg  from https://github.com/jedi4ever/veewee
+            zerodisk.sh  from https://github.com/jedi4ever/veewee
+
+Within the tools/devcloud/src/deps/boxes/basebox-build directory
+    licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
+
+            Copyright (c) 2010-2012 Patrick Debois 
+            
+            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 Patrick Debois  http://www.jedi.be/blog/ 
+            definition.rb  from https://github.com/jedi4ever/veewee
+            preseed.cfg  from https://github.com/jedi4ever/veewee
 
 Within the ui/lib directory
     placed in the public domain
         by Eric Meyer  http://meyerweb.com/eric/ 
-            reset.css
+            reset.css  from http://meyerweb.com/eric/tools/css/reset/
 
     licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt
 (as above)
     Copyright (c) 2006 Google Inc.
         from Google Inc.  http://google.com 
-            excanvas.js  http://code.google.com/p/explorercanvas/             
+            excanvas.js  from http://code.google.com/p/explorercanvas/
 
     licensed under the BSD (2-clause) http://www.opensource.org/licenses/BSD-2-Clause  (as
follows)
 
@@ -417,9 +467,9 @@ Within the ui/lib directory
             ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
             (INCLUDING  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
             SOFTWARE, EVEN IF ADVISED  OF THE POSSIBILITY OF SUCH DAMAGE.
-                            
+                        
         from George McGinley Smith   
-            jquery.easing.js             
+            jquery.easing.js 
 
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
 
@@ -443,9 +493,9 @@ Within the ui/lib directory
             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             
+            jquery.js 
 
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
 
@@ -469,9 +519,9 @@ Within the ui/lib directory
             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 Jorn Zaefferer   
-            jquery.validate.js             
+            jquery.validate.js 
 
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
 
@@ -495,9 +545,9 @@ Within the ui/lib directory
             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 Sebastian Tschan  https://blueimp.net 
-            jquery.md5.js             
+            jquery.md5.js 
 
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
 
@@ -521,10 +571,9 @@ Within the ui/lib directory
             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 Klaus Hartl  http://stilbuero.de 
-            jquery.cookies.js             
-
+            jquery.cookies.js 
 
 Within the ui/lib/flot directory
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
@@ -549,18 +598,18 @@ Within the ui/lib/flot directory
             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 IOLA  http://www.iola.dk/ 
-            jquery.flot.crosshair.js             
-            jquery.flot.fillbetween.js             
-            jquery.flot.image.js             
-            jquery.flot.js             
-            jquery.flot.navigate.js             
-            jquery.flot.resize.js             
-            jquery.flot.selection.js             
-            jquery.flot.stack.js             
-            jquery.flot.symbol.js             
-            jquery.flot.threshold.js             
+            jquery.flot.crosshair.js 
+            jquery.flot.fillbetween.js 
+            jquery.flot.image.js 
+            jquery.flot.js 
+            jquery.flot.navigate.js 
+            jquery.flot.resize.js 
+            jquery.flot.selection.js 
+            jquery.flot.stack.js 
+            jquery.flot.symbol.js 
+            jquery.flot.threshold.js 
 
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
 
@@ -585,9 +634,9 @@ Within the ui/lib/flot directory
             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 Brian Medendorp   
-            jquery.pie.js             
+            jquery.pie.js 
 
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
  
@@ -610,10 +659,9 @@ Within the ui/lib/flot directory
             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 Ole Laursen   
-            jquery.colorhelpers.js             
-
+            jquery.colorhelpers.js 
 
 Within the ui/lib/jquery-ui directory
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
@@ -637,12 +685,11 @@ Within the ui/lib/jquery-ui directory
             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 jQuery UI Developers  http://jqueryui.com/about 
-            css/jquery-ui.css             
-            index.html             
-            js/jquery-ui.js             
-
+            css/jquery-ui.css 
+            index.html 
+            js/jquery-ui.js 
 
 Within the ui/lib/qunit directory
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
@@ -667,14 +714,14 @@ Within the ui/lib/qunit directory
             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 Jorn Zaefferer   
-            qunit.css  http://docs.jquery.com/QUnit             
-            qunit.js  http://docs.jquery.com/QUnit             
-
+            qunit.css  from http://docs.jquery.com/QUnit
+            qunit.js  from http://docs.jquery.com/QUnit
 
 Within the utils/src/com/cloud/utils/db directory
     licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt
 (as above)
     Copyright (c) 2004 Clinton Begin
         from Clinton Begin  http://code.google.com/p/mybatis/ 
-            ScriptRunner.java  http://code.google.com/p/mybatis/
+            ScriptRunner.java  from http://code.google.com/p/mybatis/
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/86f5b424/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 5cdd9fc..d36048a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -6,30 +6,7 @@
 
 
   
-  Source code distribution if this software contains third party resources requiring 
-  the following notices:
-
-    
-  For 
-    jquery.md5.js
-  
-
-        jQuery MD5 Plugin 1.2.1
-        https://github.com/blueimp/jQuery-MD5
-        
-        Copyright 2010, Sebastian Tschan
-        https://blueimp.net
-        
-        Licensed under the MIT license:
-        http://creativecommons.org/licenses/MIT/
-        
-        Based on
-        A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
-        Digest Algorithm, as defined in RFC 1321.
-        Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
-        Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
-        Distributed under the BSD License
-        See http://pajhome.org.uk/crypt/md5 for more info.
+  This distribution contains third party resources requiring the following notices:
 
     
   For 
@@ -67,6 +44,28 @@
 
     
   For 
+    jquery.md5.js
+  
+
+        jQuery MD5 Plugin 1.2.1
+        https://github.com/blueimp/jQuery-MD5
+        
+        Copyright 2010, Sebastian Tschan
+        https://blueimp.net
+        
+        Licensed under the MIT license:
+        http://creativecommons.org/licenses/MIT/
+        
+        Based on
+        A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+        Digest Algorithm, as defined in RFC 1321.
+        Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
+        Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+        Distributed under the BSD License
+        See http://pajhome.org.uk/crypt/md5 for more info.
+
+    
+  For 
     jquery.colorhelpers.js
   
 
@@ -76,4 +75,4 @@
         
         Inspiration from jQuery color animation plugin by John Resig.
         
-        Released under the MIT license by Ole Laursen, October 2009.
\ No newline at end of file
+        Released under the MIT license by Ole Laursen, October 2009.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/86f5b424/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5a1f66e..9a07769 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,6 +372,13 @@
               <exclude>dist/console-proxy/js/jquery.js</exclude>
               <exclude>scripts/vm/systemvm/id_rsa.cloud</exclude>
               <exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude>
+              <exclude>tools/appliance/definitions/systemvmtemplate/base.sh</exclude>
+              <exclude>tools/appliance/definitions/systemvmtemplate/cleanup.sh</exclude>
+              <exclude>tools/appliance/definitions/systemvmtemplate/definition.rb</exclude>
+              <exclude>tools/appliance/definitions/systemvmtemplate/preseed.cfg</exclude>
+              <exclude>tools/appliance/definitions/systemvmtemplate/zerodisk.sh</exclude>
+              <exclude>tools/devcloud/src/deps/boxes/basebox-build/definition.rb</exclude>
+              <exclude>tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg</exclude>
               <exclude>ui/lib/flot/jquery.colorhelpers.js</exclude>
               <exclude>ui/lib/flot/jquery.flot.crosshair.js</exclude>
               <exclude>ui/lib/flot/jquery.flot.fillbetween.js</exclude>
@@ -406,16 +413,13 @@
               <exclude>patches/systemvm/debian/config/etc/dnsmasq.conf</exclude>
               <exclude>patches/systemvm/debian/config/etc/vpcdnsmasq.conf</exclude>
               <exclude>patches/systemvm/debian/config/etc/ssh/sshd_config</exclude>
-              <!-- Pending resolution of CLOUDSTACK-145 -->
               <exclude>patches/systemvm/debian/config/etc/rsyslog.conf</exclude>
-              <!-- Pending resolution of CLOUDSTACK-147 -->
               <exclude>patches/systemvm/debian/config/etc/logrotate.conf</exclude>
               <exclude>patches/systemvm/debian/config/etc/logrotate.d/*</exclude>
               <exclude>patches/systemvm/debian/config/etc/sysctl.conf</exclude>
               <exclude>patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ</exclude>
               <exclude>patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude>
               <exclude>patches/systemvm/debian/config/root/redundant_router/conntrackd.conf.templ</exclude>
-              <!-- Pending resolution of CLOUDSTACK-166 -->
               <exclude>patches/systemvm/debian/vpn/etc/ipsec.conf</exclude>
               <exclude>patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd</exclude>
               <exclude>patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf</exclude>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/86f5b424/tools/appliance/definitions/systemvmtemplate/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb b/tools/appliance/definitions/systemvmtemplate/definition.rb
index aebb4f2..9cc7627 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -1,20 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 Veewee::Definition.declare({
   :cpu_count => '1',
   :memory_size=> '256',

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/86f5b424/tools/appliance/definitions/systemvmtemplate/preseed.cfg
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/preseed.cfg b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
index 2b956e1..2505f87 100644
--- a/tools/appliance/definitions/systemvmtemplate/preseed.cfg
+++ b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
@@ -1,20 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 #### Contents of the preconfiguration file (for squeeze)
 ### Localization
 # Locale sets language and country.

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/86f5b424/tools/devcloud/src/deps/boxes/basebox-build/definition.rb
----------------------------------------------------------------------
diff --git a/tools/devcloud/src/deps/boxes/basebox-build/definition.rb b/tools/devcloud/src/deps/boxes/basebox-build/definition.rb
index 2466842..f7e3c11 100644
--- a/tools/devcloud/src/deps/boxes/basebox-build/definition.rb
+++ b/tools/devcloud/src/deps/boxes/basebox-build/definition.rb
@@ -1,20 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 Veewee::Session.declare({
   :cpu_count => '1',
   :memory_size=> '2048',

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/86f5b424/tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg b/tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
index 00bae61..dd6a24a 100644
--- a/tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
+++ b/tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
@@ -1,20 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 ## Options to set on the command line
 d-i debian-installer/locale string en_US.utf8
 d-i console-setup/ask_detect boolean false

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/86f5b424/tools/whisker/descriptor.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
index 5f324a5..8e39586 100644
--- a/tools/whisker/descriptor.xml
+++ b/tools/whisker/descriptor.xml
@@ -2423,6 +2423,10 @@ Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
             id='adiscon.com'
             name='Adiscon GmbH'
             url='http://www.adiscon.com/' />
+        <organisation
+            id='person:patrick.debois'
+            name='Patrick Debois'
+            url='http://www.jedi.be/blog/' />
     </organisations>
     <primary-license id='ApacheLicenseVersion2'>
         <copyright-notice>Copyright (c) 2013 The Apache Software Foundation</copyright-notice>
@@ -2653,5 +2657,30 @@ Copyright (c) 2010-2011 OpenStack, LLC.
 				<resource name='swift' />
 			</by-organisation>
 		</with-license>
-	</within>
+    </within>
+    <within dir='tools/appliance/definitions/systemvmtemplate'>
+        <with-license id='MIT'>
+            <copyright-notice>
+Copyright (c) 2010-2012 Patrick Debois
+            </copyright-notice>
+            <by-organisation id='person:patrick.debois'>
+                <resource name='base.sh' source='https://github.com/jedi4ever/veewee'
/>
+                <resource name='cleanup.sh' source='https://github.com/jedi4ever/veewee'
/>
+                <resource name='definition.rb' source='https://github.com/jedi4ever/veewee'
/>
+                <resource name='preseed.cfg' source='https://github.com/jedi4ever/veewee'
/>
+                <resource name='zerodisk.sh' source='https://github.com/jedi4ever/veewee'
/>
+            </by-organisation>
+        </with-license>
+    </within>
+    <within dir='tools/devcloud/src/deps/boxes/basebox-build'>
+        <with-license id='MIT'>
+            <copyright-notice>
+Copyright (c) 2010-2012 Patrick Debois
+            </copyright-notice>
+            <by-organisation id='person:patrick.debois'>
+                <resource name='definition.rb' source='https://github.com/jedi4ever/veewee'
/>
+                <resource name='preseed.cfg' source='https://github.com/jedi4ever/veewee'
/>
+            </by-organisation>
+        </with-license>
+    </within>
 </manifest>


Mime
View raw message