[wsas-java-dev] svn commit r2571 - trunk/wsas/java/modules/core/src/org/wso2/wsas/util

[svn at wso2.org]

Author: azeez
Date: Mon May 14 00:53:01 2007
New Revision: 2571

Modified:
   trunk/wsas/java/modules/core/src/org/wso2/wsas/util/PasswordUpdater.java
Log:
Fix for WSAS-227



Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/util/PasswordUpdater.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/util/PasswordUpdater.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/util/PasswordUpdater.java	Mon May 14 00:53:01 2007
@@ -17,6 +17,7 @@
 
 import org.wso2.utils.InputReader;
 import org.wso2.utils.ServerConfiguration;
+import org.wso2.utils.ServerConfigurationException;
 import org.wso2.utils.security.CryptoException;
 import org.wso2.utils.security.CryptoUtil;
 import org.wso2.wsas.ServerConstants;
@@ -41,7 +42,11 @@
 
 
     public static void main(String[] args) {
-        System.setProperty(ServerConstants.WSO2WSAS_HOME, new File(".").getAbsolutePath());
+        String wso2wsasHome = System.getProperty(ServerConstants.WSO2WSAS_HOME);
+        if(wso2wsasHome == null){
+            wso2wsasHome = new File(".").getAbsolutePath();
+            System.setProperty(ServerConstants.WSO2WSAS_HOME, wso2wsasHome);
+        }
 
         if (args.length == 0) {
             printUsage();
@@ -130,6 +135,7 @@
         Statement statement = null;
         try {
             ServerConfiguration config = ServerConfiguration.getInstance();
+            config.init(wso2wsasHome + File.separator + "conf" + File.separator + "server.xml");
             password = new CryptoUtil(new File(config.getFirstProperty("Security.KeyStore.Location")).getAbsolutePath(),
                                       config.getFirstProperty("Security.KeyStore.Password"),
                                       config.getFirstProperty("Security.KeyStore.KeyAlias"),
@@ -151,6 +157,9 @@
         } catch (CryptoException e) {
             e.printStackTrace();
             System.err.println(" Password encyption failed : " + e);
+        } catch (ServerConfigurationException e) {
+            e.printStackTrace();
+            System.err.println(" Server error : " + e);
         } finally {
             if (statement != null) {
                 try {