incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject git commit: refs/heads/master - Adding legal docs for esapi-2.0.1.jar to the package LICENSE
Date Tue, 19 Feb 2013 18:50:32 GMT
Updated Branches:
  refs/heads/master 58bcd0eef -> 9333f979d


Adding legal docs for esapi-2.0.1.jar to the package LICENSE

Signed-off-by: Chip Childers <chip.childers@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9333f979
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9333f979
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9333f979

Branch: refs/heads/master
Commit: 9333f979db443bb091715c68367d1b9dc3995647
Parents: 58bcd0e
Author: Chip Childers <chip.childers@gmail.com>
Authored: Tue Feb 19 13:50:09 2013 -0500
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Tue Feb 19 13:50:09 2013 -0500

----------------------------------------------------------------------
 tools/whisker/LICENSE                      |   32 +++++++++++++++++++++++
 tools/whisker/descriptor-for-packaging.xml |   13 +++++++++
 2 files changed, 45 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9333f979/tools/whisker/LICENSE
----------------------------------------------------------------------
diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE
index f192c13..2f99021 100644
--- a/tools/whisker/LICENSE
+++ b/tools/whisker/LICENSE
@@ -3006,6 +3006,38 @@ Within the target/jar directory
             spring-core-3.1.2.RELEASE.jar  from https://github.com/SpringSource/spring-framework
             spring-web-3.1.2.RELEASE.jar  from https://github.com/SpringSource/spring-framework
 
+    licensed under the BSD (2-clause) http://www.opensource.org/licenses/BSD-2-Clause  (as
follows)
+
+            Copyright (c) 2007, The OWASP Foundation
+            All rights reserved. 
+            
+            Redistribution and use in source and binary forms, with or without modification,
+            are permitted provided that the following conditions are met:
+            
+            Redistributions of source code must retain the above copyright notice, this list
+            of  conditions and the following disclaimer. Redistributions in binary form must
+            reproduce the above copyright notice, this list  of conditions and the following
+            disclaimer in the documentation and/or other materials  provided with the
+            distribution.
+            
+            Neither the name of the author nor the names of contributors may be used to
+            endorse  or promote products derived from this software without specific prior
+            written permission.
+            
+            THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+            ANY  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+            WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+            DISCLAIMED. IN NO EVENT SHALL THE  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
FOR
+            ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+            (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE  GOODS OR SERVICES;
+            LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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.
+                        
+        from OWASP Foundation Inc.  https://www.owasp.org/ 
+            esapi-2.0.1.jar  from http://code.google.com/p/owasp-esapi-java/
+
     licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause  (as
follows)
 
             Copyright (c) 2009, Caringo, Inc. 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9333f979/tools/whisker/descriptor-for-packaging.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml
index 2e93f4d..5f6a49a 100644
--- a/tools/whisker/descriptor-for-packaging.xml
+++ b/tools/whisker/descriptor-for-packaging.xml
@@ -2439,6 +2439,10 @@ Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
         	id='springsource.com'
         	name='SpringSource, a division of VMware.'
         	url='http://www.springsource.org/' />
+        <organisation
+        	id='owasp.org'
+        	name='OWASP Foundation Inc.'
+        	url='https://www.owasp.org/' />
     </organisations>
     <primary-license id='ApacheLicenseVersion2'>
         <copyright-notice>Copyright (c) 2013 The Apache Software Foundation</copyright-notice>
@@ -2851,6 +2855,15 @@ Copyright 2002-2012 the original author or authors.
         		<resource name='spring-web-3.1.2.RELEASE.jar' source='https://github.com/SpringSource/spring-framework'
/>
             </by-organisation>
         </with-license>
+        <with-license id='BSD2ClauseGeneric'>
+        	<copyright-notice>
+Copyright (c) 2007, The OWASP Foundation
+All rights reserved.
+        	</copyright-notice>
+        	<by-organisation id='owasp.org'>
+        		<resource name='esapi-2.0.1.jar' source='http://code.google.com/p/owasp-esapi-java/'
/>
+        	</by-organisation>
+        </with-license>
     </within>
     <within dir='deps/awsapi-lib'>
         <with-license id='ApacheLicenseVersion2'>


Mime
View raw message