Author: coheigea
Date: Wed Jun 4 13:14:55 2014
New Revision: 1600187
URL: http://svn.apache.org/r1600187
Log:
Relax the requirement for a wsp:Policy child of KeyValueToken for ADFS interop
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java?rev=1600187&r1=1600186&r2=1600187&view=diff
==============================================================================
---
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java
(original)
+++
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java
Wed Jun 4 13:14:55 2014
@@ -46,10 +46,14 @@ public class KeyValueTokenBuilder implem
throw new IllegalArgumentException(SPConstants.ERR_INVALID_POLICY);
}
final Element nestedPolicyElement =
SPUtils.getFirstPolicyChildElement(element);
+ Policy nestedPolicy;
if (nestedPolicyElement == null) {
- throw new IllegalArgumentException("sp:KeyValueToken must have an
inner wsp:Policy element");
+ //throw new IllegalArgumentException("sp:KeyValueToken must have
an inner wsp:Policy element");
+ nestedPolicy = new Policy();
+ } else {
+ nestedPolicy =
factory.getPolicyEngine().getPolicy(nestedPolicyElement);
}
- final Policy nestedPolicy =
factory.getPolicyEngine().getPolicy(nestedPolicyElement);
+
KeyValueToken keyValueToken = new KeyValueToken(
spVersion,
spVersion.getSPConstants().getInclusionFromAttributeValue(includeTokenValue),
