[wsas-java-dev] svn commit r1118 - branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/transport

[svn at wso2.org]

Author: azeez
Date: Fri Mar  2 21:45:13 2007
New Revision: 1118

Modified:
   branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/transport/MainServlet.java
Log:
Dealing with server.xml path in the case of the servlet edition



Modified: branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/transport/MainServlet.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/transport/MainServlet.java	(original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/transport/MainServlet.java	Fri Mar  2 21:45:13 2007
@@ -44,11 +44,11 @@
 
     private static final long serialVersionUID = 4517849288538613640L;
 
-    private ServerManager serverManager = ServerManager.getInstance();
+    private ServerManager serverManager;
     private static Logger log = Logger.getLogger(MainServlet.class);
     private ServletConfig servletConfig;
     private String wso2wsasHome;
-    private static final ServerConfiguration serverConfig = ServerConfiguration.getInstance();
+    private static ServerConfiguration serverConfig;
     private Thread shutdownHook;
     private static ServerController serverController;
 
@@ -110,6 +110,10 @@
             }
             System.setProperty(ServerConstants.AXIS2_HOME, wso2wsasHome);
             System.setProperty(ServerConstants.WSO2WSAS_HOME, wso2wsasHome);
+            ServerConfiguration.configurationXMLLocation =
+                    wso2wsasHome + File.separator + "conf" + File.separator + "server.xml";
+            serverConfig = ServerConfiguration.getInstance();
+            serverManager = ServerManager.getInstance();
             log.info("Using WSO2 WSAS Home = " + wso2wsasHome);
             File file = new File(wso2wsasHome);
             if (!file.exists()) {