Author: dkulp
Date: Fri Feb 15 13:22:09 2008
New Revision: 628174

URL: http://svn.apache.org/viewvc?rev=628174&view=rev
Log:
Fix compile errors from the merge

Modified:
    
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/SignatureConfirmationTest.java

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=628174&r1=628173&r2=628174&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 13:22:09 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/SignatureConfirmationTest.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/SignatureConfirmationTest.java?rev=628174&r1=628173&r2=628174&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
 Fri Feb 15 13:22:09 2008
@@ -38,7 +38,6 @@
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.phase.PhaseInterceptor;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.ws.security.WSSecurityEngineResult;
 import org.apache.ws.security.handler.WSHandlerConstants;
@@ -70,8 +69,7 @@
     public void testSignatureConfirmationRequest() throws Exception {
         Document doc = readDocument("wsse-request-clean.xml");
 
-        WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor();
-        PhaseInterceptor<SoapMessage> handler = 
ohandler.createEndingInterceptor();
+        WSS4JOutInterceptor handler = new WSS4JOutInterceptor();
 
         SoapMessage msg = new SoapMessage(new MessageImpl());
         Exchange ex = new ExchangeImpl();
@@ -155,8 +153,7 @@
     ) throws Exception {
         Document doc = readDocument("wsse-request-clean.xml");
 
-        WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor();
-        PhaseInterceptor<SoapMessage> handler = 
ohandler.createEndingInterceptor();
+        WSS4JOutInterceptor handler = new WSS4JOutInterceptor();
 
         SoapMessage msg = new SoapMessage(new MessageImpl());
         Exchange ex = new ExchangeImpl();


Reply via email to