From e1ae302c1c2a033fc13070bea41752c9c1a5f331 Mon Sep 17 00:00:00 2001 From: Chip Childers Date: Fri, 28 Sep 2012 15:51:28 -0400 Subject: [PATCH] Added libvirt-java to the license descriptor. Fixed tabs in descriptor.xml Added libvirt-java to the LICENSE file --- LICENSE | 36 ++++- tools/whisker/descriptor.xml | 250 ++++++++++++++++++----------------- 2 files changed, 164 insertions(+), 122 deletions(-) diff --git a/LICENSE b/LICENSE index 0254d224c2e..96952ecc65b 100644 --- a/LICENSE +++ b/LICENSE @@ -312,7 +312,7 @@ Within the deps directory Within the deps/awsapi-lib directory licensed under the ANTLR 2 License http://www.antlr2.org/license.html (as follows) - + ANTLR 2 License We reserve no legal rights to the ANTLR--it is fully in the public domain. An @@ -328,7 +328,7 @@ Within the deps/awsapi-lib directory remain intact in our source code. As long as these guidelines are kept, we expect to continue enhancing this system and expect to make other tools available as they are completed. - + from ANTLR Translator Generator Project http://www.antlr2.org/ antlr-2.7.6.jar http://repo1.maven.org/maven2/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar @@ -1839,7 +1839,7 @@ Within the deps/awsapi-lib directory STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + from DOM4J Project http://dom4j.sourceforge.net/ dom4j-1.6.1.jar http://dom4j.sourceforge.net/source-repository.html @@ -2343,7 +2343,7 @@ Within the deps/awsapi-lib directory use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] - + from Shigeru Chiba http://www.csg.ci.i.u-tokyo.ac.jp/~chiba/javassist/ javassist-3.9.0.GA.jar http://sourceforge.net/projects/jboss/files/Javassist/ @@ -3901,6 +3901,34 @@ Within the target/jar directory from The Eclipse Foundation http://www.eclipse.org cloud-javax.persistence-2.0.0.jar http://wiki.eclipse.org/EclipseLink/Release/2.0.0 + licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) + + Copyright (C) 2008 Tóth István + 2008-2012 Daniel Veillard + 2009-2011 Bryan Kearney + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + from The libvirt project http://libvirt.org/ + libvirt-java-0.4.9 + licensed under the XStream BSD Style License https://fisheye.codehaus.org/browse/xstream/trunk/LICENSE.txt?hb=true (as follows) diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml index 14f0c96811e..0564d302fd1 100644 --- a/tools/whisker/descriptor.xml +++ b/tools/whisker/descriptor.xml @@ -404,18 +404,18 @@ of liability. - - + name='Mozilla Public License, Version 1.0' + id='MPL1' + url='http://www.mozilla.org/MPL/1.1/' > + + MOZILLA PUBLIC LICENSE Version 1.1 @@ -886,7 +886,7 @@ EXHIBIT A -Mozilla Public License. use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] - + - + name='ANTLR 2 License' + id='antlr2' + url='http://www.antlr2.org/license.html'> + ANTLR 2 License We reserve no legal rights to the ANTLR--it is fully in the public domain. An @@ -1445,13 +1445,13 @@ mention that you developed it using ANTLR. In addition, we ask that the headers remain intact in our source code. As long as these guidelines are kept, we expect to continue enhancing this system and expect to make other tools available as they are completed. - + - + name='Dom4J License' + id='dom4j.license' + url='http://dom4j.cvs.sourceforge.net/viewvc/dom4j/dom4j/LICENSE.txt'> + Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved. Redistribution and use of this software and associated documentation @@ -1492,7 +1492,7 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + - + + ========================================================================= == NOTICE file corresponding to section 4(d) of the Apache License, == == Version 2.0, in this case for the Apache Xerces Java distribution. == @@ -2222,8 +2222,8 @@ Portions of this software were originally based on the following: - voluntary contributions made by Paul Eng on behalf of the Apache Software Foundation that were originally developed at iClick, Inc., software copyright (c) 1999. - - + + ========================================================================= == NOTICE file corresponding to section 4(d) of the Apache License, == == Version 2.0, in this case for the Apache xml-commons xml-apis == @@ -2240,8 +2240,8 @@ Portions of this software were originally based on the following: - software copyright (c) 1999, IBM Corporation., http://www.ibm.com. - software copyright (c) 1999, Sun Microsystems., http://www.sun.com. - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org - - + + Apache Rampart Copyright 2010 The Apache Software Foundation @@ -2250,7 +2250,7 @@ The Apache Software Foundation (http://www.apache.org/). Please read the different LICENSE files present in the lib directory of this distribution. - + + id='openstack.org' + name='OpenStack, LLC' + url='http://www.openstack.org' /> + id='antlr2.org' + name='ANTLR Translator Generator Project' + url='http://www.antlr2.org/' /> + id='qos.ch' + name='QOS.ch' + url='http://www.qos.ch/' /> + id='dom4j.sourceforge.net' + name='DOM4J Project' + url='http://dom4j.sourceforge.net/' /> + id='json-simple' + name='Json.simple Project' + url='http://code.google.com/p/json-simple/' /> + id='junit.org' + name='JUnit Project' + url='http://www.junit.org/' /> + id='person:shigeru.chiba' + name='Shigeru Chiba' + url='http://www.csg.ci.i.u-tokyo.ac.jp/~chiba/javassist/' /> + id='openssh.org' + name='OpenSSH Project' + url='http://www.openssh.org/' /> + id='netfilter.org' + name='The netfilter.org project' + url='http://www.netfilter.org/' /> + Copyright (c) 2012 The Apache Software Foundation @@ -2454,10 +2458,10 @@ Copyright (c) 2012 The Apache Software Foundation - + - - + + @@ -2576,9 +2580,9 @@ Updated November 2009 with contributions from: btburnett3, Anthony Aragues and X - + Copyright (c) 2012 John Resig, Jörn Zaefferer - + @@ -2606,6 +2610,16 @@ Copyright (c) 2004 Clinton Begin + + +Copyright (C) 2008 Tóth István <stoty@tvnet.hu> + 2008-2012 Daniel Veillard <veillard@redhat.com> + 2009-2011 Bryan Kearney <bkearney@redhat.com> + + + + + Copyright (c) 2012 The Apache Software Foundation @@ -2740,8 +2754,8 @@ All rights reserved. - - + + @@ -2751,49 +2765,49 @@ All rights reserved. - - + + Copyright (c) 2010-2011 OpenStack, LLC. - - - - - - + + + + + + - - + + Copyright (c) 2010-2011 OpenStack, LLC. - - - - - - + + + + + + - - + + Copyright (c) 2004-2008 The Apache Software Foundation - - - - - - + + + + + + - - - - - - + + + + + + Copyright (c) 2004-2011 QOS.ch - - - - - - + + + + + + Copyright (c) 2004-2012 The Apache Software Foundation @@ -2839,10 +2853,10 @@ Copyright (c) 2009 Google Inc. - - - - + + + + @@ -2886,23 +2900,23 @@ Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. - - + + - - PROJECTJavassist - INITIAL_DEVELOPERShigeru Chiba - INITIAL_DEVELOPER_COPYRIGHT1999-2008 Shigeru Chiba - CONTRIBUTORS - ALT_LIC_NAMEGNU Lesser General Public License Version 2.1 or later - ALT_LIC_SHORTLGPL - - - - + + PROJECTJavassist + INITIAL_DEVELOPERShigeru Chiba + INITIAL_DEVELOPER_COPYRIGHT1999-2008 Shigeru Chiba + CONTRIBUTORS + ALT_LIC_NAMEGNU Lesser General Public License Version 2.1 or later + ALT_LIC_SHORTLGPL + + + + - +