cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1551544 - /cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
Date Tue, 17 Dec 2013 13:53:42 GMT
Author: coheigea
Date: Tue Dec 17 13:53:42 2013
New Revision: 1551544

URL: http://svn.apache.org/r1551544
Log:
Fixing build

Modified:
    cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java

Modified: cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java?rev=1551544&r1=1551543&r2=1551544&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
Tue Dec 17 13:53:42 2013
@@ -41,15 +41,7 @@ public class WSSecurityInterceptorProvid
         ASSERTION_TYPES.add(SP12Constants.TRANSPORT_BINDING);
         ASSERTION_TYPES.add(SP12Constants.ASYMMETRIC_BINDING);
         ASSERTION_TYPES.add(SP12Constants.SYMMETRIC_BINDING);
-<<<<<<< HEAD
-=======
         ASSERTION_TYPES.add(SP12Constants.SIGNED_PARTS);
-        
-        ASSERTION_TYPES.add(SP11Constants.TRANSPORT_BINDING);
-        ASSERTION_TYPES.add(SP11Constants.ASYMMETRIC_BINDING);
-        ASSERTION_TYPES.add(SP11Constants.SYMMETRIC_BINDING);
-        ASSERTION_TYPES.add(SP11Constants.SIGNED_PARTS);
->>>>>>> 5b06160... Also engage the WSS4J policy handlers on a SignedParts
policy, in case we have no binding
     }
 
     public WSSecurityInterceptorProvider() {



Mime
View raw message