Skip to content

Commit 719ccab

Browse files
chipchilderschipchilders
committed
Worked around a Whisker bug for the LICENSE file.
1 parent e2730c9 commit 719ccab

2 files changed

Lines changed: 28 additions & 32 deletions

File tree

‎LICENSE‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2348,6 +2348,24 @@ Within the deps/awsapi-lib directory
23482348
javassist-3.9.0.GA.jar http://sourceforge.net/projects/jboss/files/Javassist/
23492349

23502350

2351+
Within the patches/systemvm/debian/config/etc directory
2352+
placed in the public domain
2353+
by Simon Kelley
2354+
dnsmasq.conf
2355+
vpcdnsmasq.conf
2356+
2357+
2358+
Within the patches/systemvm/debian/config/etc/apache2 directory
2359+
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
2360+
Copyright � 2012 The Apache Software Foundation
2361+
from The Apache Software Foundation http://www.apache.org/
2362+
httpd.conf
2363+
ports.conf
2364+
sites-available/default
2365+
sites-available/default-ssl
2366+
vhostexample.conf
2367+
2368+
23512369
Within the scripts/storage/secondary directory
23522370
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
23532371
Copyright � 2010-2011 OpenStack, LLC.

‎tools/whisker/descriptor.xml‎

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,6 @@ KIND, either express or implied. See the License for the
1616
specific language governing permissions and limitations
1717
under the License.
1818
-->
19-
20-
<!--
21-
22-
The following source / binaries need to be either removed from the project
23-
completely, or set to be optional downloads / build features:
24-
25-
deps/XenServerJava/*
26-
deps/bin/*
27-
deps/cloud-iControl.jar
28-
deps/cloud-jasypt-1.8.jar
29-
deps/cloud-jnetpcap.jar
30-
deps/cloud-manageontap.jar
31-
deps/cloud-netscaler-sdx.jar
32-
deps/cloud-netscaler.jar
33-
deps/cloud-servlet-api.jar
34-
deps/cloud-xenserver-5.6.100-1.jar
35-
deps/libvirt-0.4.8.jar
36-
deps/vmware-apputils.jar
37-
deps/vmware-lib-jaxrpc.jar
38-
deps/vmware-vim.jar
39-
deps/vmware-vim25.jar
40-
deps/awsapi-lib/c3p0-0.9.1.2.jar < GPL!
41-
deps/awsapi-lib/hibernate3.jar < GPL!
42-
-->
43-
44-
4519
<manifest>
4620
<licenses>
4721
<license name='COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0' id='CDDL'
@@ -2283,6 +2257,10 @@ this distribution.
22832257
id='apache.org'
22842258
name='The Apache Software Foundation'
22852259
url='http://www.apache.org/'/>
2260+
<organisation
2261+
id='apache.org.2'
2262+
name='The Apache Software Foundation'
2263+
url='http://www.apache.org/'/>
22862264
<organisation
22872265
id='person:Thomas.Nagy'
22882266
name='Thomas Nagy'
@@ -2443,7 +2421,7 @@ Copyright © 2005-2010 Thomas Nagy
24432421
<copyright-notice>
24442422
Copyright © 2012 The Apache Software Foundation
24452423
</copyright-notice>
2446-
<by-organisation id='apache.org'>
2424+
<by-organisation id='apache.org.2'>
24472425
<resource name='httpd.conf' />
24482426
<resource name='ports.conf' />
24492427
<resource name='vhostexample.conf' />
@@ -2454,7 +2432,7 @@ Copyright © 2012 The Apache Software Foundation
24542432
</within>
24552433
<within dir='patches/systemvm/debian/config/etc'>
24562434
<public-domain>
2457-
<by-organisation id='person:simon.kelly'>
2435+
<by-organisation id='person:simon.kelley'>
24582436
<resource name='vpcdnsmasq.conf' />
24592437
<resource name='dnsmasq.conf' />
24602438
</by-organisation>
@@ -2609,7 +2587,7 @@ Copyright © 2004 Clinton Begin
26092587
<copyright-notice>
26102588
Copyright © 2012 The Apache Software Foundation
26112589
</copyright-notice>
2612-
<by-organisation id="apache.org">
2590+
<by-organisation id="apache.org.2">
26132591
<resource name="cloud-axis.jar" source="http://axis.apache.org/axis/" notice='axis2.notice'/>
26142592
<resource name="cloud-commons-codec-1.5.jar" source="http://commons.apache.org/codec/" notice="codec" />
26152593
<resource name="cloud-commons-collections-3.2.1.jar" source="http://commons.apache.org/collections/"/>
@@ -2631,7 +2609,7 @@ Copyright © 2012 The Apache Software Foundation
26312609
<copyright-notice>
26322610
Copyright © 2012 The Apache Software Foundation
26332611
</copyright-notice>
2634-
<by-organisation id="apache.org">
2612+
<by-organisation id="apache.org.2">
26352613
<resource name="cloud-commons-discovery.jar" source="http://commons.apache.org/discovery/" />
26362614
</by-organisation>
26372615
</with-license>
@@ -2774,7 +2752,7 @@ Copyright © 2010-2011 OpenStack, LLC.
27742752
<copyright-notice>
27752753
Copyright © 2004-2008 The Apache Software Foundation
27762754
</copyright-notice>
2777-
<by-organisation id='apache.org'>
2755+
<by-organisation id='apache.org.2'>
27782756
<resource name='XmlSchema-1.4.3.jar' notice='xmlschema.notice' />
27792757
</by-organisation>
27802758
</with-license>
@@ -2797,7 +2775,7 @@ Copyright © 2004-2011 QOS.ch
27972775
<copyright-notice>
27982776
Copyright © 2004-2012 The Apache Software Foundation
27992777
</copyright-notice>
2800-
<by-organisation id="apache.org">
2778+
<by-organisation id="apache.org.2">
28012779
<resource name="apache-log4j-extras-1.0.jar" source="http://logging.apache.org/log4j/companions/extras/" />
28022780
<resource name="axiom-api-1.2.8.jar" source="http://ws.apache.org/axiom/source-repository.html" notice="axiom.notice" />
28032781
<resource name="axiom-impl-1.2.8.jar" source="http://ws.apache.org/axiom/source-repository.html" notice="axiom.notice" />

0 commit comments

Comments
 (0)