geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r917437 - /geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandUnlockKeystore.java
Date Mon, 01 Mar 2010 09:52:04 GMT
Author: xuhaihong
Date: Mon Mar  1 09:52:04 2010
New Revision: 917437

URL: http://svn.apache.org/viewvc?rev=917437&view=rev
Log:
GERONIMO-5156 Use the initial style to configure keystore/key password

Modified:
    geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandUnlockKeystore.java

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandUnlockKeystore.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandUnlockKeystore.java?rev=917437&r1=917436&r2=917437&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandUnlockKeystore.java
(original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandUnlockKeystore.java
Mon Mar  1 09:52:04 2010
@@ -103,9 +103,9 @@
      * Returns the password for private key alias
      */
     private String getKeyAliasPassword(Properties properties, String keyStoreName, String
aliasName) throws DeploymentException {
-        String aliasPassword = properties.getProperty(keyStoreName + "." + aliasName + ".keyPassword");
+        String aliasPassword = properties.getProperty(aliasName);
         if (aliasPassword == null) {
-            throw new DeploymentException("No alias with the name " + keyStoreName + "."
+ aliasName + ".keyPassword" + " exists in the kyeStoreTruststore password properties file::"
+ System.getProperty(KEYSTORE_TRUSTSTORE_PASSWORD_FILE, DEFAULT_KEYSTORE_TRUSTSTORE_PASSWORD_FILE));
+            throw new DeploymentException("No alias with the name " + aliasName + " exists
in the kyeStoreTruststore password properties file::" + System.getProperty(KEYSTORE_TRUSTSTORE_PASSWORD_FILE,
DEFAULT_KEYSTORE_TRUSTSTORE_PASSWORD_FILE));
         }
         return (String) EncryptionManager.decrypt(aliasPassword);
     }
@@ -134,9 +134,9 @@
      * Returns the key store password
      */
     private String getKeyStorePassword(Properties properties, String keyStoreName) throws
DeploymentException {
-        String keyStorePassword = properties.getProperty(keyStoreName + ".keyStorePassword");
+        String keyStorePassword = properties.getProperty("keyStorePassword");
         if (keyStorePassword == null) {
-            throw new DeploymentException("No keyStorePassword attribute named " + keyStoreName
+ ".keyStorePassword" + "exists in tke kyeStoreTruststore password properties file::" + System.getProperty(KEYSTORE_TRUSTSTORE_PASSWORD_FILE,
DEFAULT_KEYSTORE_TRUSTSTORE_PASSWORD_FILE));
+            throw new DeploymentException("No keyStorePassword attribute named " + "keyStorePassword"
+ "exists in tke kyeStoreTruststore password properties file::" + System.getProperty(KEYSTORE_TRUSTSTORE_PASSWORD_FILE,
DEFAULT_KEYSTORE_TRUSTSTORE_PASSWORD_FILE));
         }
         return (String) EncryptionManager.decrypt(keyStorePassword);
     }



Mime
View raw message