Added posibility to shutdown server from the admin console. JM-44

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@740 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/messenger/XMPPServer.java

@@ -316,6 +316,23 @@ public class XMPPServer {
         }
     }
 
+    /**
+     * Restarts the server and all it's modules only if the server is restartable. Otherwise do
+     * nothing.
+     */
+    public void restart() {
+        if (isStandAlone() && isRestartable()) {
+            try {
+                Class wrapperClass = Class.forName(WRAPPER_CLASSNAME);
+                Method restartMethod = wrapperClass.getMethod("restart", null);
+                restartMethod.invoke(null, null);
+            }
+            catch (Exception e) {
+                Log.error("Could not restart container", e);
+            }
+        }
+    }
+
     /**
      * Stops the server only if running in standalone mode. Do nothing if the server is running
      * inside of another server.
@@ -348,7 +365,7 @@ public class XMPPServer {
         return setupMode;
     }
 
-    private boolean isRestartable() {
+    public boolean isRestartable() {
         boolean restartable = false;
         try {
             restartable = Class.forName(WRAPPER_CLASSNAME) != null;
@@ -366,7 +383,7 @@ public class XMPPServer {
      *
      * @return true if the server is running in standalone mode.
      */
-    private boolean isStandAlone() {
+    public boolean isStandAlone() {
         boolean standalone = false;
         try {
             standalone = Class.forName(STARTER_CLASSNAME) != null;
@@ -558,6 +575,10 @@ public class XMPPServer {
      * Makes a best effort attempt to shutdown the server
      */
     private void shutdownServer() {
+        // If we don't have modules then the server has already been shutdown 
+        if (modules.isEmpty()) {
+            return;
+        }
         // Get all modules and stop and destroy them
         for (Module module : modules.values()) {
             module.stop();

src/java/org/jivesoftware/util/WebManager.java

@@ -126,30 +126,30 @@ public class WebManager extends WebBean {
     }
 
     /**
-     * Restarts the container then sleeps for 3 seconds.
+     * Restarts the server then sleeps for 3 seconds.
      */
-    /*public void restart(XMPPServer server) {
+    public void restart() {
         try {
-            server.restart();
+            getXMPPServer().restart();
         }
         catch (Exception e) {
             Log.error(e);
         }
         sleep();
-    }*/
+    }
 
     /**
      * Stops the server then sleeps for 3 seconds.
      */
-    /*public void stop(XMPPServer server) {
+    public void stop() {
         try {
-            server.stop();
+            getXMPPServer().stop();
         }
         catch (Exception e) {
             Log.error(e);
         }
         sleep();
-    }*/
+    }
 
     public WebManager getManager() {
         return this;
@@ -162,10 +162,6 @@ public class WebManager extends WebBean {
         }
     }
 
-    public String getErrorPage() {
-        return "error-serverdown.jsp";
-    }
-
     public boolean isServerRunning() {
         if (getPresenceManager() == null ||
                 getXMPPServer() == null) {

src/web/error-serverdown.jsp

-<%--
+ <%--
   -	$RCSfile$
   -	$Revision$
   -	$Date$
 --%>
+<%@ page import="org.jivesoftware.admin.AdminConsole"%>
 
-<%@ include file="header.jsp" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 
-<%  // Title of this page and breadcrumbs
-    String title = "Jive Messenger Server Down";
-    String[][] breadcrumbs = {
-        { "Home", "index.jsp" },
-        { title, "error-serverdown.jsp" }
-    };
+<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
+
+<%-- Define Administration Bean --%>
+<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
+<% admin.init(request, response, session, application, out ); %>
+
+<%  String path = request.getContextPath();
+
+    // Title of this page
+    String title = AdminConsole.getAppName() + " Server Down";
+    pageinfo.setTitle(title);
 %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <title><%= AdminConsole.getAppName() %> Admin Console<%= (pageinfo.getTitle() != null ? (": "+pageinfo.getTitle()) : "") %></title>
+ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+ <link rel="stylesheet" type="text/css" href="<%= path %>/style/global.css">
+</head>
+
+<body>
+
+<div id="jive-header">
+<table cellpadding="0" cellspacing="0" width="100%" border="0">
+<tbody>
+    <tr>
+     <td>
+         <img src="<%= path %>/<%= AdminConsole.getLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %> Admin Console">
+     </td>
+     <td align="right">
+         <table cellpadding="0" cellspacing="0" border="0">
+         <tr>
+             <td>&nbsp;</td>
+             <td class="info">
+                 <nobr><%= AdminConsole.getAppName() %> <%= AdminConsole.getVersionString() %></nobr>
+             </td>
+         </tr>
+         </table>
+     </td>
+    </tr>
+</tbody>
+</table>
+</div>
+
+<div id="jive-main">
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+<tbody>
+    <tr valign="top">
+        <td width="1%">
+            <div id="jive-sidebar">
+                <img src="<%= path %>/images/blank.gif" width="5" height="1" border="0" alt="">
+            </div>
+        </td>
+        <td width="99%" id="jive-content">
+
+        <jsp:include page="title.jsp" flush="true" />
+
+        <p>
+        <%= AdminConsole.getAppName() %> is currently down.
+        To continue:
+        </p>
+
+        <ol>
+            <li>
+                Start the server.
+            </li>
+            <li>
+                <a href="index.jsp">Login to the admin console</a>.
+            </li>
+        </ol>
 
-<p>
-Jive Messenger is currently down. Please see the
-<a href="server-status.jsp">server status</a> page for more details.
-</p>
+        </td>
+    </tr>
+</tbody>
+</table>
+</div>
 
-<jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file
+</body>
+</html>
\ No newline at end of file

src/web/index.jsp

@@ -18,7 +18,6 @@
                  java.text.*,
                  org.jivesoftware.admin.AdminPageBean,
                  org.jivesoftware.admin.AdminConsole"
-
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
@@ -41,6 +40,18 @@
 
 <%  // Get parameters //
     boolean serverOn = (webManager.getXMPPServer() != null);
+    boolean stop = request.getParameter("stop") != null;
+    boolean restart = request.getParameter("restart") != null;
+
+    // Handle stops & restarts
+    if (stop) {
+      response.sendRedirect("server-stopped.jsp");
+      return;
+    }
+    else if (restart) {
+      response.sendRedirect("server-stopped.jsp?restart=Restart");
+      return;
+    }
 %>
 
 <%  // Title of this page and breadcrumbs
@@ -58,6 +69,15 @@ Below are properties for this server. Click the "Edit Properties" button below t
 some of the server settings. Some settings can not be changed.
 </p>
 
+<script lang="JavaScript" type="text/javascript">
+    var checked = false;
+    function checkClick() {
+        if (checked) { return false; }
+        else { checked = true; return true; }
+    }
+</script>
+
+<form action="index.jsp" onsubmit="return checkClick();">
 <div class="jive-table">
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
 <thead>
@@ -97,6 +117,14 @@ some of the server settings. Some settings can not be changed.
                 <%  } %>
 
                 started <%= formatter.format(webManager.getXMPPServer().getServerInfo().getLastStarted()) %>
+
+                <% if (webManager.getXMPPServer().isStandAlone()){ %>
+                        &nbsp;&nbsp;<input type="submit" value="Stop" name="stop" <%= ((serverOn) ? "" : "disabled") %>>
+                    <% if (webManager.getXMPPServer().isRestartable()){ %>
+                        &nbsp;&nbsp;<input type="submit" value="Restart" name="restart" <%= ((serverOn) ? "" : "disabled") %>>
+                    <% } %>
+                <% } %>
+
             </td>
         </tr>
 
@@ -204,6 +232,7 @@ some of the server settings. Some settings can not be changed.
 </tbody>
 </table>
 </div>
+</form>
 <br>
 
 <form action="server-props.jsp">

src/web/muc-server-props-edit-form.jsp

@@ -95,7 +95,7 @@ a server restart.
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
             Service properties edited successfully. You must <b>restart</b> the server in order for
-            the changes to take effect.
+            the changes to take effect (see <a href="index.jsp">Server Status</a>).
         </td></tr>
     </tbody>
     </table>

src/web/server-props.jsp

@@ -122,7 +122,7 @@ Use the form below to edit server properties.
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
         Server properties updated successfully. You'll need to <b>restart</b> the server to have
-        the changes take effect.
+        the changes take effect (see <a href="index.jsp">Server Status</a>).
         </td></tr>
     </tbody>
     </table>