Author: coheigea
Date: Tue Dec 17 13:50:31 2013
New Revision: 1551542
URL: http://svn.apache.org/r1551542
Log:
Merged revisions 1551540 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1551540 | coheigea | 2013-12-17 13:40:19 +0000 (Tue, 17 Dec 2013) | 2 lines
Also engage the WSS4J policy handlers on a SignedParts policy, in case we
have no binding
........
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=1551542&r1=1551541&r2=1551542&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:50:31 2013
@@ -41,6 +41,15 @@ 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() {
