Author: azeez
Date: Mon Dec 17 05:52:43 2007
New Revision: 11244
Log:
Start the listeners at last
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/MainServlet.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
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 Mon Dec
17 05:52:43 2007
@@ -26,6 +26,7 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.catalina.LifecycleException;
import org.wso2.adminui.AdminUIServletFilter;
import org.wso2.utils.FileManipulator;
import org.wso2.utils.ServerConfiguration;
@@ -188,10 +189,10 @@
log.fatal(msg, e);
throw new ServletException(msg);
}
- serverInfo.process();
- ServerManager.getInstance().setHttpPort(serverInfo.getHttpPort());
- ServerManager.getInstance().setHttpsPort(serverInfo.getHttpsPort());
+
ConfigurationContext configCtx = serverManager.configContext;
+
+ serverManager.startListenerManager();
WsasUtils.setServletContextProperties(servletConfig.getServletContext(),
(Map) configCtx
.getProperty(ServerConstants.GENERATED_PAGES),
@@ -203,6 +204,11 @@
ProxyCache.getInstance().getHttpsPort() :
ServerManager.getInstance().getHttpsPort(),
configCtx.getServicePath());
+ serverInfo.process();
+ ServerManager.getInstance().setHttpPort(serverInfo.getHttpPort());
+ ServerManager.getInstance().setHttpsPort(serverInfo.getHttpsPort());
+
+ // Print information about the system
printInfo(startTime);
System.getProperties().remove(ServerConstants.WSO2WSAS_START_TIME);
}
@@ -216,7 +222,7 @@
String hostName =
ServerConfiguration.getInstance().getFirstProperty("ClusteringHostName");
if (System.getProperty(ClusteringConstants.LOCAL_IP_ADDRESS) == null &&
hostName != null && hostName.trim().length() != 0) {
- System.setProperty(ClusteringConstants.LOCAL_IP_ADDRESS,
hostName);
+ System.setProperty(ClusteringConstants.LOCAL_IP_ADDRESS, hostName);
}
serverManager.adminResourceBase = servletContext.getRealPath(".");
if (serverManager.adminResourceBase == null) {
@@ -279,7 +285,7 @@
new ServerManagement(serverManager.configContext.
getAxisConfiguration().getTransportsIn()).startMaintenance();
cleanupSystem();
-
+
try {
serverManager.stopListenerManager();
} catch (AxisFault e) {
@@ -398,9 +404,6 @@
removeServiceGroup(ServerConstants.ADMIN_SERVICE_GROUP);
}
- // Start the ListenerManager
- serverManager.startListenerManager();
-
ServletContext servletContext = servletConfig.getServletContext();
servletContext.removeAttribute(ServerConstants.CONFIGURATION_CONTEXT);
servletContext.setAttribute(ServerConstants.CONFIGURATION_CONTEXT,
@@ -413,6 +416,9 @@
} catch (AxisFault axisFault) {
throw new ServerException(axisFault);
}
+
+ // Start the ListenerManager
+ serverManager.startListenerManager();
} catch (Exception e) {
String msg = "Cannot set ConfigurationContext";
log.fatal(msg, e);
@@ -446,7 +452,7 @@
}
serverController = new ServerController(this);
int cmdListenerPort = WsasUtils.getCommandListenerPort();
- if(cmdListenerPort == -1){
+ if (cmdListenerPort == -1) {
return;
}
serverController.setPort(cmdListenerPort);
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java Mon Dec
17 05:52:43 2007
@@ -114,7 +114,6 @@
oldContext.getAxisConfiguration().getClusterManager();
configContext.getAxisConfiguration().setClusterManager(originalClusterManager);
}
- startListenerManager();
initNetworkUtils(configContext.getAxisConfiguration());
_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
