You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/28 15:24:00 UTC
svn commit: r426517 - in
/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src:
./ webapp/WEB-INF/view/keystore/index.jsp
Author: jdillon
Date: Fri Jul 28 06:23:59 2006
New Revision: 426517
URL: http://svn.apache.org/viewvc?rev=426517&view=rev
Log:
r569@Bliss (orig r426507): jdillon | 2006-07-28 06:19:02 -0700
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/m2migration/applications/console/console-standard/src/ (props changed)
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/index.jsp
Propchange: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Jul 28 06:23:59 2006
@@ -1 +1 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src:426503
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src:426507
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/index.jsp?rev=426517&r1=426516&r2=426517&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/index.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/keystore/index.jsp Fri Jul 28 06:23:59 2006
@@ -76,7 +76,7 @@
<a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="lockKeystore-before" />
<portlet:param name="keystore" value="${keystore.instance.keystoreName}" />
- </portlet:actionURL>"><img src="<%=consoleServletPath%>/../images/ico_unlock3_16x16.gif" alt="Unlocked" /></a>
+ </portlet:actionURL> "onClick="return confirm('This keystore is currently in use. Locking it may prevent the server from starting. Continue?');" ><img src="<%=consoleServletPath%>/../images/ico_unlock3_16x16.gif" alt="Unlocked" /></a>
${keys[keystore.instance.keystoreName]}
</c:otherwise>
</c:choose>