Author: keith
Date: Tue Apr 29 02:17:46 2008
New Revision: 16320
Log:
Fixing the login call to use the client repo instaed of the server repo
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
==============================================================================
--- trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
(original)
+++ trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java
Tue Apr 29 02:17:46 2008
@@ -254,5 +254,8 @@
// Refers to the rampart module
public static final String RAMPART = "rampart";
+ // Refers to the addressing module
+ public static final String ADDRESSING = "addressing";
+
public static final int BUFFER_SIZE = 40960;
}
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java
==============================================================================
--- trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java
(original)
+++ trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java
Tue Apr 29 02:17:46 2008
@@ -464,19 +464,14 @@
try {
ServerManager serverManager = ServerManager.getInstance();
ConfigurationContext context = serverManager.configContext;
- ConfigurationContext defaultConfigurationContext =
-
ConfigurationContextFactory.createDefaultConfigurationContext();
- configuration = context.getAxisConfiguration();
- parameter = configuration.getParameter("Proxy");
- // The axis2.xml could have details of a proxy, and in that case
that can cause problems for login hence
- // we temparorily take it off before login and reinsert it later on
- if (parameter != null) {
- configuration.removeParameter(parameter);
- }
- defaultConfigurationContext.setAxisConfiguration(configuration);
- ServiceClient client = new
ServiceClient(defaultConfigurationContext, null);
- client.engageModule("rampart");
- client.engageModule("addressing");
+ String wso2wsasHome =
System.getProperty(MashupConstants.WSO2WSAS_HOME);
+ ConfigurationContext configurationContext =
+
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
+ wso2wsasHome + File.separator +
MashupConstants.WORK_DIRECTORY +
+ File.separator +
MashupConstants.REPO_DIRECTORY);
+ ServiceClient client = new ServiceClient(configurationContext,
null);
+ client.engageModule(MashupConstants.RAMPART);
+ client.engageModule(MashupConstants.ADDRESSING);
Options options = client.getOptions();
options.setAction("urn:login");
options.setTo(new EndpointReference("http://localhost:"; +
serverManager.getHttpPort() +
@@ -487,9 +482,9 @@
options.setProperty(HTTPConstants.COOKIE_STRING, "JSESSIONID=" +
cookieString);
options.setManageSession(true);
client.setOptions(options);
- String wso2wsasHome = System.getProperty("wso2wsas.home");
Policy stsPolicy = loadPolicy(wso2wsasHome + File.separator +
- "conf" + File.separator + "rampart" + File.separator +
"scenario21-policy.xml");
+ "conf" + File.separator + MashupConstants.RAMPART +
File.separator +
+ "scenario21-policy.xml");
client.getServiceContext()
.setProperty(RampartMessageData.KEY_RAMPART_POLICY,
stsPolicy);
client.sendReceive(null);
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
