Skip to content

Commit ebe738e

Browse files
chipchilderschipchilders
committed
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>
1 parent 52b81f8 commit ebe738e

12 files changed

Lines changed: 177 additions & 239 deletions

File tree

‎LICENSE‎

Lines changed: 116 additions & 69 deletions
Large diffs are not rendered by default.

‎NOTICE‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,7 @@
66

77

88

9-
Source code distribution if this software contains third party resources requiring
10-
the following notices:
11-
12-
13-
For
14-
jquery.md5.js
15-
16-
17-
jQuery MD5 Plugin 1.2.1
18-
https://github.com/blueimp/jQuery-MD5
19-
20-
Copyright 2010, Sebastian Tschan
21-
https://blueimp.net
22-
23-
Licensed under the MIT license:
24-
http://creativecommons.org/licenses/MIT/
25-
26-
Based on
27-
A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
28-
Digest Algorithm, as defined in RFC 1321.
29-
Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
30-
Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
31-
Distributed under the BSD License
32-
See http://pajhome.org.uk/crypt/md5 for more info.
9+
This distribution contains third party resources requiring the following notices:
3310

3411

3512
For
@@ -66,6 +43,28 @@
6643
Date: Thu May 12 15:04:36 2011 -0400
6744

6845

46+
For
47+
jquery.md5.js
48+
49+
50+
jQuery MD5 Plugin 1.2.1
51+
https://github.com/blueimp/jQuery-MD5
52+
53+
Copyright 2010, Sebastian Tschan
54+
https://blueimp.net
55+
56+
Licensed under the MIT license:
57+
http://creativecommons.org/licenses/MIT/
58+
59+
Based on
60+
A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
61+
Digest Algorithm, as defined in RFC 1321.
62+
Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
63+
Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
64+
Distributed under the BSD License
65+
See http://pajhome.org.uk/crypt/md5 for more info.
66+
67+
6968
For
7069
jquery.colorhelpers.js
7170

@@ -76,4 +75,4 @@
7675

7776
Inspiration from jQuery color animation plugin by John Resig.
7877

79-
Released under the MIT license by Ole Laursen, October 2009.
78+
Released under the MIT license by Ole Laursen, October 2009.

‎pom.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,13 @@
372372
<exclude>dist/console-proxy/js/jquery.js</exclude>
373373
<exclude>scripts/vm/systemvm/id_rsa.cloud</exclude>
374374
<exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude>
375+
<exclude>tools/appliance/definitions/systemvmtemplate/base.sh</exclude>
376+
<exclude>tools/appliance/definitions/systemvmtemplate/cleanup.sh</exclude>
377+
<exclude>tools/appliance/definitions/systemvmtemplate/definition.rb</exclude>
378+
<exclude>tools/appliance/definitions/systemvmtemplate/preseed.cfg</exclude>
379+
<exclude>tools/appliance/definitions/systemvmtemplate/zerodisk.sh</exclude>
380+
<exclude>tools/devcloud/src/deps/boxes/basebox-build/definition.rb</exclude>
381+
<exclude>tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg</exclude>
375382
<exclude>ui/lib/flot/jquery.colorhelpers.js</exclude>
376383
<exclude>ui/lib/flot/jquery.flot.crosshair.js</exclude>
377384
<exclude>ui/lib/flot/jquery.flot.fillbetween.js</exclude>
@@ -406,16 +413,13 @@
406413
<exclude>patches/systemvm/debian/config/etc/dnsmasq.conf</exclude>
407414
<exclude>patches/systemvm/debian/config/etc/vpcdnsmasq.conf</exclude>
408415
<exclude>patches/systemvm/debian/config/etc/ssh/sshd_config</exclude>
409-
<!-- Pending resolution of CLOUDSTACK-145 -->
410416
<exclude>patches/systemvm/debian/config/etc/rsyslog.conf</exclude>
411-
<!-- Pending resolution of CLOUDSTACK-147 -->
412417
<exclude>patches/systemvm/debian/config/etc/logrotate.conf</exclude>
413418
<exclude>patches/systemvm/debian/config/etc/logrotate.d/*</exclude>
414419
<exclude>patches/systemvm/debian/config/etc/sysctl.conf</exclude>
415420
<exclude>patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ</exclude>
416421
<exclude>patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ</exclude>
417422
<exclude>patches/systemvm/debian/config/root/redundant_router/conntrackd.conf.templ</exclude>
418-
<!-- Pending resolution of CLOUDSTACK-166 -->
419423
<exclude>patches/systemvm/debian/vpn/etc/ipsec.conf</exclude>
420424
<exclude>patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd</exclude>
421425
<exclude>patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf</exclude>

‎tools/appliance/definitions/systemvmtemplate/LICENSE‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎tools/appliance/definitions/systemvmtemplate/base.sh‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
18-
191
# Update the box
202
apt-get -y update
213
#below are needed for ruby perhaps

‎tools/appliance/definitions/systemvmtemplate/cleanup.sh‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
181
# Clean up
192
#apt-get -y remove linux-headers-$(uname -r) build-essential
203
apt-get -y remove dictionaries-common busybox

‎tools/appliance/definitions/systemvmtemplate/definition.rb‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
181
Veewee::Definition.declare({
192
:cpu_count => '1',
203
:memory_size=> '256',

‎tools/appliance/definitions/systemvmtemplate/preseed.cfg‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
181
#### Contents of the preconfiguration file (for squeeze)
192
### Localization
203
# Locale sets language and country.

‎tools/appliance/definitions/systemvmtemplate/zerodisk.sh‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
181
#clean up stuff copied in by veewee
192
rm -f /root/*
203

‎tools/devcloud/src/deps/boxes/basebox-build/definition.rb‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
181
Veewee::Session.declare({
192
:cpu_count => '1',
203
:memory_size=> '2048',

0 commit comments

Comments
 (0)