svn commit: r1454430 - in /cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security: policy/interceptors/ wss4j/

Fri, 08 Mar 2013 07:39:54 -0800 

Author: dkulp
Date: Fri Mar  8 15:39:28 2013
New Revision: 1454430

URL: http://svn.apache.org/r1454430
Log:
Minor tweaks to try and get some policies in the systests to load

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

Modified: 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.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/WSSecurityInterceptorProvider.java?rev=1454430&r1=1454429&r2=1454430&view=diff
==============================================================================
--- 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
 (original)
+++ 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
 Fri Mar  8 15:39:28 2013
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
 import org.apache.cxf.ws.policy.AbstractPolicyInterceptorProvider;
 import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JInInterceptor;
 import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JOutInterceptor;
+import org.apache.wss4j.policy.SP11Constants;
 import org.apache.wss4j.policy.SP12Constants;
 
 /**
@@ -41,6 +42,10 @@ public class WSSecurityInterceptorProvid
         ASSERTION_TYPES.add(SP12Constants.TRANSPORT_BINDING);
         ASSERTION_TYPES.add(SP12Constants.ASYMMETRIC_BINDING);
         ASSERTION_TYPES.add(SP12Constants.SYMMETRIC_BINDING);
+        
+        ASSERTION_TYPES.add(SP11Constants.TRANSPORT_BINDING);
+        ASSERTION_TYPES.add(SP11Constants.ASYMMETRIC_BINDING);
+        ASSERTION_TYPES.add(SP11Constants.SYMMETRIC_BINDING);
     }
 
     public WSSecurityInterceptorProvider() {

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=1454430&r1=1454429&r2=1454430&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
 Fri Mar  8 15:39:28 2013
@@ -41,7 +41,6 @@ public class WSSecurityPolicyInterceptor
         ASSERTION_TYPES.add(SP12Constants.ALGORITHM_SUITE);
         ASSERTION_TYPES.add(SP12Constants.WSS10);
         ASSERTION_TYPES.add(SP12Constants.WSS11);
-        ASSERTION_TYPES.add(SP11Constants.TRUST_10);
         ASSERTION_TYPES.add(SP12Constants.TRUST_13);
         ASSERTION_TYPES.add(SP12Constants.PROTECTION_TOKEN);
         ASSERTION_TYPES.add(SP12Constants.X509_TOKEN);
@@ -69,6 +68,36 @@ public class WSSecurityPolicyInterceptor
         ASSERTION_TYPES.add(SP12Constants.SIGNED_ENCRYPTED_SUPPORTING_TOKENS);
         
ASSERTION_TYPES.add(SP12Constants.ENDORSING_ENCRYPTED_SUPPORTING_TOKENS);
         
ASSERTION_TYPES.add(SP12Constants.SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS);
+        ASSERTION_TYPES.add(SP12Constants.SUPPORTING_TOKENS);
+        
+        ASSERTION_TYPES.add(SP11Constants.LAYOUT);
+        ASSERTION_TYPES.add(SP11Constants.INCLUDE_TIMESTAMP);
+        ASSERTION_TYPES.add(SP11Constants.ALGORITHM_SUITE);
+        ASSERTION_TYPES.add(SP11Constants.WSS10);
+        ASSERTION_TYPES.add(SP11Constants.WSS11);
+        ASSERTION_TYPES.add(SP11Constants.TRUST_10);
+        ASSERTION_TYPES.add(SP11Constants.PROTECTION_TOKEN);
+        ASSERTION_TYPES.add(SP11Constants.X509_TOKEN);
+        ASSERTION_TYPES.add(SP11Constants.ENCRYPTION_TOKEN);
+        ASSERTION_TYPES.add(SP11Constants.SIGNATURE_TOKEN);
+        ASSERTION_TYPES.add(SP11Constants.TRANSPORT_TOKEN);            
+        ASSERTION_TYPES.add(SP11Constants.INITIATOR_TOKEN);
+        ASSERTION_TYPES.add(SP11Constants.INITIATOR_SIGNATURE_TOKEN);
+        ASSERTION_TYPES.add(SP11Constants.INITIATOR_ENCRYPTION_TOKEN);
+        ASSERTION_TYPES.add(SP11Constants.RECIPIENT_TOKEN);
+        ASSERTION_TYPES.add(SP11Constants.RECIPIENT_SIGNATURE_TOKEN);
+        ASSERTION_TYPES.add(SP11Constants.RECIPIENT_ENCRYPTION_TOKEN);
+        ASSERTION_TYPES.add(SP11Constants.SIGNED_PARTS);
+        ASSERTION_TYPES.add(SP11Constants.REQUIRED_PARTS);
+        ASSERTION_TYPES.add(SP11Constants.REQUIRED_ELEMENTS);
+        ASSERTION_TYPES.add(SP11Constants.ENCRYPTED_PARTS);
+        ASSERTION_TYPES.add(SP11Constants.ENCRYPTED_ELEMENTS);
+        ASSERTION_TYPES.add(SP11Constants.SIGNED_ELEMENTS);
+        ASSERTION_TYPES.add(SP11Constants.CONTENT_ENCRYPTED_ELEMENTS);
+        ASSERTION_TYPES.add(SP11Constants.SUPPORTING_TOKENS);
+        ASSERTION_TYPES.add(SP11Constants.SIGNED_SUPPORTING_TOKENS);
+        ASSERTION_TYPES.add(SP11Constants.ENDORSING_SUPPORTING_TOKENS);
+        ASSERTION_TYPES.add(SP11Constants.SUPPORTING_TOKENS);
     }
 
     public WSSecurityPolicyInterceptorProvider() {

Modified: 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java?rev=1454430&r1=1454429&r2=1454430&view=diff
==============================================================================
--- 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
 (original)
+++ 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
 Fri Mar  8 15:39:28 2013
@@ -128,7 +128,7 @@ public class PolicyBasedWSS4JOutIntercep
                 }
                 if (transport == null && isRequestor(message)) {
                     Policy policy = new Policy();
-                    transport = new 
TransportBinding(org.apache.wss4j.policy.SPConstants.SPVersion.SP12,
+                    transport = new 
TransportBinding(org.apache.wss4j.policy.SPConstants.SPVersion.SP11,
                                                      policy);
                 }

Reply via email to