Author: keith
Date: Mon Mar 31 02:00:17 2008
New Revision: 15369
Log:
Fixing system.include to work when context is in place
Modified:
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/SystemHostObject.java
Modified:
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/SystemHostObject.java
==============================================================================
---
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/SystemHostObject.java
(original)
+++
trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/SystemHostObject.java
Mon Mar 31 02:00:17 2008
@@ -15,12 +15,11 @@
*/
package org.wso2.mashup.hostobjects.system;
-import org.apache.axiom.om.util.UUIDGenerator;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
@@ -36,6 +35,7 @@
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.SimpleTrigger;
+import org.wso2.adminui.AdminUIServletContextListener;
import org.wso2.javascript.rhino.JavaScriptEngine;
import org.wso2.javascript.rhino.JavaScriptEngineConstants;
import org.wso2.mashup.MashupConstants;
@@ -45,8 +45,19 @@
import org.wso2.wsas.ServerManager;
import javax.xml.stream.XMLStreamException;
-import java.io.*;
-import java.net.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.SocketException;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -194,7 +205,8 @@
try {
baseURI = new URI("http", null, NetworkUtils.getLocalHostname(),
ServerManager.getInstance().getHttpPort(),
- configurationContext.getServiceContextPath() +
"/",
+ AdminUIServletContextListener.contextPath + "/" +
+
configurationContext.getServiceContextPath() + "/",
null, null);
} catch (Exception e) {
throw new MashupFault("Cannot create the server base URI.", e);
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
