geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r423294 - in /geronimo/sandbox/svkmerge/trunk: ./ applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/ ap...
Date Tue, 18 Jul 2006 23:46:34 GMT
Author: jdillon
Date: Tue Jul 18 16:46:33 2006
New Revision: 423294

URL: http://svn.apache.org/viewvc?rev=423294&view=rev
Log:
Sync w/trunk

Added:
    geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRestart.java
  (with props)
Removed:
    geronimo/sandbox/svkmerge/trunk/assemblies/j2ee-jetty-server/src/var/log/deployer-log4j.properties
    geronimo/sandbox/svkmerge/trunk/assemblies/j2ee-tomcat-server/src/var/log/deployer-log4j.properties
    geronimo/sandbox/svkmerge/trunk/assemblies/minimal-jetty-server/src/var/log/deployer-log4j.properties
    geronimo/sandbox/svkmerge/trunk/assemblies/minimal-tomcat-server/src/var/log/deployer-log4j.properties
    geronimo/sandbox/svkmerge/trunk/assemblies/zzzzj2ee-installer/src/var/log/deployer-log4j.properties
Modified:
    geronimo/sandbox/svkmerge/trunk/   (props changed)
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
    geronimo/sandbox/svkmerge/trunk/applications/welcome/src/webapp/index.jsp
    geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java

Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jul 18 16:46:33 2006
@@ -1,2 +1,2 @@
 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:422567
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:423293

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java?rev=423294&r1=423293&r2=423294&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
(original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
Tue Jul 18 16:46:33 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/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=423294&r1=423293&r2=423294&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
(original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
Tue Jul 18 16:46:33 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/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp?rev=423294&r1=423293&r2=423294&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
(original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
Tue Jul 18 16:46:33 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/sandbox/svkmerge/trunk/applications/welcome/src/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/welcome/src/webapp/index.jsp?rev=423294&r1=423293&r2=423294&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/welcome/src/webapp/index.jsp (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/welcome/src/webapp/index.jsp Tue Jul 18 16:46:33
2006
@@ -53,6 +53,20 @@
             <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
                 <tr>
                     <td bgcolor="#5FA3D6" bordercolor="#000000" align="left" nowrap>
+                        <font face="Verdana" size="+1">Administration&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</font>
+                    </td>
+                </tr>
+                <tr>
+                    <td bgcolor="#FFFFFF" bordercolor="#000000" nowrap>
+                        <a href="/console">Console</a><br />
+                        &nbsp;
+                    </td>
+                </tr>
+            </table>
+            <br />
+            <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
+                <tr>
+                    <td bgcolor="#5FA3D6" bordercolor="#000000" align="left" nowrap>
                         <font face="Verdana" size="+1">Documentation&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</font>
                     </td>
                 </tr>

Added: geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRestart.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRestart.java?rev=423294&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRestart.java
(added)
+++ geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRestart.java
Tue Jul 18 16:46:33 2006
@@ -0,0 +1,33 @@
+package org.apache.geronimo.deployment.cli;
+
+import javax.enterprise.deploy.spi.status.ProgressObject;
+import javax.enterprise.deploy.spi.DeploymentManager;
+import javax.enterprise.deploy.spi.TargetModuleID;
+import java.io.PrintWriter;
+
+/**
+ * The CLI deployer logic to restart.
+ */
+public class CommandRestart extends CommandStart {
+    public CommandRestart() {
+        super("restart", "1. Common Commands", "[ModuleID|TargetModuleID]+",
+                "Accepts the configId of a module, or the fully-qualified " +
+                "TargetModuleID identifying both the module and the server or cluster it's
" +
+                "on, and restarts that module.  The module should be available to the server
" +
+                "and running. If multiple modules are specified, they will all be restarted.\n");
+    }
+
+    protected ProgressObject runCommand(PrintWriter out, DeploymentManager mgr, TargetModuleID[]
ids) {
+        ProgressObject po = mgr.stop(ids);
+        waitForProgress(out, po);
+        if(po.getDeploymentStatus().isCompleted()) {
+            po = mgr.start(ids);
+            waitForProgress(out, po);
+        }
+        return po;
+    }
+
+    protected String getAction() {
+        return "Restarted";
+    }
+}

Propchange: geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRestart.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRestart.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/CommandRestart.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java?rev=423294&r1=423293&r2=423294&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java
(original)
+++ geronimo/sandbox/svkmerge/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/cli/DeployTool.java
Tue Jul 18 16:46:33 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