Author: ruchithf
Date: Thu Jul 5 04:33:56 2007
New Revision: 553459
URL: http://svn.apache.org/viewvc?view=rev&rev=553459
Log:
Fixed RAMPART-52
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SecurityContextTokenBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/UsernameTokenBuilder.java
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.java?view=diff&rev=553459&r1=553458&r2=553459
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.java
Thu Jul 5 04:33:56 2007
@@ -15,6 +15,7 @@
*/
package org.apache.ws.secpolicy.builders;
+import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
@@ -35,6 +36,10 @@
throws IllegalArgumentException {
IssuedToken issuedToken = new IssuedToken();
+ OMAttribute includeAttr =
element.getAttribute(Constants.INCLUDE_TOKEN);
+ if(includeAttr != null) {
+ issuedToken.setInclusion(includeAttr.getAttributeValue());
+ }
// Extract Issuer
OMElement issuerElem = element.getFirstChildWithName(Constants.ISSUER);
if (issuerElem != null && issuerElem.getFirstElement() != null) {
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SecurityContextTokenBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SecurityContextTokenBuilder.java?view=diff&rev=553459&r1=553458&r2=553459
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SecurityContextTokenBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SecurityContextTokenBuilder.java
Thu Jul 5 04:33:56 2007
@@ -15,8 +15,6 @@
*/
package org.apache.ws.secpolicy.builders;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
@@ -25,6 +23,8 @@
import org.apache.ws.secpolicy.Constants;
import org.apache.ws.secpolicy.model.SecurityContextToken;
+import javax.xml.namespace.QName;
+
public class SecurityContextTokenBuilder implements AssertionBuilder {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
@@ -33,25 +33,10 @@
SecurityContextToken contextToken = new SecurityContextToken();
OMAttribute attribute = element.getAttribute(Constants.INCLUDE_TOKEN);
- if (attribute == null) {
- throw new IllegalArgumentException(
- "SecurityContextToken doesn't contain any sp:IncludeToken
attribute");
- }
-
- String inclusionValue = attribute.getAttributeValue().trim();
-
- if (inclusionValue.endsWith(Constants.INCLUDE_NEVER)) {
- contextToken.setInclusion(Constants.INCLUDE_NEVER);
-
- } else if (inclusionValue.endsWith(Constants.INCLUDE_ONCE)) {
- contextToken.setInclusion(Constants.INCLUDE_ONCE);
-
- } else if (inclusionValue
- .endsWith(Constants.INCLUDE_ALWAYS_TO_RECIPIENT)) {
- contextToken.setInclusion(Constants.INCLUDE_ALWAYS_TO_RECIPIENT);
- } else if (inclusionValue.endsWith(Constants.INCLUDE_ALWAYS)) {
- contextToken.setInclusion(Constants.INCLUDE_ALWAYS);
+ OMAttribute includeAttr =
element.getAttribute(Constants.INCLUDE_TOKEN);
+ if(includeAttr != null) {
+ contextToken.setInclusion(includeAttr.getAttributeValue());
}
element = element.getFirstChildWithName(Constants.POLICY);
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/UsernameTokenBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/UsernameTokenBuilder.java?view=diff&rev=553459&r1=553458&r2=553459
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/UsernameTokenBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/UsernameTokenBuilder.java
Thu Jul 5 04:33:56 2007
@@ -37,21 +37,9 @@
UsernameToken usernameToken = new UsernameToken();
OMAttribute attribute = element.getAttribute(Constants.INCLUDE_TOKEN);
- String inclusionValue = attribute.getAttributeValue();
-
- if (inclusionValue.endsWith(Constants.INCLUDE_NEVER)) {
- usernameToken.setInclusion(Constants.INCLUDE_NEVER);
-
- } else if (inclusionValue.endsWith(Constants.INCLUDE_ONCE)) {
- usernameToken.setInclusion(Constants.INCLUDE_ONCE);
-
- } else if
(inclusionValue.endsWith(Constants.INCLUDE_ALWAYS_TO_RECIPIENT)) {
- usernameToken.setInclusion(Constants.INCLUDE_ALWAYS_TO_RECIPIENT);
-
- } else if (inclusionValue.endsWith(Constants.INCLUDE_ALWAYS)) {
- usernameToken.setInclusion(Constants.INCLUDE_ALWAYS);
+ if(attribute != null) {
+ usernameToken.setInclusion(attribute.getAttributeValue());
}
-
OMElement policyElement = element.getFirstElement();
