svn commit: r1459107 - /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java

[xu...@apache.org]

Author: xuhaihong
Date: Thu Mar 21 00:35:41 2013
New Revision: 1459107

URL: http://svn.apache.org/r1459107
Log:
GERONIMO-6389 Obscuring Passwords Feature couldn't work (Patch from XieZhi)
Register {Configured} prefix to EncryptionManager while starting the server.

Modified:
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java?rev=1459107&r1=1459106&r2=1459107&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java Thu Mar 21 00:35:41 2013
@@ -29,6 +29,7 @@ import org.apache.geronimo.gbean.GBeanIn
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.crypto.EncryptionManager;
 
 /**
  * Like SimpleEncryption except it uses a stored secret key.  If the key file is missing, it makes up a new one.
@@ -55,6 +56,7 @@ public class ConfiguredEncryption implem
     }
 
     public void doStart() throws Exception {
+        EncryptionManager.setEncryptionPrefix("{Configured}", ce);
     }
 
     public void doStop() throws Exception {