You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ru...@apache.org on 2006/07/06 09:03:11 UTC
svn commit: r419471 - in /webservices/axis2/trunk/java/modules:
integration/test/org/apache/rahas/ rahas/src/org/apache/rahas/
rahas/src/org/apache/rahas/impl/
security/src/org/apache/rampart/conversation/
Author: ruchithf
Date: Thu Jul 6 00:03:10 2006
New Revision: 419471
URL: http://svn.apache.org/viewvc?rev=419471&view=rev
Log:
s/Constants/RahasConstants
Added:
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/RahasConstants.java
- copied, changed from r419430, webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/Constants.java
Removed:
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/Constants.java
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustException.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/STSRequester.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java?rev=419471&r1=419470&r2=419471&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java Thu Jul 6 00:03:10 2006
@@ -71,14 +71,14 @@
RequestSecurityTokenType rst = new RequestSecurityTokenType();
try {
- rst.setRequestType(new URI(org.apache.rahas.Constants.REQ_TYPE_ISSUE));
- rst.setTokenType(new URI(org.apache.rahas.Constants.TOK_TYPE_SAML_10));
+ rst.setRequestType(new URI(org.apache.rahas.RahasConstants.REQ_TYPE_ISSUE));
+ rst.setTokenType(new URI(org.apache.rahas.RahasConstants.TOK_TYPE_SAML_10));
rst.setContext(new URI("http://get.optional.attrs.working"));
Axis2Util.useDOOM(false);
StAXOMBuilder builder = new StAXOMBuilder(new StreamWrapper(rst
- .getPullParser(new QName(org.apache.rahas.Constants.WST_NS_05_02,
- org.apache.rahas.Constants.REQUEST_SECURITY_TOKEN_LN))));
+ .getPullParser(new QName(org.apache.rahas.RahasConstants.WST_NS,
+ org.apache.rahas.RahasConstants.REQUEST_SECURITY_TOKEN_LN))));
OMElement rstElem = builder.getDocumentElement();
@@ -96,7 +96,7 @@
}
public void validateRsponse(OMElement resp) {
- OMElement rst = resp.getFirstChildWithName(new QName(Constants.WST_NS_05_02, Constants.REQUESTED_SECURITY_TOKEN_LN));
+ OMElement rst = resp.getFirstChildWithName(new QName(RahasConstants.WST_NS, RahasConstants.REQUESTED_SECURITY_TOKEN_LN));
assertNotNull("RequestedSecurityToken missing", rst);
OMElement elem = rst.getFirstChildWithName(new QName(XML.SAML_NS, "Assertion"));
assertNotNull("Missing SAML Assertoin", elem);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java?rev=419471&r1=419470&r2=419471&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/TestClient.java Thu Jul 6 00:03:10 2006
@@ -63,7 +63,7 @@
Options options = new Options();
options.setTo(new EndpointReference("http://127.0.0.1:" + port + "/axis2/services/SecureService"));
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
- options.setAction(org.apache.rahas.Constants.RST_ACTON_SCT);
+ options.setAction(org.apache.rahas.RahasConstants.RST_ACTON_SCT);
Copied: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/RahasConstants.java (from r419430, webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/Constants.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/RahasConstants.java?p2=webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/RahasConstants.java&p1=webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/Constants.java&r1=419430&r2=419471&rev=419471&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/RahasConstants.java Thu Jul 6 00:03:10 2006
@@ -16,7 +16,7 @@
package org.apache.rahas;
-public class Constants {
+public class RahasConstants {
/**
* WS-Trust 2005 Feb namespace
@@ -33,10 +33,10 @@
public final static String WSP_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
public final static String WSP_PREFIX = "wsp";
- public static String NS = WST_NS_05_02;
+ public static String WST_NS = WST_NS_05_02;
public static void setVersion(String ns) {
- NS = ns;
+ WST_NS = ns;
}
//Local names
@@ -55,10 +55,10 @@
public final static String LIFETIME_LN = "Lifetime";
//RequestTypes
- public final static String REQ_TYPE_ISSUE = NS + "/Issue";
- public final static String REQ_TYPE_VALIDATE = NS + "/Validate";
- public final static String REQ_TYPE_RENEW = NS + "/Renew";
- public final static String REQ_TYPE_CANCEL = NS + "/Cancel";
+ public final static String REQ_TYPE_ISSUE = WST_NS + "/Issue";
+ public final static String REQ_TYPE_VALIDATE = WST_NS + "/Validate";
+ public final static String REQ_TYPE_RENEW = WST_NS + "/Renew";
+ public final static String REQ_TYPE_CANCEL = WST_NS + "/Cancel";
//Token types
public final static String TOK_TYPE_SCT = "http://schemas.xmlsoap.org/ws/2005/02/sc/sct";
@@ -66,22 +66,22 @@
//RST actions
- public final static String RST_ACTON_ISSUE = NS + "/RST/Issue";
- public final static String RST_ACTON_VALIDATE = NS + "/RST/Renew";
- public final static String RST_ACTON_RENEW = NS + "/RST/Cancel";
- public final static String RST_ACTON_CANCEL = NS + "/RST/Validate";
- public final static String RST_ACTON_SCT = NS + "/RST/SCT";
+ public final static String RST_ACTON_ISSUE = WST_NS + "/RST/Issue";
+ public final static String RST_ACTON_VALIDATE = WST_NS + "/RST/Renew";
+ public final static String RST_ACTON_RENEW = WST_NS + "/RST/Cancel";
+ public final static String RST_ACTON_CANCEL = WST_NS + "/RST/Validate";
+ public final static String RST_ACTON_SCT = WST_NS + "/RST/SCT";
//RSTR actions
- public final static String RSTR_ACTON_ISSUE = NS + "/RSTR/Issue";
- public final static String RSTR_ACTON_VALIDATE = NS + "/RSTR/Renew";
- public final static String RSTR_ACTON_RENEW = NS + "/RSTR/Cancel";
- public final static String RSTR_ACTON_CANCEL = NS + "/RSTR/Validate";
- public final static String RSTR_ACTON_SCT = NS + "/RSTR/SCT";
+ public final static String RSTR_ACTON_ISSUE = WST_NS + "/RSTR/Issue";
+ public final static String RSTR_ACTON_VALIDATE = WST_NS + "/RSTR/Renew";
+ public final static String RSTR_ACTON_RENEW = WST_NS + "/RSTR/Cancel";
+ public final static String RSTR_ACTON_CANCEL = WST_NS + "/RSTR/Validate";
+ public final static String RSTR_ACTON_SCT = WST_NS + "/RSTR/SCT";
//Attrs
public final static String ATTR_TYPE = "Type";
//Attr values
- public final static String BIN_SEC_TYPE_NONCE = NS + "/Nonce";
+ public final static String BIN_SEC_TYPE_NONCE = WST_NS + "/Nonce";
}
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java?rev=419471&r1=419470&r2=419471&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java Thu Jul 6 00:03:10 2006
@@ -55,16 +55,16 @@
RequestSecurityTokenType request = null;
OMElement rstElem = inMsgCtx.getEnvelope().getBody()
.getFirstChildWithName(
- new QName(Constants.WST_NS_05_02,
- Constants.REQUEST_SECURITY_TOKEN_LN));
+ new QName(RahasConstants.WST_NS,
+ RahasConstants.REQUEST_SECURITY_TOKEN_LN));
try {
request = RequestSecurityTokenType.Factory.parse(rstElem
.getXMLStreamReader());
} catch (Exception e) {
e.printStackTrace();
throw new TrustException(TrustException.INVALID_REQUEST,
- new String[] { "missing " + Constants.WST_PREFIX + ":"
- + Constants.REQUEST_SECURITY_TOKEN_LN }, e);
+ new String[] { "missing " + RahasConstants.WST_PREFIX + ":"
+ + RahasConstants.REQUEST_SECURITY_TOKEN_LN }, e);
}
URI reqType = request.getRequestType();
@@ -74,7 +74,7 @@
|| (reqType != null && "".equals(reqType.toString()))) {
throw new TrustException(TrustException.INVALID_REQUEST);
}
- if (Constants.REQ_TYPE_ISSUE.equals(reqType.toString())) {
+ if (RahasConstants.REQ_TYPE_ISSUE.equals(reqType.toString())) {
TokenIssuer issuer = null;
if (tokenType == null
|| (tokenType != null && "".equals(tokenType.toString()))) {
@@ -90,13 +90,13 @@
issuer.getResponseAction(rstElem, inMsgCtx));
return response;
- } else if(Constants.REQ_TYPE_VALIDATE.equals(reqType.toString())) {
+ } else if(RahasConstants.REQ_TYPE_VALIDATE.equals(reqType.toString())) {
throw new UnsupportedOperationException("TODO: handle " +
"validate requests");
- } else if(Constants.REQ_TYPE_RENEW.equals(reqType.toString())) {
+ } else if(RahasConstants.REQ_TYPE_RENEW.equals(reqType.toString())) {
throw new UnsupportedOperationException("TODO: handle " +
"renew requests");
- } else if(Constants.REQ_TYPE_CANCEL.equals(reqType.toString())) {
+ } else if(RahasConstants.REQ_TYPE_CANCEL.equals(reqType.toString())) {
throw new UnsupportedOperationException("TODO: handle " +
"cancel requests");
} else {
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustException.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustException.java?rev=419471&r1=419470&r2=419471&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustException.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustException.java Thu Jul 6 00:03:10 2006
@@ -73,7 +73,7 @@
RENEW_NEEDED.equals(code) ||
REQUEST_FAILED.equals(code) ||
UNABLE_TO_RENEW.equals(code)) {
- return Constants.WST_PREFIX + ":" + code;
+ return RahasConstants.WST_PREFIX + ":" + code;
} else {
return code;
}
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java?rev=419471&r1=419470&r2=419471&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java Thu Jul 6 00:03:10 2006
@@ -54,48 +54,48 @@
public static OMElement createRequestSecurityTokenResponseElement(
OMElement parent) {
- return createOMElement(parent,Constants.WST_NS_05_02,
- Constants.REQUEST_SECURITY_TOKEN_RESPONSE_LN,
- Constants.WST_PREFIX);
+ return createOMElement(parent,RahasConstants.WST_NS,
+ RahasConstants.REQUEST_SECURITY_TOKEN_RESPONSE_LN,
+ RahasConstants.WST_PREFIX);
}
public static OMElement createRequestedSecurityTokenElement(OMElement parent) {
- return createOMElement(parent,Constants.WST_NS_05_02,
- Constants.REQUESTED_SECURITY_TOKEN_LN,
- Constants.WST_PREFIX);
+ return createOMElement(parent,RahasConstants.WST_NS,
+ RahasConstants.REQUESTED_SECURITY_TOKEN_LN,
+ RahasConstants.WST_PREFIX);
}
public static OMElement createRequestedProofTokenElement(OMElement parent) {
- return createOMElement(parent, Constants.WST_NS_05_02,
- Constants.REQUESTED_PROOF_TOKEN_LN, Constants.WST_PREFIX);
+ return createOMElement(parent, RahasConstants.WST_NS,
+ RahasConstants.REQUESTED_PROOF_TOKEN_LN, RahasConstants.WST_PREFIX);
}
public static OMElement createEntropyElement(OMElement parent) {
- return createOMElement(parent, Constants.WST_NS_05_02,
- Constants.ENTROPY_LN, Constants.WST_PREFIX);
+ return createOMElement(parent, RahasConstants.WST_NS,
+ RahasConstants.ENTROPY_LN, RahasConstants.WST_PREFIX);
}
public static OMElement createtTokenTypeElement(OMElement parent) {
- return createOMElement(parent, Constants.WST_NS_05_02,
- Constants.TOKEN_TYPE_LN, Constants.WST_PREFIX);
+ return createOMElement(parent, RahasConstants.WST_NS,
+ RahasConstants.TOKEN_TYPE_LN, RahasConstants.WST_PREFIX);
}
public static OMElement createBinarySecretElement(OMElement parent,
String type) {
- OMElement elem = createOMElement(parent, Constants.WST_NS_05_02,
- Constants.BINARY_SECRET_LN, Constants.WST_PREFIX);
+ OMElement elem = createOMElement(parent, RahasConstants.WST_NS,
+ RahasConstants.BINARY_SECRET_LN, RahasConstants.WST_PREFIX);
if(type != null) {
elem.addAttribute(elem.getOMFactory().createOMAttribute(
- Constants.ATTR_TYPE, null, type));
+ RahasConstants.ATTR_TYPE, null, type));
}
return elem;
}
public static OMElement createRequestedUnattachedRef(OMElement parent,
String refUri, String refValueType) {
- OMElement elem = createOMElement(parent, Constants.WST_NS_05_02,
- Constants.REQUESTED_UNATTACHED_REFERENCE_LN,
- Constants.WST_PREFIX);
+ OMElement elem = createOMElement(parent, RahasConstants.WST_NS,
+ RahasConstants.REQUESTED_UNATTACHED_REFERENCE_LN,
+ RahasConstants.WST_PREFIX);
elem.addChild((OMElement) createSecurityTokenReference(
((Element) parent).getOwnerDocument(), refUri, refValueType));
return elem;
@@ -103,25 +103,25 @@
public static OMElement createRequestedAttachedRef(OMElement parent,
String refUri, String refValueType) {
- OMElement elem = createOMElement(parent, Constants.WST_NS_05_02,
- Constants.REQUESTED_ATTACHED_REFERENCE_LN,
- Constants.WST_PREFIX);
+ OMElement elem = createOMElement(parent, RahasConstants.WST_NS,
+ RahasConstants.REQUESTED_ATTACHED_REFERENCE_LN,
+ RahasConstants.WST_PREFIX);
elem.addChild((OMElement) createSecurityTokenReference(
((Element) parent).getOwnerDocument(), refUri, refValueType));
return elem;
}
public static OMElement createKeySizeElement(OMElement parent) {
- return createOMElement(parent, Constants.WST_NS_05_02,
- Constants.KEY_SIZE_LN,
- Constants.WST_PREFIX);
+ return createOMElement(parent, RahasConstants.WST_NS,
+ RahasConstants.KEY_SIZE_LN,
+ RahasConstants.WST_PREFIX);
}
public static OMElement createLifetimeElement(OMElement parent,
String created, String expires) {
- OMElement ltElem = createOMElement(parent, Constants.WST_NS_05_02,
- Constants.LIFETIME_LN,
- Constants.WST_PREFIX);
+ OMElement ltElem = createOMElement(parent, RahasConstants.WST_NS,
+ RahasConstants.LIFETIME_LN,
+ RahasConstants.WST_PREFIX);
OMElement createdElem = createOMElement(ltElem, WSConstants.WSU_NS,
WSConstants.CREATED_LN,
@@ -137,9 +137,9 @@
}
public static OMElement createAppliesToElement(OMElement parent) {
- return createOMElement(parent, Constants.WSP_NS,
- Constants.APPLIES_TO_LN,
- Constants.WSP_PREFIX);
+ return createOMElement(parent, RahasConstants.WSP_NS,
+ RahasConstants.APPLIES_TO_LN,
+ RahasConstants.WSP_PREFIX);
}
/**
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java?rev=419471&r1=419470&r2=419471&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java Thu Jul 6 00:03:10 2006
@@ -22,7 +22,7 @@
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.Parameter;
-import org.apache.rahas.Constants;
+import org.apache.rahas.RahasConstants;
import org.apache.rahas.Token;
import org.apache.rahas.TokenIssuer;
import org.apache.rahas.TrustException;
@@ -206,19 +206,19 @@
.createRequestSecurityTokenResponseElement(env.getBody());
TrustUtil.createtTokenTypeElement(rstrElem).setText(
- Constants.TOK_TYPE_SAML_10);
+ RahasConstants.TOK_TYPE_SAML_10);
TrustUtil.createKeySizeElement(rstrElem).setText(
Integer.toString(getKeySize(request, config)));
if (config.addRequestedAttachedRef) {
TrustUtil.createRequestedAttachedRef(rstrElem, "#"
- + assertion.getId(), Constants.TOK_TYPE_SAML_10);
+ + assertion.getId(), RahasConstants.TOK_TYPE_SAML_10);
}
if (config.addRequestedUnattachedRef) {
TrustUtil.createRequestedUnattachedRef(rstrElem, assertion.getId(),
- Constants.TOK_TYPE_SAML_10);
+ RahasConstants.TOK_TYPE_SAML_10);
}
//Use GMT time in milliseconds
@@ -270,7 +270,7 @@
private int getKeySize(OMElement request, SAMLTokenIssuerConfig config)
throws TrustException {
OMElement keySizeElem = request.getFirstChildWithName(
- new QName(Constants.WST_NS_05_02, Constants.KEY_SIZE_LN));
+ new QName(RahasConstants.WST_NS, RahasConstants.KEY_SIZE_LN));
if (keySizeElem != null) {
// Try to get the wst:KeySize value
try {
@@ -298,7 +298,7 @@
throws WSSecurityException, TrustException {
OMElement appliesToElem = request.getFirstChildWithName(
- new QName(Constants.WSP_NS, Constants.APPLIES_TO_LN));
+ new QName(RahasConstants.WSP_NS, RahasConstants.APPLIES_TO_LN));
if(appliesToElem != null) {
//Right now we only expect the service epr address to be here
String address = appliesToElem.getText().trim();
@@ -391,7 +391,7 @@
*/
public String getResponseAction(OMElement request, MessageContext inMsgCtx)
throws TrustException {
- return Constants.RSTR_ACTON_ISSUE;
+ return RahasConstants.RSTR_ACTON_ISSUE;
}
/*
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java?rev=419471&r1=419470&r2=419471&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java Thu Jul 6 00:03:10 2006
@@ -17,19 +17,15 @@
package org.apache.rahas.impl;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
-import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.Parameter;
-import org.apache.rahas.Constants;
-import org.apache.rahas.SimpleTokenStore;
+import org.apache.axis2.util.Base64;
+import org.apache.rahas.RahasConstants;
import org.apache.rahas.Token;
import org.apache.rahas.TokenIssuer;
-import org.apache.rahas.TokenStorage;
import org.apache.rahas.TrustException;
import org.apache.rahas.TrustUtil;
-import org.apache.axis2.util.Base64;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.WSSecurityException;
@@ -160,7 +156,7 @@
* @param config
*/
private void parseEntropyInfo(SOAPEnvelope envelope, SCTIssuerConfig config) {
- OMElement elem = envelope.getBody().getFirstChildWithName(new QName(Constants.WST_NS_05_02, Constants.REQUEST_SECURITY_TOKEN_LN));
+ OMElement elem = envelope.getBody().getFirstChildWithName(new QName(RahasConstants.WST_NS, RahasConstants.REQUEST_SECURITY_TOKEN_LN));
if(elem != null) {
//TODO get the entropy and keysize info
}
@@ -189,12 +185,12 @@
if (config.addRequestedAttachedRef) {
TrustUtil.createRequestedAttachedRef(rstrElem, "#" + sct.getID(),
- Constants.TOK_TYPE_SCT);
+ RahasConstants.TOK_TYPE_SCT);
}
if (config.addRequestedUnattachedRef) {
TrustUtil.createRequestedUnattachedRef(
- rstrElem, sct.getIdentifier(), Constants.TOK_TYPE_SCT);
+ rstrElem, sct.getIdentifier(), RahasConstants.TOK_TYPE_SCT);
}
OMElement reqProofTok = TrustUtil.createRequestedProofTokenElement(rstrElem);
@@ -246,12 +242,12 @@
if (config.addRequestedAttachedRef) {
TrustUtil.createRequestedAttachedRef(rstrElem, "#" + sct.getID(),
- Constants.TOK_TYPE_SCT);
+ RahasConstants.TOK_TYPE_SCT);
}
if (config.addRequestedUnattachedRef) {
TrustUtil.createRequestedUnattachedRef(
- rstrElem, sct.getIdentifier(), Constants.TOK_TYPE_SCT);
+ rstrElem, sct.getIdentifier(), RahasConstants.TOK_TYPE_SCT);
}
Element encryptedKeyElem = encrKeyBuilder.getEncryptedKeyElement();
@@ -276,7 +272,7 @@
}
public String getResponseAction(OMElement request, MessageContext inMsgCtx) throws TrustException {
- return Constants.RSTR_ACTON_SCT;
+ return RahasConstants.RSTR_ACTON_SCT;
}
/**
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/STSRequester.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/STSRequester.java?rev=419471&r1=419470&r2=419471&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/STSRequester.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/STSRequester.java Thu Jul 6 00:03:10 2006
@@ -30,7 +30,7 @@
import org.apache.axis2.description.Parameter;
import org.apache.rampart.RampartException;
import org.apache.rampart.handler.WSSHandlerConstants;
-import org.apache.rahas.Constants;
+import org.apache.rahas.RahasConstants;
import org.apache.rahas.TrustUtil;
import org.apache.rahas.types.RequestSecurityTokenType;
import org.apache.rampart.util.Axis2Util;
@@ -54,7 +54,7 @@
Options options = new Options();
options.setTo(new EndpointReference(config.getStsEPRAddress()));
- options.setAction(Constants.RST_ACTON_SCT);
+ options.setAction(RahasConstants.RST_ACTON_SCT);
//Get the security configurations
Parameter outFlowParam = msgCtx
@@ -81,14 +81,14 @@
RequestSecurityTokenType rst = new RequestSecurityTokenType();
try {
- rst.setRequestType(new URI(Constants.REQ_TYPE_ISSUE));
- rst.setTokenType(new URI(Constants.TOK_TYPE_SCT));
+ rst.setRequestType(new URI(RahasConstants.REQ_TYPE_ISSUE));
+ rst.setTokenType(new URI(RahasConstants.TOK_TYPE_SCT));
rst.setContext(new URI("http://get.optional.attrs.working"));
Axis2Util.useDOOM(false);
StAXOMBuilder builder = new StAXOMBuilder(new StreamWrapper(rst
- .getPullParser(new QName(Constants.WST_NS_05_02,
- Constants.REQUEST_SECURITY_TOKEN_LN))));
+ .getPullParser(new QName(RahasConstants.WST_NS,
+ RahasConstants.REQUEST_SECURITY_TOKEN_LN))));
OMElement rstElem = builder.getDocumentElement();
@@ -106,7 +106,7 @@
byte[] nonce = WSSecurityUtil.generateNonce(nonceLength);
OMElement elem = TrustUtil.createBinarySecretElement(entropyElem,
- Constants.BIN_SEC_TYPE_NONCE);
+ RahasConstants.BIN_SEC_TYPE_NONCE);
elem.setText(Base64.encode(nonce));
TrustUtil.createKeySizeElement(rstElem).setText(
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java?rev=419471&r1=419470&r2=419471&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java Thu Jul 6 00:03:10 2006
@@ -17,7 +17,7 @@
package org.apache.rampart.conversation;
import org.apache.axiom.om.OMElement;
-import org.apache.rahas.Constants;
+import org.apache.rahas.RahasConstants;
import org.apache.rahas.Token;
import org.apache.rahas.TrustException;
import org.apache.axis2.util.Base64;
@@ -78,7 +78,7 @@
throws Exception {
// Extract the SecurityContextToken
OMElement rstElem = rstr.getFirstChildWithName(new QName(
- Constants.WST_NS_05_02, Constants.REQUESTED_SECURITY_TOKEN_LN));
+ RahasConstants.WST_NS, RahasConstants.REQUESTED_SECURITY_TOKEN_LN));
Token token = null;
if (rstElem != null) {
OMElement sctElem = rstElem
@@ -97,8 +97,8 @@
// Process RequestedProofToken and extract the secret
byte[] secret = null;
- OMElement rpt = rstr.getFirstChildWithName(new QName(Constants.WST_NS_05_02,
- Constants.REQUESTED_PROOF_TOKEN_LN));
+ OMElement rpt = rstr.getFirstChildWithName(new QName(RahasConstants.WST_NS_05_02,
+ RahasConstants.REQUESTED_PROOF_TOKEN_LN));
if (rpt != null) {
OMElement elem = rpt.getFirstElement();
@@ -111,8 +111,8 @@
getCallbackHandlerInstance(config), null, new Vector(),
null);
secret = processor.getDecryptedBytes();
- } else if (Constants.BINARY_SECRET_LN.equals(elem.getLocalName())
- && Constants.WST_NS_05_02.equals(elem.getNamespace().getName())) {
+ } else if (RahasConstants.BINARY_SECRET_LN.equals(elem.getLocalName())
+ && RahasConstants.WST_NS_05_02.equals(elem.getNamespace().getName())) {
// Handle the wst:BinarySecret case
secret = Base64.decode(elem.getText());
} else {
@@ -126,12 +126,12 @@
// Check for attached ref
OMElement reqAttElem = rstr.getFirstChildWithName(new QName(
- Constants.WST_NS_05_02, Constants.REQUESTED_ATTACHED_REFERENCE_LN));
+ RahasConstants.WST_NS_05_02, RahasConstants.REQUESTED_ATTACHED_REFERENCE_LN));
OMElement reqAttRef = reqAttElem == null ? null : reqAttElem
.getFirstElement();
OMElement reqUnattElem = rstr.getFirstChildWithName(new QName(
- Constants.WST_NS_05_02, Constants.REQUESTED_UNATTACHED_REFERENCE_LN));
+ RahasConstants.WST_NS_05_02, RahasConstants.REQUESTED_UNATTACHED_REFERENCE_LN));
OMElement reqUnattRef = reqUnattElem == null ? null : reqUnattElem
.getFirstElement();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org