Added wss4j legal documentation

Conflicts: NOTICE tools/whisker/descriptor.xml
cloudtrends · Oct 10, 2012 · 9a3f5e2 · 9a3f5e2
1 parent 03248f3
commit 9a3f5e2
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/LICENSE b/LICENSE
@@ -366,6 +366,7 @@ Within the deps/awsapi-lib directory
  rampart-lib http:https://axis.apache.org/axis2/java/rampart/download/1.5/download.cgi 
  woden-api-1.0M8.jar http:https://svn.apache.org/viewvc/webservices/woden/tags/1.0M8_20080423/ 
  woden-impl-dom-1.0M8.jar http:https://svn.apache.org/viewvc/webservices/woden/tags/1.0M8_20080423/ 
+ wss4j-1.5.8.jar http:https://ws.apache.org/wss4j/source-repository.html 
  xercesImpl.jar http:https://xerces.apache.org/xerces2-j/source-repository.html 
  xml-apis.jar http:https://repo1.maven.org/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04-sources.jar 
 

diff --git 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:https://www.apache.org/).
+
+ This product includes software Copyright University of Southampton IT
+ Innovation Centre, 2006 (http:https://www.it-innovation.soton.ac.uk).
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
@@ -2250,7 +2250,17 @@ The Apache Software Foundation (http:https://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:https://www.apache.org/).
+
+This product includes software Copyright University of Southampton IT
+Innovation Centre, 2006 (http:https://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:https://svn.apache.org/viewvc/webservices/woden/tags/1.0M8_20080423/' notice='woden.notice' />
  <resource name='xercesImpl.jar' source='http:https://xerces.apache.org/xerces2-j/source-repository.html' notice='xerces.notice' />
  <resource name='xml-apis.jar' source='http:https://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:https://ws.apache.org/wss4j/source-repository.html' notice='wss4j.notice' />
  </by-organisation>
  </with-license>
  <with-license id='ApacheLicenseVersion2'>