svn commit: r881920 - in /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security: policy/interceptors/IssuedTokenInterceptorProvider.java wss4j/PolicyBasedWSS4JInInterceptor.java

[dkulp]

Author: dkulp
Date: Wed Nov 18 20:23:58 2009
New Revision: 881920

URL: http://svn.apache.org/viewvc?rev=881920&view=rev
Log:
Assert the IssuedToken on server side.  Temporary fix for now.

Modified:
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=881920&r1=881919&r2=881920&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
 Wed Nov 18 20:23:58 2009
@@ -203,8 +203,8 @@
                             found = true;
                         }
                     }
-                    if (!found) {
-                        ais.iterator().next().setAsserted(false);
+                    for (AssertionInfo inf : ais) {
+                        inf.setAsserted(found);
                     }
                 } else {
                     //client side should be checked on the way out

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=881920&r1=881919&r2=881920&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
 Wed Nov 18 20:23:58 2009
@@ -455,7 +455,7 @@
             action = checkSymetricBinding(aim, action, message);
             action = checkTransportBinding(aim, action, message);
             
-            //stuff we can default to asserted an un-assert if a condition 
isn't met
+            //stuff we can default to asserted and un-assert if a condition 
isn't met
             assertPolicy(aim, SP12Constants.KEYVALUE_TOKEN);
             assertPolicy(aim, SP12Constants.X509_TOKEN);