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 - Adding legal documentation for the Java IPv6 library
Date Tue, 19 Feb 2013 17:40:28 GMT
Updated Branches:
  refs/heads/4.1 2c102ca0e -> 12630b4f0


Adding legal documentation for the Java IPv6 library

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/12630b4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/12630b4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/12630b4f

Branch: refs/heads/4.1
Commit: 12630b4f09fa7062ef6e20dd67f72dd657044382
Parents: 2c102ca
Author: Chip Childers <chip.childers@gmail.com>
Authored: Tue Feb 19 12:30:12 2013 -0500
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Tue Feb 19 12:39:05 2013 -0500

----------------------------------------------------------------------
 tools/whisker/LICENSE                      |  183 ++++++++++++-----------
 tools/whisker/descriptor-for-packaging.xml |   10 ++
 2 files changed, 102 insertions(+), 91 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/12630b4f/tools/whisker/LICENSE
----------------------------------------------------------------------
diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE
index 025cb33..afa7433 100644
--- a/tools/whisker/LICENSE
+++ b/tools/whisker/LICENSE
@@ -376,6 +376,11 @@ Within the deps/awsapi-lib directory
         from Json.simple Project  http://code.google.com/p/json-simple/ 
             json_simple-1.1.jar  from http://code.google.com/p/json-simple/source/checkout
 
+    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) 2002-2011 Atsuhiko Yamanaka, JCraft,Inc. 
@@ -748,7 +753,7 @@ Within the deps/awsapi-lib directory
             
             The Covered Software is a "commercial item," as that term is
             defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-            computer software" (as that term is defined at 48 C.F.R. �
+            computer software" (as that term is defined at 48 C.F.R. ¤
             252.227-7014(a)(1)) and "commercial computer software
             documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
             1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
@@ -1138,7 +1143,7 @@ Within the deps/awsapi-lib directory
             
             The Covered Software is a "commercial item," as that term is
             defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-            computer software" (as that term is defined at 48 C.F.R. �
+            computer software" (as that term is defined at 48 C.F.R. ¤
             252.227-7014(a)(1)) and "commercial computer software
             documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
             1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
@@ -1526,7 +1531,7 @@ Within the deps/awsapi-lib directory
             
             The Covered Software is a "commercial item," as that term is
             defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-            computer software" (as that term is defined at 48 C.F.R. �
+            computer software" (as that term is defined at 48 C.F.R. ¤
             252.227-7014(a)(1)) and "commercial computer software
             documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
             1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
@@ -1867,9 +1872,7 @@ Within the deps/awsapi-lib directory
             slf4j-api-1.5.11.jar  from https://github.com/qos-ch/slf4j
             slf4j-jdk14-1.5.11.jar  from https://github.com/qos-ch/slf4j
 
-
     licensed under the Mozilla Public License, Version 1.1 http://www.mozilla.org/MPL/1.1/
 (as follows)
-
  
             
                                       MOZILLA PUBLIC LICENSE
@@ -2346,71 +2349,70 @@ Within the deps/awsapi-lib directory
         from Shigeru Chiba  http://www.csg.ci.i.u-tokyo.ac.jp/~chiba/javassist/ 
             javassist-3.9.0.GA.jar  from http://sourceforge.net/projects/jboss/files/Javassist/
 
-
     licensed under the Mozilla Public License, Version 1.1 http://www.mozilla.org/MPL/1.1/
 (as follows)
 
-            Copyright (c) 2007-2012 VMware, Inc.  All Rights Reserved.
-
+            Copyright (c) 2007-2012 VMware, Inc.  All Rights Reserved. 
+            
                                       MOZILLA PUBLIC LICENSE
                                             Version 1.1
-
+            
                                           ---------------
-
+            
             1. Definitions.
-
+            
                  1.0.1. "Commercial Use" means distribution or otherwise making the
                  Covered Code available to a third party.
-
+            
                  1.1. "Contributor" means each entity that creates or contributes to
                  the creation of Modifications.
-
+            
                  1.2. "Contributor Version" means the combination of the Original
                  Code, prior Modifications used by a Contributor, and the Modifications
                  made by that particular Contributor.
-
+            
                  1.3. "Covered Code" means the Original Code or Modifications or the
                  combination of the Original Code and Modifications, in each case
                  including portions thereof.
-
+            
                  1.4. "Electronic Distribution Mechanism" means a mechanism generally
                  accepted in the software development community for the electronic
                  transfer of data.
-
+            
                  1.5. "Executable" means Covered Code in any form other than Source
                  Code.
