Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 54201 invoked from network); 20 Oct 2010 02:43:28 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 Oct 2010 02:43:28 -0000 Received: (qmail 95463 invoked by uid 500); 20 Oct 2010 02:43:28 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 95336 invoked by uid 500); 20 Oct 2010 02:43:27 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 95329 invoked by uid 99); 20 Oct 2010 02:43:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Oct 2010 02:43:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Oct 2010 02:43:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 47C49238890B; Wed, 20 Oct 2010 02:42:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: rwonly@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101020024230.47C49238890B@eris.apache.org> 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 @@ 9999 - var/ 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());