Author: keith
Date: Tue Apr 29 02:21:22 2008
New Revision: 16322
Log:
Fixing the login function that uses infocard to use the client repo too
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java
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:21:22 2008
@@ -30,7 +30,6 @@
import org.apache.axis2.deployment.repository.util.DeploymentFileData;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.rpc.client.RPCServiceClient;
import org.apache.axis2.transport.http.HTTPConstants;
@@ -93,7 +92,6 @@
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
-import java.util.List;
import java.util.Properties;
public class MashupUtils {
@@ -511,19 +509,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);
- RPCServiceClient client = new
RPCServiceClient(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);
+ RPCServiceClient client = new
RPCServiceClient(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() +
@@ -532,7 +525,6 @@
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 +
"scenario22-policy.xml");
client.getServiceContext()
@@ -956,12 +948,8 @@
ConfigurationContext configContext = serverManager.configContext;
// If all transports in te Axis configuration is enabled for this
service, just returning true.
-
if(configContext.getAxisConfiguration().getService(serviceName).isEnableAllTransports()){
- return true;
- }else{
- return
configContext.getAxisConfiguration().getService(serviceName).isExposedTransport(transportName);
- }
+ return configContext.getAxisConfiguration().getService(serviceName)
+ .isEnableAllTransports() ||
configContext.getAxisConfiguration()
+ .getService(serviceName).isExposedTransport(transportName);
}
-
-
-}
+}
\ No newline at end of file
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
