You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2013/03/06 17:49:10 UTC
svn commit: r1453418 - in
/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy:
builders/TransportBindingBuilder.java model/AbstractSecurityAssertion.java
model/SupportingTokens.java
Author: coheigea
Date: Wed Mar 6 16:49:10 2013
New Revision: 1453418
URL: http://svn.apache.org/r1453418
Log:
Adding some stuff required for CXF port
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/TransportBindingBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/TransportBindingBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/TransportBindingBuilder.java?rev=1453418&r1=1453417&r2=1453418&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/TransportBindingBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/TransportBindingBuilder.java Wed Mar 6 16:49:10 2013
@@ -43,7 +43,7 @@ public class TransportBindingBuilder imp
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
if (nestedPolicyElement == null) {
- throw new IllegalArgumentException("sp:TransnportBinding must have an inner wsp:Policy element");
+ throw new IllegalArgumentException("sp:TransportBinding must have an inner wsp:Policy element");
}
final Policy nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);
TransportBinding transportBinding = new TransportBinding(
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java?rev=1453418&r1=1453417&r2=1453418&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java Wed Mar 6 16:49:10 2013
@@ -70,7 +70,7 @@ public abstract class AbstractSecurityAs
@Override
public boolean equal(PolicyComponent policyComponent) {
- throw new UnsupportedOperationException();
+ return policyComponent == this;
}
public void setNormalized(boolean normalized) {
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java?rev=1453418&r1=1453417&r2=1453418&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java Wed Mar 6 16:49:10 2013
@@ -21,7 +21,6 @@ package org.apache.wss4j.policy.model;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
-import org.apache.neethi.PolicyContainingAssertion;
import org.apache.wss4j.policy.SPConstants;
import javax.xml.namespace.QName;
@@ -35,9 +34,8 @@ import java.util.List;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class SupportingTokens extends AbstractSecurityAssertion implements PolicyContainingAssertion {
+public class SupportingTokens extends AbstractTokenWrapper {
- private Policy nestedPolicy;
private SupportingTokenType supportingTokenType;
private final List<AbstractToken> tokens = new ArrayList<AbstractToken>();
private AlgorithmSuite algorithmSuite;
@@ -47,19 +45,13 @@ public class SupportingTokens extends Ab
private EncryptedElements encryptedElements;
public SupportingTokens(SPConstants.SPVersion version, SupportingTokenType supportingTokenType, Policy nestedPolicy) {
- super(version);
- this.nestedPolicy = nestedPolicy;
+ super(version, nestedPolicy);
this.supportingTokenType = supportingTokenType;
parseNestedPolicy(nestedPolicy, this);
}
@Override
- public Policy getPolicy() {
- return nestedPolicy;
- }
-
- @Override
public QName getName() {
return getSupportingTokenType().getName();
}
@@ -195,4 +187,15 @@ public class SupportingTokens extends Ab
protected void setEncryptedElements(EncryptedElements encryptedElements) {
this.encryptedElements = encryptedElements;
}
+
+ /**
+ * @return true if the supporting token should be encrypted
+ */
+ public boolean isEncryptedToken() {
+ QName name = getName();
+ if (name != null && name.getLocalPart().contains("Encrypted")) {
+ return true;
+ }
+ return false;
+ }
}