-
+            
                  1.6. "Initial Developer" means the individual or entity identified
                  as the Initial Developer in the Source Code notice required by Exhibit
                  A.
-
+            
                  1.7. "Larger Work" means a work which combines Covered Code or
                  portions thereof with code not governed by the terms of this License.
-
+            
                  1.8. "License" means this document.
-
+            
                  1.8.1. "Licensable" means having the right to grant, to the maximum
                  extent possible, whether at the time of the initial grant or
                  subsequently acquired, any and all of the rights conveyed herein.
-
+            
                  1.9. "Modifications" means any addition to or deletion from the
                  substance or structure of either the Original Code or any previous
                  Modifications. When Covered Code is released as a series of files, a
                  Modification is:
                       A. Any addition to or deletion from the contents of a file
                       containing Original Code or previous Modifications.
-
+            
                       B. Any new file that contains any part of the Original Code or
                       previous Modifications.
-
+            
                  1.10. "Original Code" means Source Code of computer software code
                  which is described in the Source Code notice required by Exhibit A as
                  Original Code, and which, at the time of its release under this
                  License is not already Covered Code governed by this License.
-
+            
                  1.10.1. "Patent Claims" means any patent claim(s), now owned or
                  hereafter acquired, including without limitation,  method, process,
                  and apparatus claims, in any patent Licensable by grantor.
-
+            
                  1.11. "Source Code" means the preferred form of the Covered Code for
                  making modifications to it, including all modules it contains, plus
                  any associated interface definition files, scripts used to control
@@ -2420,7 +2422,7 @@ Within the deps/awsapi-lib directory
                  Source Code can be in a compressed or archival form, provided the
                  appropriate decompression or de-archiving software is widely available
                  for no charge.
-
+            
                  1.12. "You" (or "Your")  means an individual or a legal entity
                  exercising rights under, and complying with all of the terms of, this
                  License or a future version of this License issued under Section 6.1.
@@ -2431,9 +2433,9 @@ Within the deps/awsapi-lib directory
                  contract or otherwise, or (b) ownership of more than fifty percent
                  (50%) of the outstanding shares or beneficial ownership of such
                  entity.
-
+            
             2. Source Code License.
-
+            
                  2.1. The Initial Developer Grant.
                  The Initial Developer hereby grants You a world-wide, royalty-free,
                  non-exclusive license, subject to third party intellectual property
@@ -2443,33 +2445,33 @@ Within the deps/awsapi-lib directory
                       modify, display, perform, sublicense and distribute the Original
                       Code (or portions thereof) with or without Modifications, and/or
                       as part of a Larger Work; and
-
+            
                       (b) under Patents Claims infringed by the making, using or
                       selling of Original Code, to make, have made, use, practice,
                       sell, and offer for sale, and/or otherwise dispose of the
                       Original Code (or portions thereof).
-
+            
                       (c) the licenses granted in this Section 2.1(a) and (b) are
                       effective on the date Initial Developer first distributes
                       Original Code under the terms of this License.
-
+            
                       (d) Notwithstanding Section 2.1(b) above, no patent license is
                       granted: 1) for code that You delete from the Original Code; 2)
                       separate from the Original Code;  or 3) for infringements caused
                       by: i) the modification of the Original Code or ii) the
                       combination of the Original Code with other software or devices.
-
+            
                  2.2. Contributor Grant.
                  Subject to third party intellectual property claims, each Contributor
                  hereby grants You a world-wide, royalty-free, non-exclusive license
-
+            
                       (a)  under intellectual property rights (other than patent or
                       trademark) Licensable by Contributor, to use, reproduce, modify,
                       display, perform, sublicense and distribute the Modifications
                       created by such Contributor (or portions thereof) either on an
                       unmodified basis, with other Modifications, as Covered Code
                       and/or as part of a Larger Work; and
-
+            
                       (b) under Patent Claims infringed by the making, using, or
                       selling of  Modifications made by that Contributor either alone
                       and/or in combination with its Contributor Version (or portions
@@ -2478,11 +2480,11 @@ Within the deps/awsapi-lib directory
                       Contributor (or portions thereof); and 2) the combination of
                       Modifications made by that Contributor with its Contributor
                       Version (or portions of such combination).
-
+            
                       (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
                       effective on the date Contributor first makes Commercial Use of
                       the Covered Code.
-
+            
                       (d)    Notwithstanding Section 2.2(b) above, no patent license is
                       granted: 1) for any code that Contributor has deleted from the
                       Contributor Version; 2)  separate from the Contributor Version;
