etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding httpclient ssl source files to legal documentation 

(cherry picked from commit a70708de48)
This commit is contained in:
Chip Childers 2013-08-26 12:33:01 -04:00
parent 9271eb1066
commit b1ee33abc0
4 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
LICENSE
View File

@ -306,7 +306,7 @@ Within the scripts/vm/hypervisor/xenserver directory
from OpenStack, LLC http://www.openstack.org from OpenStack, LLC http://www.openstack.org
swift swift
Within the tools/appliance/definitions/{devcloud,systemvmtemplate,systemvmtemplate64} directories Within the tools/appliance/definitions/{devcloud,systemvmtemplate,systemvmtemplate64} directory
licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows)
Copyright (c) 2010-2012 Patrick Debois Copyright (c) 2010-2012 Patrick Debois
@ -460,7 +460,7 @@ Within the ui/lib directory
licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) 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 Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
@ -655,7 +655,7 @@ Within the ui/lib/jquery-ui directory
Within the ui/lib/qunit directory Within the ui/lib/qunit directory
licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) 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 Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
@ -686,3 +686,10 @@ Within the utils/src/com/cloud/utils/db directory
from Clinton Begin http://code.google.com/p/mybatis/ from Clinton Begin http://code.google.com/p/mybatis/
ScriptRunner.java from http://code.google.com/p/mybatis/ ScriptRunner.java from http://code.google.com/p/mybatis/
Within the utils/src/org/apache/commons/httpclient/contrib/ssl directory
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
Copyright (c) 2007 The Apache Software Foundation
from The Apache Software Foundation http://www.apache.org/
EasySSLProtocolSocketFactory.java
EasyX509TrustManager.java

7
tools/whisker/LICENSE
View File

@ -4735,3 +4735,10 @@ Within the utils/src/com/cloud/utils/db directory
from Clinton Begin http://code.google.com/p/mybatis/ from Clinton Begin http://code.google.com/p/mybatis/
ScriptRunner.java from http://code.google.com/p/mybatis/ ScriptRunner.java from http://code.google.com/p/mybatis/
Within the utils/src/org/apache/commons/httpclient/contrib/ssl directory
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
Copyright (c) 2007 The Apache Software Foundation
from The Apache Software Foundation http://www.apache.org/
EasySSLProtocolSocketFactory.java
EasyX509TrustManager.java

11
tools/whisker/descriptor-for-packaging.xml
View File

@ -2998,4 +2998,15 @@ Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
</by-organisation> </by-organisation>
</with-license> </with-license>
</within> </within>
<within dir='utils/src/org/apache/commons/httpclient/contrib/ssl'>
<with-license id='ApacheLicenseVersion2'>
<copyright-notice>
Copyright (c) 2007 The Apache Software Foundation
</copyright-notice>
<by-organisation id="apache.org.2">
<resource name="EasySSLProtocolSocketFactory.java" />
<resource name="EasyX509TrustManager.java" />
</by-organisation>
</with-license>
</within>
</manifest> </manifest>

13
tools/whisker/descriptor.xml
View File

@ -2646,7 +2646,7 @@ Copyright (c) 2010-2011 OpenStack, LLC.
</by-organisation> </by-organisation>
</with-license> </with-license>
</within> </within>
<within dir='tools/appliance/definitions/systemvmtemplate'> <within dir='tools/appliance/definitions/{devcloud,systemvmtemplate,systemvmtemplate64}'>
<with-license id='MIT'> <with-license id='MIT'>
<copyright-notice> <copyright-notice>
Copyright (c) 2010-2012 Patrick Debois Copyright (c) 2010-2012 Patrick Debois
@ -2671,4 +2671,15 @@ Copyright (c) 2010-2012 Patrick Debois
</by-organisation> </by-organisation>
</with-license> </with-license>
</within> </within>
<within dir='utils/src/org/apache/commons/httpclient/contrib/ssl'>
<with-license id='ApacheLicenseVersion2'>
<copyright-notice>
Copyright (c) 2007 The Apache Software Foundation
</copyright-notice>
<by-organisation id="apache.org.2">
<resource name="EasySSLProtocolSocketFactory.java" />
<resource name="EasyX509TrustManager.java" />
</by-organisation>
</with-license>
</within>
</manifest> </manifest>