Author: ruchithf
Date: Wed Jul 11 00:47:06 2007
New Revision: 555196
URL: http://svn.apache.org/viewvc?view=rev&rev=555196
Log:
Fixed some typos
Got rid of usages of deprecated style of module engagement
Added a way to obtain the token storage instance from config context
Fixed a copy-paste error in IssuedTokenBuilder to make sure we get hold of the
RST Template assertion information properly
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.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/client/STSClient.java
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java?view=diff&rev=555196&r1=555195&r2=555196
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
Wed Jul 11 00:47:06 2007
@@ -86,7 +86,10 @@
//Add the UT
utBuilder.appendToHeader(rmd.getSecHeader());
- } else {
+ } if(token instanceof IssuedToken) {
+ //TODO Handle issued token
+
+ }else {
throw new
RampartException("unsupportedSignedSupportingToken",
new String[]{"{"
+token.getName().getNamespaceURI()
+ "}" + token.getName().getLocalPart()});
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?view=diff&rev=555196&r1=555195&r2=555196
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Wed Jul 11 00:47:06 2007
@@ -423,8 +423,8 @@
try {
- //TODO : Provide the overriding mechanism to prvide a custom way
of
- //obtianing a token
+ //TODO : Provide the overriding mechanism to provide a custom way
of
+ //obtaining a token
String action = TrustUtil.getActionValue(rmd.getWstVersion(),
RahasConstants.RST_ACTION_ISSUE);
Modified:
webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java?view=diff&rev=555196&r1=555195&r2=555196
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
Wed Jul 11 00:47:06 2007
@@ -64,8 +64,8 @@
ServiceClient serviceClient = new ServiceClient(configContext,
null);
- serviceClient.engageModule(new QName("addressing"));
- serviceClient.engageModule(new QName("rampart"));
+ serviceClient.engageModule("addressing");
+ serviceClient.engageModule("rampart");
//TODO : figure this out !!
boolean basic256Supported = true;
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=555196&r1=555195&r2=555196
==============================================================================
---
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
Wed Jul 11 00:47:06 2007
@@ -47,9 +47,9 @@
}
// Extract RSTTemplate
- OMElement rstTmplElem =
element.getFirstChildWithName(Constants.ISSUER);
+ OMElement rstTmplElem =
element.getFirstChildWithName(Constants.RST_TEMPLATE);
if (rstTmplElem != null) {
- issuedToken.setIssuerEpr(rstTmplElem);
+ issuedToken.setRstTemplate(rstTmplElem);
}
OMElement policyElement = element.getFirstElement();
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=555196&r1=555195&r2=555196
==============================================================================
---
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
Wed Jul 11 00:47:06 2007
@@ -376,7 +376,7 @@
/**
* Returns the token store.
- * If the token store is aleady available in the configuration context then
+ * If the token store is already available in the configuration context
then
* fetch it and return it. If not create a new one, hook it up in the
* configuration context and return it
*
@@ -385,11 +385,23 @@
*/
public static TokenStorage getTokenStore(MessageContext msgCtx) {
ConfigurationContext configCtx = msgCtx.getConfigurationContext();
- TokenStorage storage =
- (TokenStorage)
configCtx.getProperty(TokenStorage.TOKEN_STORAGE_KEY);
+ return getTokenStore(configCtx);
+ }
+
+ /**
+ * Fetches the token storage from the configuration context.
+ * If the token store is already available in the configuration context
then
+ * fetch it and return it. If not create a new one, hook it up in the
+ * configuration context and return it
+ * @param ctx
+ * @return
+ */
+ public static TokenStorage getTokenStore(ConfigurationContext ctx) {
+ TokenStorage storage = (TokenStorage) ctx
+ .getProperty(TokenStorage.TOKEN_STORAGE_KEY);
if (storage == null) {
storage = new SimpleTokenStore();
- configCtx.setProperty(TokenStorage.TOKEN_STORAGE_KEY, storage);
+ ctx.setProperty(TokenStorage.TOKEN_STORAGE_KEY, storage);
}
return storage;
}
Modified:
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java?view=diff&rev=555196&r1=555195&r2=555196
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
Wed Jul 11 00:47:06 2007
@@ -121,7 +121,6 @@
client.getServiceContext().setProperty(RAMPART_POLICY,
issuerPolicy);
client.getOptions().setSoapVersionURI(this.soapVersion);
client.engageModule("addressing");
- client.engageModule("rampart");
//Process the STS and service policy policy
this.processPolicy(issuerPolicy, servicePolicy);
@@ -178,7 +177,7 @@
//Set the action
client.getOptions().setAction(action);
client.getOptions().setTo(new EndpointReference(issuerAddress));
- client.engageModule(new QName("rampart"));
+ client.engageModule("rampart");
return client;
}