@@ -2492,9 +2494,9 @@ Within the deps/awsapi-lib directory
                       Contributor Version) or other devices; or 4) under Patent Claims
                       infringed by Covered Code in the absence of Modifications made by
                       that Contributor.
-
+            
             3. Distribution Obligations.
-
+            
                  3.1. Application of License.
                  The Modifications which You create or to which You contribute are
                  governed by the terms of this License, including without limitation
@@ -2507,7 +2509,7 @@ Within the deps/awsapi-lib directory
                  License or the recipients' rights hereunder. However, You may include
                  an additional document offering the additional rights described in
                  Section 3.5.
-
+            
                  3.2. Availability of Source Code.
                  Any Modification which You create or to which You contribute must be
                  made available in Source Code form under the terms of this License
@@ -2520,7 +2522,7 @@ Within the deps/awsapi-lib directory
                  has been made available to such recipients. You are responsible for
                  ensuring that the Source Code version remains available even if the
                  Electronic Distribution Mechanism is maintained by a third party.
-
+            
                  3.3. Description of Modifications.
                  You must cause all Covered Code to which You contribute to contain a
                  file documenting the changes You made to create that Covered Code and
@@ -2530,7 +2532,7 @@ Within the deps/awsapi-lib directory
                  Initial Developer in (a) the Source Code, and (b) in any notice in an
                  Executable version or related documentation in which You describe the
                  origin or ownership of the Covered Code.
-
+            
                  3.4. Intellectual Property Matters
                       (a) Third Party Claims.
                       If Contributor has knowledge that a license under a third party's
@@ -2546,20 +2548,20 @@ Within the deps/awsapi-lib directory
                       (such as notifying appropriate mailing lists or newsgroups)
                       reasonably calculated to inform those who received the Covered
                       Code that new knowledge has been obtained.
-
+            
                       (b) Contributor APIs.
                       If Contributor's Modifications include an application programming
                       interface and Contributor has knowledge of patent licenses which
                       are reasonably necessary to implement that API, Contributor must
                       also include this information in the LEGAL file.
-
+            
                            (c)    Representations.
                       Contributor represents that, except as disclosed pursuant to
                       Section 3.4(a) above, Contributor believes that Contributor's
                       Modifications are Contributor's original creation(s) and/or
                       Contributor has sufficient rights to grant the rights conveyed by
                       this License.
-
+            
                  3.5. Required Notices.
                  You must duplicate the notice in Exhibit A in each file of the Source
                  Code.  If it is not possible to put such notice in a particular Source
@@ -2579,7 +2581,7 @@ Within the deps/awsapi-lib directory
                  Developer and every Contributor for any liability incurred by the
                  Initial Developer or such Contributor as a result of warranty,
                  support, indemnity or liability terms You offer.
-
+            
                  3.6. Distribution of Executable Versions.
                  You may distribute Covered Code in Executable form only if the
                  requirements of Section 3.1-3.5 have been met for that Covered Code,
@@ -2602,15 +2604,15 @@ Within the deps/awsapi-lib directory
                  Initial Developer and every Contributor for any liability incurred by
                  the Initial Developer or such Contributor as a result of any such
                  terms You offer.
-
+            
                  3.7. Larger Works.
                  You may create a Larger Work by combining Covered Code with other code
                  not governed by the terms of this License and distribute the Larger
                  Work as a single product. In such a case, You must make sure the
                  requirements of this License are fulfilled for the Covered Code.
-
+            
             4. Inability to Comply Due to Statute or Regulation.
-
+            
                  If it is impossible for You to comply with any of the terms of this
                  License with respect to some or all of the Covered Code due to
                  statute, judicial order, or regulation then You must: (a) comply with
@@ -2621,19 +2623,19 @@ Within the deps/awsapi-lib directory
                  extent prohibited by statute or regulation, such description must be
                  sufficiently detailed for a recipient of ordinary skill to be able to
                  understand it.
-
+            
             5. Application of this License.
-
+            
                  This License applies to code to which the Initial Developer has
                  attached the notice in Exhibit A and to related Covered Code.
-
+            
             6. Versions of the License.
-
+            
                  6.1. New Versions.
                  Netscape Communications Corporation ("Netscape") may publish revised
                  and/or new versions of the License from time to time. Each version
                  will be given a distinguishing version number.
-
+            
                  6.2. Effect of New Versions.
                  Once Covered Code has been published under a particular version of the
                  License, You may always continue to use it under the terms of that
