svn commit: r348486 - in /geronimo/trunk/applications: console-framework/src/webapp/WEB-INF/data/ console-standard/src/webapp/WEB-INF/view/servermanager/

[ho...@apache.org]

Author: hogstrom
Date: Wed Nov 23 08:54:34 2005
New Revision: 348486

URL: http://svn.apache.org/viewcvs?rev=348486&view=rev
Log:
GERONIMO-1226 Remove shutdown option from console

Modified:
    geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp

Modified: geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml?rev=348486&r1=348485&r2=348486&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml (original)
+++ geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml Wed Nov 23 08:54:34 2005
@@ -109,7 +109,7 @@
 
         <fragment name="mgmt" type="page">
             <navigation>
-                <title>Shutdown/Restart</title>
+                <title>Shutdown</title>
                 <description>ico_x_16x16.gif Manage this server</description>
             </navigation>
 

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp?rev=348486&r1=348485&r2=348486&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp Wed Nov 23 08:54:34 2005
@@ -1,6 +1,11 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>
+<br />
+<%--   Removed until a better mechanism for rebooting the server is created
 <p>This portlet allows a warm reboot of the server or a shutdown of it.</p>
 <p>A warm reboot will shutdown all applications and services and reboot the Geronimo kernel within the same process. The Geronimo Console session will be disconnected. Reconnect after the server is back up.</p>
-<p>A shutdown will shutdown the server and cause the JVM to exit. To continue using the Geronimo Console after a shutdown, Geronimo must be restarted.</p>
\ No newline at end of file
+--%>
+<p>This portlet give the admin the ability to remotely shutdown the Geronimo server.</p>
+<p>A shutdown will shutdown the server and cause the JVM to exit. To continue using the Geronimo Console after a shutdown, Geronimo must be restarted.</p>
+<br />

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp?rev=348486&r1=348485&r2=348486&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp Wed Nov 23 08:54:34 2005
@@ -2,14 +2,22 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>
 <br />
+<p><font face="Verdana" size="+1" COLOR=DARKRED><center><b>WARNING: A shutdown of the server will disable this Web Console!</b></center></font></p>
+<p><center>Proceed only if you are certain you want to terminate the server.</center></p>
+<br />
+<%--   Removed until a better mechanism for rebooting the server is created
 <table width="100%">
 <form action="<portlet:actionURL/>">
 <tr><td align="center"><input type="submit" value="Reboot" name="reboot"/></td></tr>
 </form>
 </table>
+--%>
 <br />
 <table width="100%">
 <form action="<portlet:renderURL/>">
-<tr><td align="center"><input type="submit" value="Shutdown" name="shutdown"/></td></tr>
+<tr><td align="center"><input type="submit" value="Shutdown" name="shutdown"
+onClick="return confirm('Are you sure you want to shutdown the server (last chance)?');"/></td></tr>
 </form>
 </table>
+<br />
+<br />

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp?rev=348486&r1=348485&r2=348486&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp Wed Nov 23 08:54:34 2005
@@ -1 +1,3 @@
-Server shutdown completed.
+<BR />
+<p><font face="Verdana" size="+1" COLOR=DARKRED><center><b>Server shutdown has been issued.</b></center></font></p>
+<BR />