Colm,
I'm a bit concerned about pushing this back onto the 2.4 branch (slightly less concerned about 2.5). This could cause existing applications to stop working as they may have policies that don't meet the stricter parsing. Right? Dan On Wednesday, February 15, 2012 12:37:35 PM [email protected] wrote: > Author: coheigea > Date: Wed Feb 15 12:37:34 2012 > New Revision: 1244464 > > URL: http://svn.apache.org/viewvc?rev=1244464&view=rev > Log: > Adding stricter SecurityPolicy parsing > > Conflicts: > > rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X50 > 9TokenBuilder.java > > > Conflicts: > > rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/Asy > mmetricBindingBuilder.java > rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/Sym > metricBindingBuilder.java > rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X50 > 9TokenBuilder.java > systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/cl > ient/client.xml > systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/se > rver/server.xml > > Modified: > > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/AlgorithmSuiteBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/AsymmetricBindingBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/EncryptedPartsBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/HttpsTokenBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/IssuedTokenBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/KerberosTokenBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/KeyValueTokenBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/LayoutBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/RequiredPartsBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/SamlTokenBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/SecureConversationTokenBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/SecurityContextTokenBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/SignedPartsBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/SpnegoContextTokenBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/SymmetricBindingBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/TransportBindingBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/UsernameTokenBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/sec > urity/policy/builders/X509TokenBuilder.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/sec > urity/wss4j/PolicyBasedWss4JInOutTest.java > cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/w > s/security/wss4j/signed_elements_with_sst_issued_token_policy.xml > cxf/branches/2.4.x-fixes/systests/ws-security-examples/src/test/resources/o > rg/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl > cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache > /cxf/systest/ws/kerberos/DoubleItKerberos.wsdl > cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache > /cxf/systest/ws/saml/DoubleItSaml.wsdl > cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache > /cxf/systest/ws/saml/client/client.xml > cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache > /cxf/systest/ws/saml/server/server.xml > cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache > /cxf/systest/ws/ut/DoubleItUt.wsdl > cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache > /cxf/systest/ws/ut/client/client.xml > cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache > /cxf/systest/ws/ut/server/server.xml > cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache > /cxf/systest/ws/x509/DoubleItX509.wsdl > > Modified: -- Daniel Kulp [email protected] - http://dankulp.com/blog Talend Community Coder - http://coders.talend.com
