svn commit: r1152203 - in /cxf/branches/2.4.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java

[dkulp]

Author: dkulp
Date: Fri Jul 29 13:11:19 2011
New Revision: 1152203

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

........
  r1151932 | dkulp | 2011-07-28 13:14:58 -0400 (Thu, 28 Jul 2011) | 1 line
  
  Remove some warnings by registering some more policies
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java

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

Modified: 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java?rev=1152203&r1=1152202&r2=1152203&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
 Fri Jul 29 13:11:19 2011
@@ -153,6 +153,10 @@ public final class WSSecurityPolicyLoade
             SP11Constants.REQUIRE_ISSUER_SERIAL_REFERENCE,
             new QName(SP12Constants.SP_NS, 
SP12Constants.ENCRYPT_BEFORE_SIGNING),
             new QName(SP11Constants.SP_NS, 
SP11Constants.ENCRYPT_BEFORE_SIGNING),
+            new QName(SP12Constants.SP_NS, 
SP12Constants.SIGN_BEFORE_ENCRYPTING),
+            new QName(SP11Constants.SP_NS, 
SP11Constants.SIGN_BEFORE_ENCRYPTING),
+            SP12Constants.REQUIRE_KEY_IDENTIFIER_REFERENCE,
+            SP11Constants.REQUIRE_KEY_IDENTIFIER_REFERENCE,
         });
         reg.registerBuilder(new PrimitiveAssertionBuilder(others));
     }