apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added libvirt-java to the license descriptor.

Browse Source 
Fixed tabs in descriptor.xml
Added libvirt-java to the LICENSE file
This commit is contained in:
Chip Childers 2012-09-28 15:51:28 -04:00
parent d266ac9f84
commit e1ae302c1c
2 changed files with 164 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
LICENSE
View File

@ -3901,6 +3901,34 @@ Within the target/jar directory
from The Eclipse Foundation http://www.eclipse.org from The Eclipse Foundation http://www.eclipse.org
cloud-javax.persistence-2.0.0.jar http://wiki.eclipse.org/EclipseLink/Release/2.0.0 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 <stoty@tvnet.hu>
2008-2012 Daniel Veillard <veillard@redhat.com>
2009-2011 Bryan Kearney <bkearney@redhat.com>
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) licensed under the XStream BSD Style License https://fisheye.codehaus.org/browse/xstream/trunk/LICENSE.txt?hb=true (as follows)

14
tools/whisker/descriptor.xml
View File

@ -2405,6 +2405,10 @@ this distribution.
id='netfilter.org' id='netfilter.org'
name='The netfilter.org project' name='The netfilter.org project'
url='http://www.netfilter.org/' /> url='http://www.netfilter.org/' />
<organisation
id='libvirt.org'
name='The libvirt project'
url='http://libvirt.org/' />
</organisations> </organisations>
<primary-license id='ApacheLicenseVersion2'> <primary-license id='ApacheLicenseVersion2'>
<copyright-notice>Copyright (c) 2012 The Apache Software Foundation</copyright-notice> <copyright-notice>Copyright (c) 2012 The Apache Software Foundation</copyright-notice>
@ -2606,6 +2610,16 @@ Copyright (c) 2004 Clinton Begin
</with-license> </with-license>
</within> </within>
<within dir='target/jar'> <within dir='target/jar'>
<with-license id='MIT'>
<copyright-notice>
Copyright (C) 2008 Tóth István &lt;stoty@tvnet.hu&gt;
2008-2012 Daniel Veillard &lt;veillard@redhat.com&gt;
2009-2011 Bryan Kearney &lt;bkearney@redhat.com&gt;
</copyright-notice>
<by-organisation id='libvirt.org'>
<resource name='libvirt-java-0.4.9' />
</by-organisation>
</with-license>
<with-license id="ApacheLicenseVersion2"> <with-license id="ApacheLicenseVersion2">
<copyright-notice> <copyright-notice>
Copyright (c) 2012 The Apache Software Foundation Copyright (c) 2012 The Apache Software Foundation