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

[svn at wso2.com]

Author: azeez
Date: Mon Feb  5 01:40:58 2007
New Revision: 720

Modified:
   wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
Log:
Passing the default admin password from the commnad line



Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java	Mon Feb  5 01:40:58 2007
@@ -24,6 +24,7 @@
     }
 
     public static final String WSO2WSAS_HOME = "wso2wsas.home";
+    public static final String WSAS_ADMIN_PASSWORD = "wso2wsas.admin.password";
     public static final String AXIS2_HOME = "axis2.home";
     public static final String AXIS2_XML = "axis2.xml";
     public static final String DERBY_HOME = "derby.system.home";

Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java	Mon Feb  5 01:40:58 2007
@@ -334,13 +334,13 @@
         String adminUsername = "admin";
         ServiceUserDO admin = pm.getUser(adminUsername);
         ServerConfiguration config = ServerConfiguration.getInstance();
-            CryptoUtil cryptoUtil =
-                    new CryptoUtil(wso2wsasHome + File.separator +
-                                   config.getFirstProperty("Security.KeyStore.Location"),
-                                   config.getFirstProperty("Security.KeyStore.Password"),
-                                   config.getFirstProperty("Security.KeyStore.KeyAlias"),
-                                   config.getFirstProperty("Security.KeyStore.KeyPassword"),
-                                   config.getFirstProperty("Security.KeyStore.Type"));
+        CryptoUtil cryptoUtil =
+                new CryptoUtil(wso2wsasHome + File.separator +
+                               config.getFirstProperty("Security.KeyStore.Location"),
+                               config.getFirstProperty("Security.KeyStore.Password"),
+                               config.getFirstProperty("Security.KeyStore.KeyAlias"),
+                               config.getFirstProperty("Security.KeyStore.KeyPassword"),
+                               config.getFirstProperty("Security.KeyStore.Type"));
         if (admin == null) {
 
             // There is no default admin user. WSAS is starting up for the first time
@@ -365,7 +365,7 @@
         } else {
             try {
                 if (new String(cryptoUtil.base64DecodeAndDecrypt(admin.getPassword())).
-                        equals("admin")){
+                        equals("admin")) {
                     String password = getDefaultAdminPassword();
                     admin.setPassword(cryptoUtil.encryptAndBase64Encode(password.getBytes()));
                     pm.updateUser(admin);
@@ -383,8 +383,11 @@
      * @return Default admin password
      */
     private String getDefaultAdminPassword() {
+        String adminPassword = System.getProperty(ServerConstants.WSAS_ADMIN_PASSWORD);
+        if (adminPassword != null && !adminPassword.equals("admin")) {
+            return adminPassword;
+        }
         System.out.println(" Please enter the password of Administrator 'admin'");
-        String adminPassword = null;
         String passwordRepeat = null;
         do {
             while (adminPassword == null || adminPassword.trim().length() == 0) {