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 2012/10/10 05:14:56 UTC
[1/2] git commit: Added wss4j legal documentation
Updated Branches:
refs/heads/master 03248f36e -> 724cd6868
Added wss4j legal documentation
Conflicts:
NOTICE
tools/whisker/descriptor.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9a3f5e24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9a3f5e24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9a3f5e24
Branch: refs/heads/master
Commit: 9a3f5e2420febdd1ce0cfb37f4e4f34f7009f517
Parents: 03248f3
Author: Chip Childers <ch...@gmail.com>
Authored: Tue Oct 9 22:23:39 2012 -0400
Committer: Chip Childers <ch...@gmail.com>
Committed: Tue Oct 9 23:14:39 2012 -0400
----------------------------------------------------------------------
LICENSE | 1 +
NOTICE | 13 +++++++++++++
tools/whisker/descriptor.xml | 13 ++++++++++++-
3 files changed, 26 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a3f5e24/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index d43769f..9d88029 100644
--- a/LICENSE
+++ b/LICENSE
@@ -366,6 +366,7 @@ Within the deps/awsapi-lib directory
rampart-lib http://axis.apache.org/axis2/java/rampart/download/1.5/download.cgi
woden-api-1.0M8.jar http://svn.apache.org/viewvc/webservices/woden/tags/1.0M8_20080423/
woden-impl-dom-1.0M8.jar http://svn.apache.org/viewvc/webservices/woden/tags/1.0M8_20080423/
+ wss4j-1.5.8.jar http://ws.apache.org/wss4j/source-repository.html
xercesImpl.jar http://xerces.apache.org/xerces2-j/source-repository.html
xml-apis.jar http://repo1.maven.org/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04-sources.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a3f5e24/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index cecb580..8421106 100644
--- a/NOTICE
+++ b/NOTICE
@@ -672,3 +672,16 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
================================================================================
+
+ For
+ wss4j-1.5.8.jar
+
+
+ Apache WebServices - WSS4J
+ Copyright 2004-2011 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ This product includes software Copyright University of Southampton IT
+ Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a3f5e24/tools/whisker/descriptor.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
index 007535d..c68b3f5 100644
--- a/tools/whisker/descriptor.xml
+++ b/tools/whisker/descriptor.xml
@@ -2250,7 +2250,17 @@ The Apache Software Foundation (http://www.apache.org/).
Please read the different LICENSE files present in the lib directory of
this distribution.
- </notice>
+ </notice>
+ <notice id='wss4j.notice'>
+Apache WebServices - WSS4J
+Copyright 2004-2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software Copyright University of Southampton IT
+Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).
+ </notice>
</notices>
<organisations>
<organisation
@@ -2848,6 +2858,7 @@ Copyright (c) 2004-2012 The Apache Software Foundation
<resource name="woden-impl-dom-1.0M8.jar" source='http://svn.apache.org/viewvc/webservices/woden/tags/1.0M8_20080423/' notice='woden.notice' />
<resource name='xercesImpl.jar' source='http://xerces.apache.org/xerces2-j/source-repository.html' notice='xerces.notice' />
<resource name='xml-apis.jar' source='http://repo1.maven.org/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04-sources.jar' notice='xml-apis.notice' />
+ <resource name='wss4j-1.5.8.jar' source='http://ws.apache.org/wss4j/source-repository.html' notice='wss4j.notice' />
</by-organisation>
</with-license>
<with-license id='ApacheLicenseVersion2'>