You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2010/11/18 09:48:13 UTC
svn commit: r1036352 - in /geronimo/server/branches/2.1/framework:
configs/rmi-naming/src/main/plan/
modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/
modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/
Author: rwonly
Date: Thu Nov 18 08:48:13 2010
New Revision: 1036352
URL: http://svn.apache.org/viewvc?rev=1036352&view=rev
Log:
GERONIMO-5692 refix to use EncryptionManagerWrapperGBean instead of EncryptionManagerGBean.java
Removed:
geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/EncryptionManagerGBean.java
Modified:
geronimo/server/branches/2.1/framework/configs/rmi-naming/src/main/plan/plan.xml
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/configs/rmi-naming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/rmi-naming/src/main/plan/plan.xml?rev=1036352&r1=1036351&r2=1036352&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/rmi-naming/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/rmi-naming/src/main/plan/plan.xml Thu Nov 18 08:48:13 2010
@@ -64,6 +64,5 @@
<gbean name="EncryptionManagerWrapper" class="org.apache.geronimo.system.util.EncryptionManagerWrapperGBean">
</gbean>
- <gbean name="EncryptionManagerGBean" class="org.apache.geronimo.system.util.EncryptionManagerGBean"/>
</module>
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=1036352&r1=1036351&r2=1036352&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 Thu Nov 18 08:48:13 2010
@@ -124,7 +124,7 @@ public class CommandUnlockKeystore exten
if (aliasPassword == null) {
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));
}
- AbstractNameQuery abstractNameQuery = new AbstractNameQuery("org.apache.geronimo.system.util.EncryptionManagerGBean");
+ AbstractNameQuery abstractNameQuery = new AbstractNameQuery("org.apache.geronimo.system.util.EncryptionManagerWrapperGBean");
Iterator it = kernel.listGBeans(abstractNameQuery).iterator();
abstractName = (AbstractName) it.next();
try {
@@ -171,7 +171,7 @@ public class CommandUnlockKeystore exten
if (keyStorePassword == null) {
throw new DeploymentException("No keyStorePassword attribute named " + keyStoreName + " exists in the kyeStoreTruststore password properties file::" + System.getProperty(KEYSTORE_TRUSTSTORE_PASSWORD_FILE, DEFAULT_KEYSTORE_TRUSTSTORE_PASSWORD_FILE));
}
- AbstractNameQuery abstractNameQuery = new AbstractNameQuery("org.apache.geronimo.system.util.EncryptionManagerGBean");
+ AbstractNameQuery abstractNameQuery = new AbstractNameQuery("org.apache.geronimo.system.util.EncryptionManagerWrapperGBean");
Iterator it = kernel.listGBeans(abstractNameQuery).iterator();
abstractName = (AbstractName) it.next();
try {