Author: sagara
Date: Mon Jun 6 09:15:38 2011
New Revision: 1132557
URL: http://svn.apache.org/viewvc?rev=1132557&view=rev
Log:
Merged r1132548 to the 1.6 branch.
Added:
axis/axis2/java/rampart/branches/1_6/legal/bcprov-LICENSE.txt
- copied unchanged from r1132548,
axis/axis2/java/rampart/trunk/legal/bcprov-LICENSE.txt
axis/axis2/java/rampart/branches/1_6/legal/commons-lang-LICENSE.txt
- copied unchanged from r1132548,
axis/axis2/java/rampart/trunk/legal/commons-lang-LICENSE.txt
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/release-docs/ChangeLog.txt
axis/axis2/java/rampart/branches/1_6/release-docs/README.txt
axis/axis2/java/rampart/branches/1_6/release-docs/release-notes.html
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 6 09:15:38 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548
Modified: axis/axis2/java/rampart/branches/1_6/release-docs/ChangeLog.txt
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/release-docs/ChangeLog.txt?rev=1132557&r1=1132556&r2=1132557&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/release-docs/ChangeLog.txt (original)
+++ axis/axis2/java/rampart/branches/1_6/release-docs/ChangeLog.txt Mon Jun 6
09:15:38 2011
@@ -1,7 +1,7 @@
This file contains a listing of all Jira issues that have been closed
for a given release.
-Release 1.6.0 - 01 Jun 2011
+Release 1.6.0 - 06 Jun 2011
===========================
** Bug
* [RAMPART-327] - SVN locations mentioned in the developer guide are
obsoleted
Modified: axis/axis2/java/rampart/branches/1_6/release-docs/README.txt
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/release-docs/README.txt?rev=1132557&r1=1132556&r2=1132557&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/release-docs/README.txt (original)
+++ axis/axis2/java/rampart/branches/1_6/release-docs/README.txt Mon Jun 6
09:15:38 2011
@@ -1,5 +1,5 @@
======================================================
-Apache Rampart-1.6.0 build (Jun 01, 2011)
+Apache Rampart-1.6.0 build (Jun 06, 2011)
http://axis.apache.org/axis2/java/rampart
------------------------------------------------------
@@ -13,8 +13,8 @@ lib - This directory contains all t
release.
-rampart-1.5.1.mar - WS-Security and WS-SecureConversation support for Axis2
-rahas-1.5.1.mar - STS module - to be used to add STS operations to a
service
+rampart-1.6.0.mar - WS-Security and WS-SecureConversation support for Axis2
+rahas-1.6.0.mar - STS module - to be used to add STS operations to a
service
samples - This contains samples on using Apache Rampart and configuring
different components to carryout different WS-Sec* operations.
Modified: axis/axis2/java/rampart/branches/1_6/release-docs/release-notes.html
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/release-docs/release-notes.html?rev=1132557&r1=1132556&r2=1132557&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/release-docs/release-notes.html
(original)
+++ axis/axis2/java/rampart/branches/1_6/release-docs/release-notes.html Mon
Jun 6 09:15:38 2011
@@ -15,7 +15,7 @@
<p>This is the 1.6.0 release of Apache Rampart.</p>
<p>Apache Rampart 1.6.0 is a toolkit that provides implementations of the
WS-Sec*
-specifications for Apache Axis2 1.6.0, based on Apache WSS4J 1.5.10 and
+specifications for Apache Axis2 1.6.0, based on Apache WSS4J 1.5.11 and
the Apache AXIOM-DOOM 1.2.11 implementation.</p>
<b>What is in this release</b>