@@ -2641,7 +2643,7 @@ Within the deps/awsapi-lib directory
                  of any subsequent version of the License published by Netscape. No one
                  other than Netscape has the right to modify the terms applicable to
                  Covered Code created under this License.
-
+            
                  6.3. Derivative Works.
                  If You create or use a modified version of this License (which you may
                  only do in order to apply it to code which is not already Covered Code
@@ -2655,9 +2657,9 @@ Within the deps/awsapi-lib directory
                  Developer, Original Code or Contributor in the notice described in
                  Exhibit A shall not of themselves be deemed to be modifications of
                  this License.)
-
+            
             7. DISCLAIMER OF WARRANTY.
-
+            
                  COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
                  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
                  WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
@@ -2668,9 +2670,9 @@ Within the deps/awsapi-lib directory
                  COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
                  OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
                  ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
+            
             8. TERMINATION.
-
+            
                  8.1.  This License and the rights granted hereunder will terminate
                  automatically if You fail to comply with terms herein and fail to cure
                  such breach within 30 days of becoming aware of the breach. All
@@ -2678,12 +2680,12 @@ Within the deps/awsapi-lib directory
                  survive any termination of this License. Provisions which, by their
                  nature, must remain in effect beyond the termination of this License
                  shall survive.
-
+            
                  8.2.  If You initiate litigation by asserting a patent infringement
                  claim (excluding declatory judgment actions) against Initial Developer
                  or a Contributor (the Initial Developer or Contributor against whom
                  You file such action is referred to as "Participant")  alleging that:
-
+            
                  (a)  such Participant's Contributor Version directly or indirectly
                  infringes any patent, then any and all rights granted by such
                  Participant to You under Sections 2.1 and/or 2.2 of this License
@@ -2698,14 +2700,14 @@ Within the deps/awsapi-lib directory
                  is not withdrawn, the rights granted by Participant to You under
                  Sections 2.1 and/or 2.2 automatically terminate at the expiration of
                  the 60 day notice period specified above.
-
+            
                  (b)  any software, hardware, or device, other than such Participant's
                  Contributor Version, directly or indirectly infringes any patent, then
                  any rights granted to You by such Participant under Sections 2.1(b)
                  and 2.2(b) are revoked effective as of the date You first made, used,
                  sold, distributed, or had made, Modifications made by that
                  Participant.
