svn commit: r881924 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/ rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/

[dkulp]

Author: dkulp
Date: Wed Nov 18 20:29:26 2009
New Revision: 881924

URL: http://svn.apache.org/viewvc?rev=881924&view=rev
Log:
Merged revisions 881920 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r881920 | dkulp | 2009-11-18 15:23:58 -0500 (Wed, 18 Nov 2009) | 1 line
  
  Assert the IssuedToken on server side.  Temporary fix for now.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
    
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=881924&r1=881923&r2=881924&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
 Wed Nov 18 20:29:26 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/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=881924&r1=881923&r2=881924&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
 Wed Nov 18 20:29:26 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);