You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/02/20 22:42:44 UTC
[4/50] [abbrv] git commit: refs/heads/storage_refactor - Adding legal
docs for java-ipv6.jar
Adding legal docs for java-ipv6.jar
Signed-off-by: Chip Childers <ch...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e4baff22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e4baff22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e4baff22
Branch: refs/heads/storage_refactor
Commit: e4baff2281526c7725785a3f14bb352222f7eb9c
Parents: 018554c
Author: Chip Childers <ch...@gmail.com>
Authored: Tue Feb 19 13:00:11 2013 -0500
Committer: Chip Childers <ch...@gmail.com>
Committed: Tue Feb 19 13:00:11 2013 -0500
----------------------------------------------------------------------
tools/whisker/LICENSE | 5 +++++
tools/whisker/descriptor-for-packaging.xml | 10 ++++++++++
2 files changed, 15 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e4baff22/tools/whisker/LICENSE
----------------------------------------------------------------------
diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE
index 7ef2e45..4080d9c 100644
--- a/tools/whisker/LICENSE
+++ b/tools/whisker/LICENSE
@@ -2994,6 +2994,11 @@ Within the target/jar directory
jetty-6.1.26.jar from http://repo1.maven.org/maven2/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26-sources.jar
jetty-util-6.1.26.jar from http://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26-sources.jar
+ licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
+
+ from Jan Van Besien mailto:janvanbesien@gmail.com
+ java-ipv6.jar from http://code.google.com/p/java-ipv6
+
licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows)
Copyright (c) 2009, Caringo, Inc.
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e4baff22/tools/whisker/descriptor-for-packaging.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml
index 3db7418..cc661b7 100644
--- a/tools/whisker/descriptor-for-packaging.xml
+++ b/tools/whisker/descriptor-for-packaging.xml
@@ -2431,6 +2431,10 @@ Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
id='dojofoundation.org'
name='The Dojo Foundation'
url='http://dojofoundation.org/' />
+ <organisation
+ id='person:janvanbesien'
+ name='Jan Van Besien'
+ url='mailto:janvanbesien@gmail.com' />
</organisations>
<primary-license id='ApacheLicenseVersion2'>
<copyright-notice>Copyright (c) 2013 The Apache Software Foundation</copyright-notice>
@@ -2827,6 +2831,12 @@ All rights reserved.
<resource name='cloud-backport-util-concurrent-3.0.jar' source='http://backport-jsr166.sourceforge.net/' />
</by-organisation>
</public-domain>
+ <with-license id='ApacheLicenseVersion2'>
+ <copyright-notice></copyright-notice>
+ <by-organisation id='person:janvanbesien'>
+ <resource name='java-ipv6.jar' source='http://code.google.com/p/java-ipv6' />
+ </by-organisation>
+ </with-license>
</within>
<within dir='deps/awsapi-lib'>
<with-license id='ApacheLicenseVersion2'>