Author: ruchithf
Date: Thu Mar 29 06:16:46 2007
New Revision: 523695
URL: http://svn.apache.org/viewvc?view=rev&rev=523695
Log:
Updating rahas to comply with the latest axiom changes
Modified:
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerImpl.java
Modified:
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java?view=diff&rev=523695&r1=523694&r2=523695
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
Thu Mar 29 06:16:46 2007
@@ -66,8 +66,6 @@
public static class CancelBindingLocalNames {
public static final String REQUESTED_TOKEN_CANCELED =
"RequestedTokenCancelled";
public static final String CANCEL_TARGET = "CancelTarget";
- public static final String SECURITY_TOKEN_REF =
"SecurityTokenReference";
- public static final String REFERENCE = "Reference";
public static final String URI = "URI";
}
Modified:
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java?view=diff&rev=523695&r1=523694&r2=523695
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
Thu Mar 29 06:16:46 2007
@@ -42,9 +42,7 @@
import java.util.Iterator;
public class TrustUtil {
- private static final String WSSE_NAMESPACE_URI =
-
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";;
- private static final String WSSE_PREFIX = "wsse";
+
private static final QName PROVIDER = new QName("provider");
private static final QName NAME = new QName("name");
@@ -481,13 +479,11 @@
OMElement cancelTargetEle =
TrustUtil.createCancelTargetElement(version, rst);
OMFactory factory = rst.getOMFactory();
OMElement secTokenRefEle =
-
factory.createOMElement(RahasConstants.CancelBindingLocalNames.SECURITY_TOKEN_REF,
- WSSE_NAMESPACE_URI,
- WSSE_PREFIX);
+
factory.createOMElement(SecurityTokenReference.SECURITY_TOKEN_REFERENCE,
+ WSConstants.WSSE_NS,
+ WSConstants.WSSE_PREFIX);
OMElement refEle =
-
factory.createOMElement(RahasConstants.CancelBindingLocalNames.REFERENCE,
- WSSE_NAMESPACE_URI,
- WSSE_PREFIX);
+ factory.createOMElement(Reference.TOKEN);
refEle.addAttribute(factory.createOMAttribute(RahasConstants.CancelBindingLocalNames.URI,
null, tokenId));
secTokenRefEle.addChild(refEle);
Modified:
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerImpl.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerImpl.java?view=diff&rev=523695&r1=523694&r2=523695
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerImpl.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerImpl.java
Thu Mar 29 06:16:46 2007
@@ -22,6 +22,9 @@
import org.apache.rahas.RahasConstants;
import org.apache.rahas.TokenStorage;
import org.apache.rahas.Token;
+import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.message.token.Reference;
+import org.apache.ws.security.message.token.SecurityTokenReference;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAttribute;
@@ -39,14 +42,6 @@
private OMElement configElement;
private String configParamName;
- private static final QName QNAME_CANCEL_TARGET =
- new QName(RahasConstants.CancelBindingLocalNames.CANCEL_TARGET);
- private static final QName QNAME_SEC_TOKEN_REF =
- new
QName(RahasConstants.CancelBindingLocalNames.SECURITY_TOKEN_REF);
- private static final QName QNAME_REFERENCE =
- new QName(RahasConstants.CancelBindingLocalNames.REFERENCE);
- private static final QName QNAME_URI = new
QName(RahasConstants.CancelBindingLocalNames.URI);
-
/**
* Cancel the token specified in the request.
*
@@ -86,12 +81,15 @@
}
OMElement rstEle = data.getRstElement();
- OMElement cancelTargetEle =
rstEle.getFirstChildWithName(QNAME_CANCEL_TARGET);
+ QName cancelTagetQName = new QName(data.getWstNs(),
RahasConstants.CancelBindingLocalNames.CANCEL_TARGET);
+ OMElement cancelTargetEle =
rstEle.getFirstChildWithName(cancelTagetQName);
if (cancelTargetEle == null) {
throw new TrustException("requiredElementNotFound",
- new
String[]{QNAME_CANCEL_TARGET.getLocalPart()});
+ new
String[]{cancelTagetQName.toString()});
}
- OMElement secTokenRefEle =
cancelTargetEle.getFirstChildWithName(QNAME_SEC_TOKEN_REF);
+ OMElement secTokenRefEle = cancelTargetEle
+ .getFirstChildWithName(new QName(WSConstants.WSSE_NS,
+ SecurityTokenReference.SECURITY_TOKEN_REFERENCE));
String tokenId;
if (secTokenRefEle != null) {
@@ -102,9 +100,10 @@
ValueType="http://schemas.xmlsoap.org/ws/2005/02/sc/sct"; />
</o:SecurityTokenReference>
*/
- OMElement referenceEle =
secTokenRefEle.getFirstChildWithName(QNAME_REFERENCE);
+ OMElement referenceEle =
secTokenRefEle.getFirstChildWithName(Reference.TOKEN);
if (referenceEle != null) {
- OMAttribute uri = referenceEle.getAttribute(QNAME_URI);
+ OMAttribute uri = referenceEle.getAttribute(new QName(
+ RahasConstants.CancelBindingLocalNames.URI));
if (uri != null) {
tokenId = uri.getAttributeValue().substring(1);
} else {
