[wsas-java-dev] svn commit r2776 - in trunk/wsas/java/modules:
admin/src/org/wso2/wsas/admin/service core/src/org/wso2/wsas
www/extensions/core/js
svn at wso2.org
svn at wso2.org
Wed May 16 23:07:13 PDT 2007
Author: saminda
Date: Wed May 16 23:06:53 2007
New Revision: 2776
Modified:
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/MainServlet.java
trunk/wsas/java/modules/www/extensions/core/js/services.js
trunk/wsas/java/modules/www/extensions/core/js/wso2wsas.js
Log:
Fixes for auto discovering of paths
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java Wed May 16 23:06:53 2007
@@ -63,8 +63,4 @@
public void save() throws AxisFault {
FileBasedConfigSerializer.serialize(getAxisConfig());
}
-
- public int getHttpPort() throws AxisFault {
- return ServerManager.httpPort;
- }
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/MainServlet.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/MainServlet.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/MainServlet.java Wed May 16 23:06:53 2007
@@ -159,6 +159,9 @@
serverInfo.process();
ServerManager.httpPort = serverInfo.getHttpPort();
ServerManager.httpsPort = serverInfo.getHttpsPort();
+
+ initAdminUIServletFilter(servletConfig);
+
printInfo(startTime);
System.getProperties().remove(ServerConstants.WSO2WSAS_START_TIME);
}
@@ -193,22 +196,29 @@
configCtx.setProperty(ServerConstants.WORK_DIR, serverManager.serverWorkDir);
configCtx.setProperty(ServerConstants.WSO2WSAS_INSTANCE, this);
- AdminUIServletFilter adminUIServletFilter =
- ((AdminUIServletFilter) servletContext
- .getAttribute(AdminUIServletFilter.class.getName()));
- if (adminUIServletFilter != null) {
- adminUIServletFilter.init(
- (Map) configCtx.getProperty(ServerConstants.GENERATED_PAGES),
- Utils.isAdminConsoleEnabled(), ServerManager.httpsPort,
- configCtx.getServicePath());
- }
-
startServerController();
} catch (Exception e) {
log.fatal(serverName + " startup failed.");
}
}
+ private void initAdminUIServletFilter(ServletConfig servletConfig) throws ServletException {
+ ConfigurationContext configCtx = serverManager.configContext;
+ ServletContext servletContext = servletConfig.getServletContext();
+ AdminUIServletFilter adminUIServletFilter =
+ ((AdminUIServletFilter) servletContext
+ .getAttribute(AdminUIServletFilter.class.getName()));
+ if (adminUIServletFilter != null) {
+ adminUIServletFilter.init(
+ (Map) configCtx.getProperty(ServerConstants.GENERATED_PAGES),
+ Utils.isAdminConsoleEnabled(),
+ ServerManager.httpsPort,
+ ServerManager.httpPort,
+ configCtx.getServicePath());
+ }
+
+ }
+
private void printInfo(long startTime) {
log.info("Using Repository " + serverManager.axis2RepoLocation);
log.info("");
@@ -350,7 +360,7 @@
Map genPages = (Map) serverManager.configContext.
getProperty(ServerConstants.GENERATED_PAGES);
adminUIServletFilter.init(genPages, Utils.isAdminConsoleEnabled(),
- ServerManager.httpsPort,
+ ServerManager.httpsPort, ServerManager.httpPort,
serverManager.configContext.getServicePath());
}
}
Modified: trunk/wsas/java/modules/www/extensions/core/js/services.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/services.js (original)
+++ trunk/wsas/java/modules/www/extensions/core/js/services.js Wed May 16 23:06:53 2007
@@ -55,7 +55,6 @@
var defaultHttpPort;
var defaultBrowserHost;
-var defaultopenWindowHTTPURL;
var SERVICE_REFRESH_TIME = 10000;
// This holds thread's id, which is positive
@@ -706,9 +705,7 @@
var responseTextValue = data.getElementsByTagName("return")[0].firstChild.nodeValue;
- var _url = self.location.href.substring(0, locationString.lastIndexOf('/'));
-
- window.location = _url + responseTextValue;
+ window.location = URL + responseTextValue;
}
@@ -1537,31 +1534,7 @@
gatherHistoryObject(thisObj.id, index);
}
- var body_xml = '<req:getHttpPortRequest xmlns:req="http://org.apache.axis2/xsd">\n' +
- '</req:getHttpPortRequest>\n';
-
- var callURL = serverURL + "/" + "ServerAdmin" ;
- send("getHttpPort", body_xml, "", callURL, "", false, startServicesCallback);
-
-}
-
-function startServicesCallback() {
- if (!onError()) {
- return;
- }
-
- var data = getBody(xhReq.responseXML);
-
- var httpPort = data.getElementsByTagName('return')[0].firstChild.nodeValue;
-
- defaultHttpPort = httpPort;
-
- openWindowHTTPBrowserURL();
-
- //Listing all the service_groups
-
showServiceInitializer();
-
}
function showServiceInitializer() {
@@ -1589,53 +1562,8 @@
}
}
-function openWindowHTTPBrowserURL() {
-
- var isPortFound = false;
-
- browserHref = self.location.href;
-
- var transientBrowserString = browserHref.substring(browserHref.indexOf('://') + 3, browserHref.length);
-
- if (transientBrowserString.lastIndexOf(':') != -1) {
- // has port
- isPortFound = true;
- defaultBrowserHost = transientBrowserString.substring(0, transientBrowserString.lastIndexOf(':'));
- } else {
- defaultBrowserHost = transientBrowserString.substring(0, transientBrowserString.indexOf('/'));
- }
-
-
- /*var transitString = browserHref.substring(browserHref.lastIndexOf('://') +
- 3, browserHref.length);*/
- var transitString = defaultURL.substring(defaultURL.lastIndexOf('://') +
- 3, defaultURL.length);
- var wso2wsasRoot;
- if (transitString.lastIndexOf('/') != -1) { // '/' root does exists
- wso2wsasRoot = transitString.substring(transitString.lastIndexOf('/') +
- 1, transitString.length);
- defaultopenWindowHTTPURL =
- 'http://' + defaultBrowserHost + ':' + defaultHttpPort + '/' +
- wso2wsasRoot;
- } else {
- if (isPortFound) {
- defaultopenWindowHTTPURL =
- 'http://' + defaultBrowserHost + ':' + defaultHttpPort;
- } else {
- defaultopenWindowHTTPURL =
- 'http://' + defaultBrowserHost;
- }
- }
-
-}
-
-
function openWindowHTTP(value) {
- window.open(defaultopenWindowHTTPURL + SERVICE_CONTEXT + '/' + value);
-}
-
-function openExtraWindowHTTP(firstValue, lastValue) {
- window.open(defaultopenWindowHTTPURL+ "/" + firstValue + SERVICE_CONTEXT + "/" + lastValue);
+ window.open(HTTP_URL + "/" + value);
}
@@ -1744,12 +1672,13 @@
getExposedTransports(getServiceSpecificName());
}
+//TODO find and remove this
function openExtraWindowHTTPForWebResources(firstValue, lastValue) {
/*stopping the refreshing first */
stoppingRefreshingMethodsHook();
- window.open(defaultopenWindowHTTPURL + '/' + firstValue + "/" + lastValue);
+ window.open(URL + '/' + firstValue + "/" + lastValue);
}
var SPRING_BEANS_UUID;
Modified: trunk/wsas/java/modules/www/extensions/core/js/wso2wsas.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/wso2wsas.js (original)
+++ trunk/wsas/java/modules/www/extensions/core/js/wso2wsas.js Wed May 16 23:06:53 2007
@@ -24,11 +24,7 @@
var SESSION_COOKIE_NAME = "JSESSIONID";
function init() {
- if (URL == null) {
- URL = locationString.substring(0, locationString.lastIndexOf('/'));
- }
-
- defaultURL = URL;
+ URL = locationString.substring(0, locationString.lastIndexOf('/'));
if (URL.indexOf('https') == -1) {
// alert("You can only access the management console through https. \n The default https port for @server_short_name@ is " + httpsPort + ".");
@@ -43,8 +39,8 @@
}
- // Service URL parsing
- serverURL = URL + SERVICE_CONTEXT;
+ // TODO Service URL parsing remove this
+// serverURL = URL + SERVICE_CONTEXT;
if (getCookie("userName") != null) {
serviceGroupId = getCookie("serviceGroupId");
@@ -121,7 +117,7 @@
function showRestartServer(thisObj, index) {
if (thisObj && index) {
- renderSelectedMenuItem(thisObj,index);
+ renderSelectedMenuItem(thisObj, index);
gatherHistoryObject(thisObj.id, index);
}
@@ -184,7 +180,7 @@
var divId;
var divIndex
// This is done to stop the screen from jumping about.
- if (actDivName.indexOf("divHome") > -1 ) {
+ if (actDivName.indexOf("divHome") > -1) {
showHomeMenu();
return;
}
More information about the Wsas-java-dev
mailing list