geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r881663 - /geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Date Wed, 18 Nov 2009 04:02:31 GMT
Author: kevan
Date: Wed Nov 18 04:02:31 2009
New Revision: 881663

URL: http://svn.apache.org/viewvc?rev=881663&view=rev
Log:
GERONIMO-4927 encrypt keystorepass attributes. Patch from Ashish Jain.

Modified:
    geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=881663&r1=881662&r2=881663&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java
(original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Wed Nov 18 04:02:31 2009
@@ -469,9 +469,11 @@
                 nullAttributes.remove(name);
                 clearAttributes.remove(name);
 
-                if (name.toLowerCase().indexOf("password") > -1) {
+                if ((name.toLowerCase().indexOf("password") > -1) ||
+                    (name.toLowerCase().equals("keystorepass"))) {
                     value = EncryptionManager.encrypt(value);
                 }
+
 /**
  * if there was a value such as jdbc url with & then when that value was oulled
  * from the config.xml the & would have been replaced/converted to '&', we need
to check



Mime
View raw message