You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2013/08/26 18:36:33 UTC
git commit: updated refs/heads/4.2-forward to 0cefd6c
Updated Branches:
refs/heads/4.2-forward 98dfd6529 -> 0cefd6c97
Adding httpclient ssl source files to legal documentation
(cherry picked from commit a70708de482fb6de72e5934f1d95809b3c68d194)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0cefd6c9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0cefd6c9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0cefd6c9
Branch: refs/heads/4.2-forward
Commit: 0cefd6c9726ebffdaedb9b1ab9dd9ffea2a755c6
Parents: 98dfd65
Author: Chip Childers <ch...@apache.org>
Authored: Mon Aug 26 12:33:01 2013 -0400
Committer: Chip Childers <ch...@apache.org>
Committed: Mon Aug 26 12:36:13 2013 -0400
----------------------------------------------------------------------
LICENSE | 13 ++++++++++---
tools/whisker/LICENSE | 7 +++++++
tools/whisker/descriptor-for-packaging.xml | 11 +++++++++++
tools/whisker/descriptor.xml | 13 ++++++++++++-
4 files changed, 40 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0cefd6c9/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 2094d02..c970ff1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -306,7 +306,7 @@ Within the scripts/vm/hypervisor/xenserver directory
from OpenStack, LLC http://www.openstack.org
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)
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)
- 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
@@ -655,7 +655,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
@@ -686,3 +686,10 @@ Within the utils/src/com/cloud/utils/db directory
from Clinton Begin 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
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0cefd6c9/tools/whisker/LICENSE
----------------------------------------------------------------------
diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE
index 299b53b..61ebc50 100644
--- a/tools/whisker/LICENSE
+++ b/tools/whisker/LICENSE
@@ -4735,3 +4735,10 @@ Within the utils/src/com/cloud/utils/db directory
from Clinton Begin 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
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0cefd6c9/tools/whisker/descriptor-for-packaging.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml
index 66099ae..1a68a0d 100644
--- a/tools/whisker/descriptor-for-packaging.xml
+++ b/tools/whisker/descriptor-for-packaging.xml
@@ -2998,4 +2998,15 @@ Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
</by-organisation>
</with-license>
</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>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0cefd6c9/tools/whisker/descriptor.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
index 0b8d20f..da38b18 100644
--- a/tools/whisker/descriptor.xml
+++ b/tools/whisker/descriptor.xml
@@ -2646,7 +2646,7 @@ Copyright (c) 2010-2011 OpenStack, LLC.
</by-organisation>
</with-license>
</within>
- <within dir='tools/appliance/definitions/systemvmtemplate'>
+ <within dir='tools/appliance/definitions/{devcloud,systemvmtemplate,systemvmtemplate64}'>
<with-license id='MIT'>
<copyright-notice>
Copyright (c) 2010-2012 Patrick Debois
@@ -2671,4 +2671,15 @@ Copyright (c) 2010-2012 Patrick Debois
</by-organisation>
</with-license>
</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>