From b1ee33abc093f9da8bd97ecfa0e928b6b70fceb8 Mon Sep 17 00:00:00 2001 From: Chip Childers Date: Mon, 26 Aug 2013 12:33:01 -0400 Subject: [PATCH] Adding httpclient ssl source files to legal documentation (cherry picked from commit a70708de482fb6de72e5934f1d95809b3c68d194) --- 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(-) diff --git a/LICENSE b/LICENSE index 2094d029e90..c970ff13924 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 + diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE index 299b53bb70b..61ebc50f106 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 + diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml index 66099ae61a1..1a68a0d9c5c 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. + + + +Copyright (c) 2007 The Apache Software Foundation + + + + + + + diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml index 0b8d20f83b2..da38b186c10 100644 --- a/tools/whisker/descriptor.xml +++ b/tools/whisker/descriptor.xml @@ -2646,7 +2646,7 @@ Copyright (c) 2010-2011 OpenStack, LLC. - + Copyright (c) 2010-2012 Patrick Debois @@ -2671,4 +2671,15 @@ Copyright (c) 2010-2012 Patrick Debois + + + +Copyright (c) 2007 The Apache Software Foundation + + + + + + +