svn commit: r628166 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/ rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/

[dkulp]

Author: dkulp
Date: Fri Feb 15 12:36:22 2008
New Revision: 628166

URL: http://svn.apache.org/viewvc?rev=628166&view=rev
Log:
Merged revisions 628147 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r628147 | dkulp | 2008-02-15 14:11:39 -0500 (Fri, 15 Feb 2008) | 2 lines
  
  [CXF-1436] Patch from Colm O hEigeartaigh applied
........

Added:
    
incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
      - copied unchanged from r628147, 
incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    
incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
    
incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java?rev=628166&r1=628165&r2=628166&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
 Fri Feb 15 12:36:22 2008
@@ -166,7 +166,7 @@
                 t1 = System.currentTimeMillis();
             }
 
-            doSenderAction(doAction, doc, reqData, actions, !Boolean.TRUE
+                doSenderAction(doAction, doc, reqData, actions, Boolean.TRUE
                     .equals(getProperty(mc, 
org.apache.cxf.message.Message.REQUESTOR_ROLE)));
 
             if (doTimeDebug) {

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java?rev=628166&r1=628165&r2=628166&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
 Fri Feb 15 12:36:22 2008
@@ -40,6 +40,7 @@
         super();
 
         addNamespace("wsse", WSConstants.WSSE_NS);
+        addNamespace("wsse11", WSConstants.WSSE11_NS);
         addNamespace("ds", WSConstants.SIG_NS);
         addNamespace("s", Soap11.getInstance().getNamespace());
         addNamespace("xenc", WSConstants.ENC_NS);