-
+            
                  8.3.  If You assert a patent infringement claim against Participant
                  alleging that such Participant's Contributor Version directly or
                  indirectly infringes any patent where such claim is resolved (such as
@@ -2714,14 +2716,14 @@ Within the deps/awsapi-lib directory
                  granted by such Participant under Sections 2.1 or 2.2 shall be taken
                  into account in determining the amount or value of any payment or
                  license.
-
+            
                  8.4.  In the event of termination under Sections 8.1 or 8.2 above,
                  all end user license agreements (excluding distributors and resellers)
                  which have been validly granted by You or any distributor hereunder
                  prior to termination shall survive termination.
-
+            
             9. LIMITATION OF LIABILITY.
-
+            
                  UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
                  (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
                  DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
@@ -2736,9 +2738,9 @@ Within the deps/awsapi-lib directory
                  PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
                  EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
                  THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
+            
             10. U.S. GOVERNMENT END USERS.
-
+            
                  The Covered Code is a "commercial item," as that term is defined in
                  48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
                  software" and "commercial computer software documentation," as such
@@ -2746,9 +2748,9 @@ Within the deps/awsapi-lib directory
                  C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
                  all U.S. Government End Users acquire Covered Code with only those
                  rights set forth herein.
-
+            
             11. MISCELLANEOUS.
-
+            
                  This License represents the complete agreement concerning subject
                  matter hereof. If any provision of this License is held to be
                  unenforceable, such provision shall be reformed only to the extent
@@ -2767,44 +2769,44 @@ Within the deps/awsapi-lib directory
                  Any law or regulation which provides that the language of a contract
                  shall be construed against the drafter shall not apply to this
                  License.
-
+            
             12. RESPONSIBILITY FOR CLAIMS.
-
+            
                  As between Initial Developer and the Contributors, each party is
                  responsible for claims and damages arising, directly or indirectly,
                  out of its utilization of rights under this License and You agree to
                  work with Initial Developer and Contributors to distribute such
                  responsibility on an equitable basis. Nothing herein is intended or
                  shall be deemed to constitute any admission of liability.
-
+            
             13. MULTIPLE-LICENSED CODE.
-
+            
                  Initial Developer may designate portions of the Covered Code as
                  "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
                  Developer permits you to utilize portions of the Covered Code under
                  Your choice of the NPL or the alternative licenses, if any, specified
                  by the Initial Developer in the file described in Exhibit A.
-
+            
             EXHIBIT A -Mozilla Public License.
-
+            
                  ``The contents of this file are subject to the Mozilla Public License
                  Version 1.1 (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.mozilla.org/MPL/
-
+            
                  Software distributed under the License is distributed on an "AS IS"
                  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
                  License for the specific language governing rights and limitations
                  under the License.
-
+            
                  The Original Code is RabbitMQ.
-
+            
                  The Initial Developer of the Original Code is VMware, Ltd..
-                 Portions created by VMware, Ltd. are Copyright (C)
+                 Portions created by VMware, Ltd. are Copyright (C) 
                  2007-2012 VMware, Inc.. All Rights Reserved.
-
+            
                  Contributor(s): .
-
+            
                  Alternatively, the contents of this file may be used under the terms
                  of the GNU General Public License Version 2 license (the  "[GPL] License"),
in which case the
                  provisions of [GPL] License are applicable instead of those
@@ -2815,17 +2817,16 @@ Within the deps/awsapi-lib directory
                  other provisions required by the [GPL] License.  If you do not delete
                  the provisions above, a recipient may use your version of this file
                  under either the MPL or the [GPL] License."
-
+            
                  [NOTE: The text of this Exhibit A may differ slightly from the text of
                  the notices in the Source Code files of the Original Code. You should
                  use the text of this Exhibit A rather than the text found in the
                  Original Code Source Code for Your Modifications.]
-
-
-        from VMware, Inc  http://www.vmware.com/
+            
+                        
+        from VMware, Inc  http://www.vmware.com/ 
             rabbitmq-client.jar  from http://www.rabbitmq.com/java-client.html
 
-
 Within the patches/systemvm/debian/config/etc directory
     placed in the public domain
         by Adiscon GmbH  http://www.adiscon.com/ 
@@ -3462,7 +3463,7 @@ Within the target/jar directory
             
             The Covered Software is a "commercial item," as that term is
             defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-            computer software" (as that term is defined at 48 C.F.R. �
+            computer software" (as that term is defined at 48 C.F.R. ¤
             252.227-7014(a)(1)) and "commercial computer software
             documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
             1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
@@ -3851,7 +3852,7 @@ Within the target/jar directory
             
             The Covered Software is a "commercial item," as that term is
             defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-            computer software" (as that term is defined at 48 C.F.R. �
+            computer software" (as that term is defined at 48 C.F.R. ¤
             252.227-7014(a)(1)) and "commercial computer software
             documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
             1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
@@ -4377,7 +4378,7 @@ Within the target/jar directory
 
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
 
-            Copyright (C) 2008      T�th Istv�n <stoty@tvnet.hu>
+            Copyright (C) 2008      Tóth István <stoty@tvnet.hu>
                           2008-2012 Daniel Veillard <veillard@redhat.com>
                           2009-2011 Bryan Kearney <bkearney@redhat.com> 
             
@@ -4508,7 +4509,7 @@ Within the ui/lib directory
 
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
 
-            Copyright (c) 2006 - 2011 J�rn Zaefferer
+            Copyright (c) 2006 - 2011 Jörn Zaefferer 
             
             Permission is hereby granted, free  of charge, to any person obtaining
             a  copy  of this  software  and  associated  documentation files  (the
@@ -4703,7 +4704,7 @@ Within the ui/lib/jquery-ui directory
 Within the ui/lib/qunit directory
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as
follows)
 
-            Copyright (c) 2012 John Resig, J�rn Zaefferer
+            Copyright (c) 2012 John Resig, Jörn Zaefferer 
             
             Permission is hereby granted, free  of charge, to any person obtaining
             a  copy  of this  software  and  associated  documentation files  (the

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/12630b4f/tools/whisker/descriptor-for-packaging.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml
index 29a8284..c4f1c2d 100644
--- a/tools/whisker/descriptor-for-packaging.xml
+++ b/tools/whisker/descriptor-for-packaging.xml
@@ -2427,6 +2427,10 @@ Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
             id='vmware.com'
             name='VMware, Inc'
             url='http://www.vmware.com/' />
+        <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>
@@ -2966,5 +2970,11 @@ Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
                    <resource name='rabbitmq-client.jar' source='http://www.rabbitmq.com/java-client.html'
/>
                </by-organisation>
         </with-license>
+        <with-license id='ApacheLicenseVersion2'>
+        	<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>
 </manifest>


Mime
View raw message