svn commit: r1459342 - in /cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy: WSSecurityPolicyLoader.java interceptors/SecureConversationInInterceptor.java interceptors/WSSecurityPolicyInterceptorProvider.java

[coheigea]

Author: coheigea
Date: Thu Mar 21 14:57:59 2013
New Revision: 1459342

URL: http://svn.apache.org/r1459342
Log:
Fixing some more tests

Modified:
    
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
    
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
    
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java

Modified: 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java?rev=1459342&r1=1459341&r2=1459342&view=diff
==============================================================================
--- 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
 (original)
+++ 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
 Thu Mar 21 14:57:59 2013
@@ -192,7 +192,6 @@ public final class WSSecurityPolicyLoade
             SP11Constants.REQUIRE_KEY_IDENTIFIER_REFERENCE,
             SP12Constants.PROTECT_TOKENS,
             SP11Constants.PROTECT_TOKENS,
-            SP11Constants.PROTECT_TOKENS,
             SP12Constants.RSA_KEY_VALUE,
             
             // Layout

Modified: 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java?rev=1459342&r1=1459341&r2=1459342&view=diff
==============================================================================
--- 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
 (original)
+++ 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
 Thu Mar 21 14:57:59 2013
@@ -71,6 +71,7 @@ class SecureConversationInInterceptor ex
     
     public SecureConversationInInterceptor() {
         super(Phase.PRE_PROTOCOL);
+        getBefore().add(WSS4JInInterceptor.class.getName());
     }
     private AbstractBinding getBinding(AssertionInfoMap aim) {
         Collection<AssertionInfo> ais = 

Modified: 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java?rev=1459342&r1=1459341&r2=1459342&view=diff
==============================================================================
--- 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java
 (original)
+++ 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java
 Thu Mar 21 14:57:59 2013
@@ -39,6 +39,11 @@ public class WSSecurityPolicyInterceptor
         ASSERTION_TYPES.add(SP12Constants.LAYOUT);
         ASSERTION_TYPES.add(SP12Constants.INCLUDE_TIMESTAMP);
         ASSERTION_TYPES.add(SP12Constants.ALGORITHM_SUITE);
+        ASSERTION_TYPES.add(SP12Constants.ENCRYPT_SIGNATURE);
+        ASSERTION_TYPES.add(SP12Constants.PROTECT_TOKENS);
+        ASSERTION_TYPES.add(SP12Constants.ENCRYPT_BEFORE_SIGNING);
+        ASSERTION_TYPES.add(SP12Constants.SIGN_BEFORE_ENCRYPTING);
+        ASSERTION_TYPES.add(SP12Constants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY);
         ASSERTION_TYPES.add(SP12Constants.WSS10);
         ASSERTION_TYPES.add(SP12Constants.WSS11);
         ASSERTION_TYPES.add(SP12Constants.TRUST_13);
@@ -72,6 +77,11 @@ public class WSSecurityPolicyInterceptor
         ASSERTION_TYPES.add(SP11Constants.LAYOUT);
         ASSERTION_TYPES.add(SP11Constants.INCLUDE_TIMESTAMP);
         ASSERTION_TYPES.add(SP11Constants.ALGORITHM_SUITE);
+        ASSERTION_TYPES.add(SP11Constants.ENCRYPT_SIGNATURE);
+        ASSERTION_TYPES.add(SP11Constants.PROTECT_TOKENS);
+        ASSERTION_TYPES.add(SP11Constants.ENCRYPT_BEFORE_SIGNING);
+        ASSERTION_TYPES.add(SP11Constants.SIGN_BEFORE_ENCRYPTING);
+        ASSERTION_TYPES.add(SP11Constants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY);
         ASSERTION_TYPES.add(SP11Constants.WSS10);
         ASSERTION_TYPES.add(SP11Constants.WSS11);
         ASSERTION_TYPES.add(SP11Constants.TRUST_10);