geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1305858 - in /geronimo/server/branches/2.1/framework/modules/geronimo-crypto: pom.xml src/main/java/org/apache/geronimo/crypto/ConfiguredEncryption.java src/main/java/org/apache/geronimo/crypto/EncryptionManager.java
Date Tue, 27 Mar 2012 14:58:19 GMT
Author: xiaming
Date: Tue Mar 27 14:58:19 2012
New Revision: 1305858

URL: http://svn.apache.org/viewvc?rev=1305858&view=rev
Log:
GERONIMO-6310 Revert the change cause of the circular dependency

Removed:
    geronimo/server/branches/2.1/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/ConfiguredEncryption.java
Modified:
    geronimo/server/branches/2.1/framework/modules/geronimo-crypto/pom.xml
    geronimo/server/branches/2.1/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/EncryptionManager.java

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-crypto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-crypto/pom.xml?rev=1305858&r1=1305857&r2=1305858&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-crypto/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-crypto/pom.xml Tue Mar 27 14:58:19
2012
@@ -36,11 +36,6 @@
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
-		<dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-system</artifactId>
-			<version>${geronimoVersion}</version>
-        </dependency>
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/EncryptionManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/EncryptionManager.java?rev=1305858&r1=1305857&r2=1305858&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/EncryptionManager.java
(original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/EncryptionManager.java
Tue Mar 27 14:58:19 2012
@@ -20,7 +20,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.io.Serializable;
-import org.apache.geronimo.crypto.ConfiguredEncryption;
 
 /**
  * A static class that uses registered Encryption instances to encypt and decrypt objects,
typically strings.
@@ -44,27 +43,15 @@ public class EncryptionManager {
 
     private static final Map<String, Encryption> ENCRYPTORS = Collections.synchronizedMap(new
HashMap<String, Encryption>());
     private final static String SIMPLE_ENCRYPTION_PREFIX = "{Simple}";
-    private static String activeEncryptionPrefix = SIMPLE_ENCRYPTION_PREFIX;
-	private static ConfiguredEncryption ce = null;
 
     static {
         ENCRYPTORS.put(SIMPLE_ENCRYPTION_PREFIX, SimpleEncryption.INSTANCE);
         //login properties files used to have this
         ENCRYPTORS.put("{Standard}", SimpleEncryption.INSTANCE);
-		
-		String keyFile = System
-				.getProperty("org.apache.geronimo.security.encryption.keyfile");
-
-		if (keyFile != null && keyFile != "") {
-			try {
-				ce = new ConfiguredEncryption(keyFile);
-				ce.doStart();
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
     }
 
+    private static String activeEncryptionPrefix = SIMPLE_ENCRYPTION_PREFIX;
+
     /**
      * Encryption instances should call this to register themselves.
      *



Mime
View raw message