Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 42171 invoked from network); 28 Jul 2006 13:19:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Jul 2006 13:19:24 -0000 Received: (qmail 56036 invoked by uid 500); 28 Jul 2006 13:19:24 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 55996 invoked by uid 500); 28 Jul 2006 13:19:24 -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 55985 invoked by uid 99); 28 Jul 2006 13:19:24 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jul 2006 06:19:24 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jul 2006 06:19:23 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9B9991A9822; Fri, 28 Jul 2006 06:19:03 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r426507 - in /geronimo/sandbox/svkmerge/trunk: ./ applications/console/console-standard/src/webapp/WEB-INF/view/keystore/index.jsp Date: Fri, 28 Jul 2006 13:19:03 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060728131903.9B9991A9822@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jdillon Date: Fri Jul 28 06:19:02 2006 New Revision: 426507 URL: http://svn.apache.org/viewvc?rev=426507&view=rev Log: r556@Bliss (orig r426252): jbohn | 2006-07-27 14:25:07 -0700 GERONIMO-2234 Add challenge when requested to lock keystore Modified: geronimo/sandbox/svkmerge/trunk/ (props changed) geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/index.jsp Propchange: geronimo/sandbox/svkmerge/trunk/ ------------------------------------------------------------------------------ --- svk:merge (original) +++ svk:merge Fri Jul 28 06:19:02 2006 @@ -1,2 +1,2 @@ 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395 -13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:426236 +13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:426252 Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/index.jsp URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/index.jsp?rev=426507&r1=426506&r2=426507&view=diff ============================================================================== --- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/index.jsp (original) +++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/index.jsp Fri Jul 28 06:19:02 2006 @@ -76,7 +76,7 @@ - ">Unlocked + "onClick="return confirm('This keystore is currently in use. Locking it may prevent the server from starting. Continue?');" >Unlocked ${keys[keystore.instance.keystoreName]}