svn commit: r423327 - in /geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard: ./ src/java/org/apache/geronimo/console/configmanager/ src/java/org/apache/geronimo/console/securitymanager/realm/ src/webapp/WEB-INF/view/configmana...

[jd...@apache.org]

Author: jdillon
Date: Tue Jul 18 18:35:07 2006
New Revision: 423327

URL: http://svn.apache.org/viewvc?rev=423327&view=rev
Log:
Sync from trunk for GERONIMO-1865

Modified:
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/   (props changed)
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp

Propchange: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Tue Jul 18 18:35:07 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard:423294

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml?rev=423327&r1=423326&r2=423327&view=diff
==============================================================================
    (empty)

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java?rev=423327&r1=423326&r2=423327&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java Tue Jul 18 18:35:07 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/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=423327&r1=423326&r2=423327&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Tue Jul 18 18:35:07 2006
@@ -762,7 +762,7 @@
             if (lockoutWindow != null && lockoutWindow.equals("")) lockoutWindow = null;
             lockoutDuration = request.getParameter("lockoutDuration");
             if (lockoutDuration != null && lockoutDuration.equals("")) lockoutDuration = null;
-            abstractName = request.getParameter("objectName");
+            abstractName = request.getParameter("abstractName");
             if (abstractName != null && abstractName.equals("")) abstractName = null;
             String test = request.getParameter("storePassword");
             storePassword = test != null && !test.equals("") && !test.equals("false");

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp?rev=423327&r1=423326&r2=423327&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp Tue Jul 18 18:35:07 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>