From 156c193514f071ddee52d08e77941f7ba2b32b57 Mon Sep 17 00:00:00 2001
From: Philippe Guillebert <philippe.guillebert@uperto.com>
Date: Thu, 24 Feb 2011 14:39:29 +0100
Subject: [PATCH 75/76] Webapp: added preliminary support for a daemon manager page

---
 .../web/controller/DaemonStatusController.java     |  102 ++++++++++++--------
 .../web/svclayer/applicationContext-svclayer.xml   |    2 -
 .../src/main/webapp/WEB-INF/dispatcher-servlet.xml |   10 +--
 .../src/main/webapp/WEB-INF/jsp/daemonstatus.jsp   |   24 ++---
 4 files changed, 74 insertions(+), 64 deletions(-)

diff --git a/opennms-webapp/src/main/java/org/opennms/web/controller/DaemonStatusController.java b/opennms-webapp/src/main/java/org/opennms/web/controller/DaemonStatusController.java
index dc0575f..180e48f 100644
--- a/opennms-webapp/src/main/java/org/opennms/web/controller/DaemonStatusController.java
+++ b/opennms-webapp/src/main/java/org/opennms/web/controller/DaemonStatusController.java
@@ -45,9 +45,10 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.opennms.netmgt.dao.ServiceInfo;
 import org.opennms.web.svclayer.daemonstatus.DaemonStatusService;
-import org.springframework.validation.BindException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.util.Assert;
 import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.SimpleFormController;
+import org.springframework.web.servlet.mvc.AbstractController;
 
 /**
  * <p>DaemonStatusController class.</p>
@@ -57,46 +58,65 @@ import org.springframework.web.servlet.mvc.SimpleFormController;
  * @version $Id: $
  * @since 1.8.1
  */
-public class DaemonStatusController extends SimpleFormController {
-	 private DaemonStatusService daemonStatusService;
+public class DaemonStatusController extends AbstractController implements InitializingBean {
 
-     /**
-      * <p>Setter for the field <code>daemonStatusService</code>.</p>
-      *
-      * @param daemonStatusService a {@link org.opennms.web.svclayer.daemonstatus.DaemonStatusService} object.
-      */
-     public void setDaemonStatusService(DaemonStatusService daemonStatusService) {
-    	 this.daemonStatusService = daemonStatusService;
-     }
+    private String successView;
+    private DaemonStatusService daemonStatusService;
 
-	/** {@inheritDoc} */
-	@Override
-	protected Map<String, Collection<ServiceInfo>> referenceData(HttpServletRequest arg0) throws Exception {
-		// TODO Auto-generated method stub
-		Map<String, Collection<ServiceInfo>> referenceData = new HashMap<String, Collection<ServiceInfo>>();
-		Collection<ServiceInfo> daemons = daemonStatusService.getCurrentDaemonStatusColl();
-		logger.debug("number of daemons:" + daemons.size());
-		referenceData.put("daemons", daemons);
-		return referenceData;
-	}
+    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        // Map<String, ServiceInfo> daemons = 
+        //     m_daemonStatusService.performOperationOnDaemons(request.getParameter("operation"), 
+        //                                                    request.getParameterValues("values"));
 
-	/** {@inheritDoc} */
-	@Override
-	protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse arg1, Object arg2, BindException arg3) throws Exception {
-		// TODO Auto-generated method stub
-        // FIXME: This isn't used
-//		Map<String, ServiceInfo> daemons = 
-//			daemonStatusService.performOperationOnDaemons(ServletRequestUtils.getStringParameter(request, "operation"),
-//				ServletRequestUtils.getStringParameters(request, "values"));
-		ModelAndView modelAndView = super.onSubmit(request, arg1, arg2, arg3);
-		modelAndView.addAllObjects(referenceData(request));
-		return modelAndView;
-	}
-      
-	/** {@inheritDoc} */
-	@Override
-	protected Object formBackingObject(HttpServletRequest arg0) throws Exception {
-		// TODO Auto-generated method stub
-		return super.formBackingObject(arg0);
-	}
+        Map<String, Collection<ServiceInfo>> referenceData = new HashMap<String, Collection<ServiceInfo>>();
+        Collection<ServiceInfo> daemons = daemonStatusService.getCurrentDaemonStatusColl();
+        logger.debug("number of daemons:" + daemons.size());
+        referenceData.put("daemons", daemons);
+        return new ModelAndView(getSuccessView(), referenceData);
+    }
+
+    /**
+     * <p>setSuccessView</p>
+     *
+     * @param successView a {@link java.lang.String} object.
+     */
+    public void setSuccessView(String successView) {
+        this.successView = successView;
+    }
+
+    /**
+     * <p>getSuccessView</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getSuccessView() {
+        return successView;
+    }
+
+
+    /**
+     * <p>Getter for the field <code>daemonStatusService</code>.</p>
+     */
+    public DaemonStatusService getDaemonStatusService() {
+        return this.daemonStatusService;
+    }
+
+    /**
+     * <p>Setter for the field <code>daemonStatusService</code>.</p>
+     *
+     * @param daemonStatusService a {@link org.opennms.web.svclayer.daemonstatus.DaemonStatusService} object.
+     */
+    public void setDaemonStatusService(DaemonStatusService daemonStatusService) {
+        this.daemonStatusService = daemonStatusService;
+    }
+
+    /**
+     * <p>afterPropertiesSet</p>
+     *
+     * @throws java.lang.Exception if any.
+     */
+    public void afterPropertiesSet() throws Exception {
+        Assert.notNull(successView, "successview property must be set");
+        Assert.notNull(daemonStatusService, "daemonStatusService property must be set");
+    }
 }
