Author: ruchithf
Date: Tue Jul 18 01:30:12 2006
New Revision: 423010
URL: http://svn.apache.org/viewvc?rev=423010&view=rev
Log:
Use a different set of ws-sec parameter names for a clien't to access an STS
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/TestClient.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/STSRequester.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSSHandlerConstants.java
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/TestClient.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/TestClient.java?rev=423010&r1=423009&r2=423010&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/TestClient.java
(original)
+++
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/sc/TestClient.java
Tue Jul 18 01:30:12 2006
@@ -40,7 +40,7 @@
public abstract class TestClient extends TestCase {
private static final String AXIS2_ECHO_STRING = "Axis2 Echo String";
- protected int port = UtilServer.TESTING_PORT;
+ protected int port = 5556;//UtilServer.TESTING_PORT;
public TestClient(String name) {
super(name);
@@ -74,11 +74,11 @@
OutflowConfiguration clientOutflowConfiguration =
getClientOutflowConfiguration();
if(clientOutflowConfiguration != null) {
- options.setProperty(WSSHandlerConstants.OUTFLOW_SECURITY,
clientOutflowConfiguration.getProperty());
+ options.setProperty(WSSHandlerConstants.STS_OUTFLOW_SECURITY,
clientOutflowConfiguration.getProperty());
}
InflowConfiguration clientInflowConfiguration =
getClientInflowConfiguration();
if(clientInflowConfiguration != null) {
- options.setProperty(WSSHandlerConstants.INFLOW_SECURITY,
clientInflowConfiguration.getProperty());
+ options.setProperty(WSSHandlerConstants.STS_INFLOW_SECURITY,
clientInflowConfiguration.getProperty());
}
options.setProperty(ConversationConfiguration.SC_CONFIG,
getClientConversationConfiguration());
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=423010&r1=423009&r2=423010&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
Tue Jul 18 01:30:12 2006
@@ -58,19 +58,21 @@
//Get the security configurations
Parameter outFlowParam = msgCtx
- .getParameter(WSSHandlerConstants.OUTFLOW_SECURITY);
+ .getParameter(WSSHandlerConstants.STS_OUTFLOW_SECURITY);
Parameter inFlowParam = msgCtx
- .getParameter(WSSHandlerConstants.INFLOW_SECURITY);
+ .getParameter(WSSHandlerConstants.STS_INFLOW_SECURITY);
if(outFlowParam == null) {
outFlowParam = (Parameter) msgCtx
- .getProperty(WSSHandlerConstants.OUTFLOW_SECURITY);
+ .getProperty(WSSHandlerConstants.STS_OUTFLOW_SECURITY);
}
if(inFlowParam == null) {
inFlowParam = (Parameter) msgCtx
- .getProperty(WSSHandlerConstants.INFLOW_SECURITY);
+ .getProperty(WSSHandlerConstants.STS_INFLOW_SECURITY);
}
+
+ //Set the STS specific config config
options.setProperty(WSSHandlerConstants.OUTFLOW_SECURITY,
outFlowParam);
options.setProperty(WSSHandlerConstants.INFLOW_SECURITY, inFlowParam);
Modified:
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSSHandlerConstants.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSSHandlerConstants.java?rev=423010&r1=423009&r2=423010&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSSHandlerConstants.java
(original)
+++
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSSHandlerConstants.java
Tue Jul 18 01:30:12 2006
@@ -36,7 +36,7 @@
public static final String INFLOW_SECURITY_SERVER =
"InflowSecurity-server";
public static final String INFLOW_SECURITY_CLIENT =
"InflowSecurity-client";
-
+
/**
* Outflow security parameter
*/
@@ -44,6 +44,20 @@
public static final String OUTFLOW_SECURITY_SERVER =
"OutflowSecurity-server";
public static final String OUTFLOW_SECURITY_CLIENT =
"OutflowSecurity-client";
+
+
+ /**
+ * Inflow security parameter of a client to talk to an STS
+ * when sec conv is used
+ */
+ public final static String STS_INFLOW_SECURITY = "STSInflowSecurity";
+
+ /**
+ * Outflow security parameter of a client to talk to an STS
+ * when sec conv is used
+ */
+ public final static String STS_OUTFLOW_SECURITY = "STSOutflowSecurity";
+
public static final String ACTION = "action";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
