incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [3/45] git commit: refs/heads/storage_refactor - Updating the java-ipv6 legal docs to reflect the newly added NOTICE and copyright statements for version 0.10
Date Thu, 21 Feb 2013 19:15:17 GMT
Updating the java-ipv6 legal docs to reflect the newly added NOTICE and copyright statements
for version 0.10

Signed-off-by: Chip Childers <chip.childers@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/6c9eb6c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6c9eb6c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6c9eb6c1

Branch: refs/heads/storage_refactor
Commit: 6c9eb6c11c26ef0ff6e2b5d0e6188079470f57e0
Parents: ec1f48a
Author: Chip Childers <chip.childers@gmail.com>
Authored: Wed Feb 20 14:50:36 2013 -0500
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Wed Feb 20 14:50:36 2013 -0500

----------------------------------------------------------------------
 tools/whisker/LICENSE                      |    2 +-
 tools/whisker/NOTICE                       |    8 ++++++++
 tools/whisker/descriptor-for-packaging.xml |   10 ++++++++--
 3 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6c9eb6c1/tools/whisker/LICENSE
----------------------------------------------------------------------
diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE
index 2f99021..2e17633 100644
--- a/tools/whisker/LICENSE
+++ b/tools/whisker/LICENSE
@@ -2995,7 +2995,7 @@ Within the target/jar directory
             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)
-    
+    Copyright 2013 Jan Van Besien
         from Jan Van Besien  mailto:janvanbesien@gmail.com 
             java-ipv6.jar  from http://code.google.com/p/java-ipv6
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6c9eb6c1/tools/whisker/NOTICE
----------------------------------------------------------------------
diff --git a/tools/whisker/NOTICE b/tools/whisker/NOTICE
index 1867958..6986990 100644
--- a/tools/whisker/NOTICE
+++ b/tools/whisker/NOTICE
@@ -243,6 +243,14 @@
 
     
   For 
+    java-ipv6.jar
+  
+
+        Java IPv6
+           Copyright 2013 Jan Van Besien
+
+    
+  For 
     cloud-jasypt-1.9.jar
   
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6c9eb6c1/tools/whisker/descriptor-for-packaging.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml
index 5f6a49a..ed2c936 100644
--- a/tools/whisker/descriptor-for-packaging.xml
+++ b/tools/whisker/descriptor-for-packaging.xml
@@ -2261,6 +2261,10 @@ The Apache Software Foundation (http://www.apache.org/).
 This product includes software Copyright University of Southampton IT
 Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
         </notice>
+        <notice id='java-ipv6.notice'>
+   Java IPv6
+   Copyright 2013 Jan Van Besien
+        </notice>
     </notices>
     <organisations>
         <organisation 
@@ -2840,9 +2844,11 @@ All rights reserved.
             </by-organisation>
         </public-domain>
         <with-license id='ApacheLicenseVersion2'>
-            <copyright-notice></copyright-notice>
+            <copyright-notice>
+Copyright 2013 Jan Van Besien
+            </copyright-notice>
             <by-organisation id='person:janvanbesien'>
-                <resource name='java-ipv6.jar' source='http://code.google.com/p/java-ipv6'
/>
+                <resource name='java-ipv6.jar' source='http://code.google.com/p/java-ipv6'
notice='java-ipv6.notice' />
             </by-organisation>
         </with-license>
         <with-license id='ApacheLicenseVersion2'>


Mime
View raw message