Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 95619 invoked from network); 18 Jul 2006 23:46:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 18 Jul 2006 23:46:56 -0000 Received: (qmail 35612 invoked by uid 500); 18 Jul 2006 23:46:56 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 35577 invoked by uid 500); 18 Jul 2006 23:46:56 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 35557 invoked by uid 99); 18 Jul 2006 23:46:56 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jul 2006 16:46:56 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jul 2006 16:46:55 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 43DAB1A981A; Tue, 18 Jul 2006 16:46:35 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060718234635.43DAB1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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

"; + } else if (RESTART_ACTION.equals(action)) { + configurationManager.restartConfiguration(configId); + messageStatus = "Restarted application

"; } else { messageStatus = "Invalid value for changeState: " + action + "

"; 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 @@  Component Name URL  State - Commands + Commands @@ -27,12 +27,15 @@  ${moduleDetails.contextPath}  ${moduleDetails.state} - +  ">Stop  ">Start  ">Stop - + +  ">Restart + + ">Uninstall 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 @@ + + + + +
+ Administration       +
+ Console
+   +
+
+ + + 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());
Documentation