[wsas-java-dev] svn commit r97 - wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas

[svn at wso2.com]

Author: azeez
Date: Fri Dec  1 14:29:03 2006
New Revision: 97

Modified:
   wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java
Log:
Save keystores in the proper location in the servlet edition



Modified: wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java	(original)
+++ wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java	Fri Dec  1 14:29:03 2006
@@ -111,8 +111,8 @@
                 return;
             }
 
-            System.setProperty("axis2.home", wso2wsasHome);
-            System.setProperty("wso2wsas.home", wso2wsasHome);
+            System.setProperty(ServerConstants.AXIS2_HOME, wso2wsasHome);
+            System.setProperty(ServerConstants.WSO2WSAS_HOME, wso2wsasHome);
 
             // -------------------------------------------------------------------------------------
             String serverXML = System.getProperty("server.xml");
@@ -135,6 +135,12 @@
             serverInfo.setProperties(props);
             serverInfo.process();
             is.close();
+
+            ServerConfiguration serverConfig = ServerConfiguration.getInstance();
+            serverConfig.setConfigurationProperty("Security.KeyStoresDir",
+                                                  wso2wsasHome + File.separator +
+                                                  serverConfig.
+                                                          getFirstProperty("Security.KeyStoresDir"));
         } catch (IOException e) {
             log.error("wso2wsas.properties file cannot be read", e);
             log.info("WSO2 WSAS startup failed.");
@@ -183,10 +189,10 @@
             servletConfig.getServletContext().setAttribute(ServerConstants.CONFIGURATION_CONTEXT,
                                                            serverManager.configContext);
             serverManager.configContext.setProperty(org.apache.axis2.Constants.CONTAINER_MANAGED,
-                                                      "true");
+                                                    "true");
             serverManager.configContext.setProperty(ServerConstants.WORK_DIR,
-                                                      wso2wsasHome + File.separator +
-                                                      serverConfig.getFirstProperty("WorkDirectory"));
+                                                    wso2wsasHome + File.separator +
+                                                    serverConfig.getFirstProperty("WorkDirectory"));
 
             serverManager.configContext.setProperty(ServerConstants.WSO2WSAS_INSTANCE, this);
             ((AdminUIServletFilter) servletContext.