diff --git a/opennms-webapp/src/main/resources/org/opennms/web/svclayer/applicationContext-svclayer.xml b/opennms-webapp/src/main/resources/org/opennms/web/svclayer/applicationContext-svclayer.xml
index eccb268..2b3a1b5 100644
--- a/opennms-webapp/src/main/resources/org/opennms/web/svclayer/applicationContext-svclayer.xml
+++ b/opennms-webapp/src/main/resources/org/opennms/web/svclayer/applicationContext-svclayer.xml
@@ -69,7 +69,6 @@
   </bean>
 
   <!-- Daemon Status Service beans -->
-  <!--
   <bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean">
     <property name="locateExistingServerIfPossible" value="true"/>
   </bean>
@@ -81,7 +80,6 @@
   <bean id="daemonStatusService" class="org.opennms.web.svclayer.daemonstatus.support.DefaultDaemonStatusService">
     <property name="daemonStatusDao" ref="daemonStatusDao" />
   </bean>
-  -->
   
   <!-- Category Service Status beans -->
   <bean id="categoryStatusService" class="org.opennms.web.svclayer.catstatus.support.DefaultCategoryStatusService">
diff --git a/opennms-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/opennms-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml
index fda9629..3249763 100644
--- a/opennms-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml
+++ b/opennms-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml
@@ -142,14 +142,10 @@
 	          ref="categoryStatusService" />
   </bean>
 
-  <!--<bean name="/daemonstatus.htm"
-		class="org.opennms.web.controller.DaemonStatusController">
-    <property name="daemonStatusService" ref="daemonStatusService" />
-	<property name="commandName" value="toModify" />
-	<property name="commandClass"
-	          value="org.opennms.web.controller.DaemonStatusBinder" />
+  <bean name="/daemonstatus.htm" class="org.opennms.web.controller.DaemonStatusController">
+	<property name="daemonStatusService" ref="daemonStatusService" />
 	<property name="successView" value="daemonstatus" />
-  </bean>-->
+  </bean>
 
   <bean name="/distributedStatusSummary.htm"
 		class="org.opennms.web.controller.DistributedStatusSummaryController">
diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/daemonstatus.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/daemonstatus.jsp
index 6f39dcb..939a13a 100644
--- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/daemonstatus.jsp
+++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/daemonstatus.jsp
@@ -5,32 +5,28 @@
 
 <html>
   <body>
-     <form:form method="post" commandName="toModify">
+     <form:form method="post">
         <table border="1">
           <tr>
-            <td></td>
             <td>Service Name</td>
             <td>Status</td>
+            <td>Start</td>
+            <td>Stop</td>
+            <td>Restart</td>
+            <td>Refresh</td>
           </tr>
           <c:forEach items="${daemons}" var="daemon">
             <tr>
-            
-              <td> <form:checkbox path="values" value="${daemon.serviceName}"/> </td>
               <td><c:out value="${daemon.serviceName}"> </c:out></td>
               <td><c:out value="${daemon.serviceStatus}"> </c:out> </td>
-           
-            </tr>
-          </c:forEach>
-          <tr>
-            <td colspan="3">
-               <input type="submit" value="stop" name="operation"/>
-               <input type="submit" value="start" name="operation"/>
-               <input type="submit" value="restart" name="operation"/>
-               <input type="submit" value="refresh" name="operation"/>
+              <td><input type="submit" value="stop" name="operation"/></td>
+              <td><input type="submit" value="start" name="operation"/></td>
+              <td><input type="submit" value="restart" name="operation"/></td>
+              <td><input type="submit" value="refresh" name="operation"/></td>
             </td>
           </tr>
+          </c:forEach>
         </table>
-        
     </form:form>  
   </body>
 </html>
-- 
1.7.0.4