geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r423293 - in /geronimo/trunk: applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/ modules/deploy-tool/src/java/org/apache/ger...
Date Tue, 18 Jul 2006 23:33:02 GMT
Author: sppatel
Date: Tue Jul 18 16:33:02 2006
New Revision: 423293

URL: http://svn.apache.org/viewvc?rev=423293&view=rev
Log:
merge GERONIMO-1865 to trunk

Added:
    geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRestart.java
      - copied unchanged from r423206, geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRestart.java
Modified:
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
    geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java

Modified: geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java?rev=423293&r1=423292&r2=423293&view=diff
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
(original)
+++ geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
Tue Jul 18 16:33:02 2006
@@ -52,6 +52,8 @@
 
     private static final String STOP_ACTION = "stop";
 
+    private static final String RESTART_ACTION = "restart";
+
     private static final String UNINSTALL_ACTION = "uninstall";
 
     private static final String CONFIG_INIT_PARAM = "config-type";
@@ -93,6 +95,9 @@
             } else if (UNINSTALL_ACTION.equals(action)) {
                 configurationManager.uninstallConfiguration(configId);
                 messageStatus = "Uninstalled application<br /><br />";
+            } else if (RESTART_ACTION.equals(action)) {
+                configurationManager.restartConfiguration(configId);
+                messageStatus = "Restarted application<br /><br />";
             } else {
                 messageStatus = "Invalid value for changeState: " + action + "<br /><br
/>";
                 throw new PortletException("Invalid value for changeState: " + action);

Modified: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp?rev=423293&r1=423292&r2=423293&view=diff
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
(original)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
Tue Jul 18 16:33:02 2006
@@ -9,7 +9,7 @@
         <th align="left">&nbsp;Component Name</th>
         <c:if test="${showWebInfo}"><th>URL</th></c:if>
         <th>&nbsp;State</th>
-        <th align="center" colspan="2">Commands</th>
+        <th align="center" colspan="3">Commands</th>
     </tr>
   <c:set var="backgroundClass" value='MediumBackground'/>
   <c:forEach var="moduleDetails" items="${configurations}">
@@ -27,12 +27,15 @@
             <td class="${backgroundClass}">&nbsp;<c:if test="${moduleDetails.state.running}"><a
href="${moduleDetails.urlFor}">${moduleDetails.contextPath}</a></c:if></td>
         </c:if>
         <td width="100" class="${backgroundClass}">&nbsp;${moduleDetails.state}</td>
-        <td width="100" class="${backgroundClass}">
+        <td width="75" class="${backgroundClass}">
             <c:if test="${moduleDetails.state.running}">&nbsp;<a href="<portlet:actionURL><portlet:param
name="configId" value="${moduleDetails.configId}"/><portlet:param name="action" value="stop"/></portlet:actionURL>">Stop</a></c:if>
             <c:if test="${moduleDetails.state.stopped && (moduleDetails.type.name
ne 'CAR')}">&nbsp;<a href="<portlet:actionURL><portlet:param name="configId"
value="${moduleDetails.configId}"/><portlet:param name="action" value="start"/></portlet:actionURL>">Start</a></c:if>
             <c:if test="${moduleDetails.state.failed}">&nbsp;<a href="<portlet:actionURL><portlet:param
name="configId" value="${moduleDetails.configId}"/><portlet:param name="action" value="stop"/></portlet:actionURL>">Stop</a></c:if>
         </td>
-        <td width="100" class="${backgroundClass}">
+        <td width="75" class="${backgroudClass}">
+            <c:if test="${moduleDetails.state.running}">&nbsp;<a href="<portlet:actionURL><portlet:param
name="configId" value="${moduleDetails.configId}"/><portlet:param name="action" value="restart"/></portlet:actionURL>">Restart</a></c:if>
+        </td>
+        <td width="75" class="${backgroundClass}">
             <a href="<portlet:actionURL><portlet:param name="configId" value="${moduleDetails.configId}"/><portlet:param
name="action" value="uninstall"/></portlet:actionURL>">Uninstall</a>
         </td>
     </tr>

Modified: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java?rev=423293&r1=423292&r2=423293&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java
(original)
+++ geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java
Tue Jul 18 16:33:02 2006
@@ -73,6 +73,7 @@
         registerCommand(new CommandRedeploy());
         registerCommand(new CommandStart());
         registerCommand(new CommandStop());
+        registerCommand(new CommandRestart());
         registerCommand(new CommandUndeploy());
         registerCommand(new CommandListConfigurations());
         registerCommand(new CommandInstallCAR());



Mime
View raw message