geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1024505 - in /geronimo/server/trunk/framework: configs/j2ee-security/pom.xml configs/j2ee-security/src/main/resources/ modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
Date Wed, 20 Oct 2010 02:42:30 GMT
Author: rwonly
Date: Wed Oct 20 02:42:29 2010
New Revision: 1024505

URL: http://svn.apache.org/viewvc?rev=1024505&view=rev
Log:
GERONIMO-5607 geronimo-default keystore file not displayed on the administration console

Removed:
    geronimo/server/trunk/framework/configs/j2ee-security/src/main/resources/
Modified:
    geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java

Modified: geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/pom.xml?rev=1024505&r1=1024504&r2=1024505&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/pom.xml Wed Oct 20 02:42:29 2010
@@ -100,7 +100,6 @@
                                 </gbean>
                              </config-xml-content>
                             <config-substitution key="JMXPort">9999</config-substitution>
-                            <copy-file relative-to="server" dest-dir="var">var/</copy-file>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java?rev=1024505&r1=1024504&r2=1024505&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
Wed Oct 20 02:42:29 2010
@@ -98,7 +98,10 @@ public class FileKeystoreManager impleme
             throw new IllegalStateException("FileKeystoreManager must have a root that's
a local directory (not " + rootURI + ")");
         }
         directory = new File(rootURI);
-        if (!directory.exists() || !directory.isDirectory() || !directory.canRead()) {
+        if (!directory.exists()) {
+        	directory.mkdirs();
+        }       	
+        if (!directory.isDirectory() || !directory.canRead()) {
             throw new IllegalStateException("FileKeystoreManager must have a root that's
a valid readable directory (not " + directory.getAbsolutePath() + ")");
         }
         log.debug("Keystore directory is " + directory.getAbsolutePath());



Mime
View raw message