Author: sagara
Date: Tue May 31 08:17:46 2011
New Revision: 1129556
URL: http://svn.apache.org/viewvc?rev=1129556&view=rev
Log:
Merged r1129515 and 1129552 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/developer-guide.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/module.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 31 08:17:46 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552
Modified:
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/developer-guide.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/developer-guide.xml?rev=1129556&r1=1129555&r2=1129556&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/developer-guide.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/developer-guide.xml
Tue May 31 08:17:46 2011
@@ -36,9 +36,9 @@ Stack</em></strong></p>
<li>Download the source code.
<ul>
<li>Anon Checkout <a
-
href="http://svn.apache.org/repos/asf/webservices/rampart/trunk/java/";>http://svn.apache.org/repos/asf/webservices/rampart/trunk/java/</a></li>
+
href="http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/";>http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/</a></li>
<li>Committers <a
-
href="https://svn.apache.org/repos/asf/webservices/rampart/trunk/java/";>https://svn.apache.org/repos/asf/webservices/rampart/trunk/java/</a></li>
+
href="https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/";>https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/</a></li>
</ul>
</li>
<li>The Rampart project has 8 modules under it. They are:
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/module.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/module.xml?rev=1129556&r1=1129555&r2=1129556&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/module.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/module.xml Tue May
31 08:17:46 2011
@@ -28,6 +28,9 @@
</OutFlow>
<OutFaultFlow>
+ <handler name="SecurityOutHandler"
class="org.apache.rampart.handler.WSDoAllSender">
+ <order phase="Security"/>
+ </handler>
<handler name="PolicyBasedSecurityOutHandler"
class="org.apache.rampart.handler.RampartSender">
<order phase="Security" phaseLast="true"/>
</handler>
@@ -37,6 +40,9 @@
<handler name="PolicyBasedSecurityInHandler"
class="org.apache.rampart.handler.RampartReceiver">
<order phase="Security" phaseFirst="true"/>
</handler>
+ <handler name="SecurityInHandler"
class="org.apache.rampart.handler.WSDoAllReceiver">
+ <order phase="Security"/>
+ </handler>
</InFaultFlow>
<supported-policy-namespaces
namespaces="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"/>
