Author: coheigea
Date: Wed Nov 23 14:01:20 2011
New Revision: 1205398
URL: http://svn.apache.org/viewvc?rev=1205398&view=rev
Log:
Minor update for WS-SP 1.1
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java?rev=1205398&r1=1205397&r2=1205398&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java
Wed Nov 23 14:01:20 2011
@@ -28,7 +28,6 @@ import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.security.policy.SP11Constants;
-import org.apache.cxf.ws.security.policy.SP12Constants;
import org.apache.cxf.ws.security.policy.SPConstants.SupportTokenType;
import org.apache.cxf.ws.security.policy.model.AlgorithmSuite;
import org.apache.cxf.ws.security.policy.model.SignedEncryptedElements;
@@ -99,19 +98,19 @@ public class SupportingTokensBuilder imp
Assertion primitive = (Assertion)iterator.next();
QName qname = primitive.getName();
- if (SP12Constants.ALGORITHM_SUITE.equals(qname)) {
+ if (SP11Constants.ALGORITHM_SUITE.equals(qname)) {
supportingToken.setAlgorithmSuite((AlgorithmSuite)primitive);
- } else if (SP12Constants.SIGNED_PARTS.equals(qname)) {
+ } else if (SP11Constants.SIGNED_PARTS.equals(qname)) {
supportingToken.setSignedParts((SignedEncryptedParts)primitive);
- } else if (SP12Constants.SIGNED_ELEMENTS.equals(qname)) {
+ } else if (SP11Constants.SIGNED_ELEMENTS.equals(qname)) {
supportingToken.setSignedElements((SignedEncryptedElements)primitive);
- } else if (SP12Constants.ENCRYPTED_PARTS.equals(qname)) {
+ } else if (SP11Constants.ENCRYPTED_PARTS.equals(qname)) {
supportingToken.setEncryptedParts((SignedEncryptedParts)primitive);
- } else if (SP12Constants.ENCRYPTED_ELEMENTS.equals(qname)) {
+ } else if (SP11Constants.ENCRYPTED_ELEMENTS.equals(qname)) {
supportingToken.setEncryptedElements((SignedEncryptedElements)primitive);
} else if (primitive instanceof Token) {
