Author: ruchithf
Date: Tue Feb 20 19:25:27 2007
New Revision: 509875
URL: http://svn.apache.org/viewvc?view=rev&rev=509875
Log:
Use the axis service to hold the fact whether we are operating in client side
or not
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?view=diff&rev=509875&r1=509874&r2=509875
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
Tue Feb 20 19:25:27 2007
@@ -71,6 +71,8 @@
* Key to hold the WS-Trust version
*/
public final static String KEY_WST_VERSION = "wstVersion";
+
+ private final String PARAM_CLIENT_SIDE = "CLIENT_SIDE";
/**
* Key to hold the WS-SecConv version
@@ -244,7 +246,21 @@
}
}
- this.isClientSide = !msgCtx.isServerSide();
+ Parameter clientSideParam =
msgCtx.getAxisService().getParameter(PARAM_CLIENT_SIDE);
+ if(clientSideParam != null) {
+ this.isClientSide = true;
+ } else {
+ this.isClientSide = !msgCtx.isServerSide();
+ if(this.isClientSide) {
+ clientSideParam = new Parameter();
+ clientSideParam.setName(PARAM_CLIENT_SIDE);
+ clientSideParam.setLocked(true);
+ msgCtx.getAxisService().addParameter(clientSideParam);
+ }
+ }
+
+
+
this.sender = sender;
OperationContext opCtx = this.msgContext.getOperationContext();
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java?view=diff&rev=509875&r1=509874&r2=509875
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
Tue Feb 20 19:25:27 2007
@@ -619,7 +619,7 @@
} else {
//Now we'll have to obtain the encryption token as well :-)
//ASSUMPTION: SecureConversationToken is used as a
- //ProtectionToken therfore we only have to process a issued
+ //ProtectionToken therefore we only have to process a issued
//token here
log.debug("Obtaining the Encryption Token");
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=509875&r1=509874&r2=509875
==============================================================================
---
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
Tue Feb 20 19:25:27 2007
@@ -379,6 +379,10 @@
IssuedToken issuedToken) throws RampartException {
try {
+
+ //TODO : Provide the overriding mechanism to prvide a custom way
of
+ //obtianing a token
+
String action = TrustUtil.getActionValue(rmd.getWstVersion(),
RahasConstants.RST_ACTION_ISSUE);
