From lokahi-commits-return-151-apmail-incubator-lokahi-commits-archive=incubator.apache.org@incubator.apache.org Tue Jul 11 19:24:55 2006 Return-Path: Delivered-To: apmail-incubator-lokahi-commits-archive@locus.apache.org Received: (qmail 21764 invoked from network); 11 Jul 2006 19:24:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Jul 2006 19:24:55 -0000 Received: (qmail 98780 invoked by uid 500); 11 Jul 2006 19:24:55 -0000 Delivered-To: apmail-incubator-lokahi-commits-archive@incubator.apache.org Received: (qmail 98763 invoked by uid 500); 11 Jul 2006 19:24:55 -0000 Mailing-List: contact lokahi-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lokahi-dev@incubator.apache.org Delivered-To: mailing list lokahi-commits@incubator.apache.org Received: (qmail 98744 invoked by uid 99); 11 Jul 2006 19:24:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jul 2006 12:24:54 -0700 X-ASF-Spam-Status: No, hits=-9.3 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,SUBJECT_NOVOWEL 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, 11 Jul 2006 12:24:54 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E3D0A1A981A; Tue, 11 Jul 2006 12:24:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r420950 - in /incubator/lokahi/lokahi/trunk: docs/README.TXT src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java src/www/Apache/Worker/confirm.vm src/www/Tomcat/Worker/confirm.vm Date: Tue, 11 Jul 2006 19:24:32 -0000 To: lokahi-commits@incubator.apache.org From: toback@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060711192433.E3D0A1A981A@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: toback Date: Tue Jul 11 12:24:32 2006 New Revision: 420950 URL: http://svn.apache.org/viewvc?rev=420950&view=rev Log: small change to help apache httpd graceful. Modified: incubator/lokahi/lokahi/trunk/docs/README.TXT incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm Modified: incubator/lokahi/lokahi/trunk/docs/README.TXT URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/docs/README.TXT?rev=420950&r1=420949&r2=420950&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/docs/README.TXT (original) +++ incubator/lokahi/lokahi/trunk/docs/README.TXT Tue Jul 11 12:24:32 2006 @@ -30,6 +30,7 @@ inital.instance.name= inital.user.name= install.location=${tomcat.home}/webapps/ + agent.install.location= ---- 3. Download external libraries to lib/ directory: Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java?rev=420950&r1=420949&r2=420950&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java (original) +++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java Tue Jul 11 12:24:32 2006 @@ -31,7 +31,7 @@ public class HttpsdctlTask extends AbstractAgentTask { HttpsdctlTask(int jobId, TaskType t, String apacheRoot, String command) { - this.task = new FutureTask(new CommandLineProcess(PropertiesFile.getConstantValue("path.to.sudo"), apacheRoot.trim() + "/bin/apachectl", command)); + this.task = new FutureTask(new CommandLineProcess(PropertiesFile.getConstantValue("path.to.sudo"), apacheRoot.trim() + "/bin/apachectl", "-k", command)); this.setJobId(jobId); this.setType(t); } Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm?rev=420950&r1=420949&r2=420950&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm Tue Jul 11 12:24:32 2006 @@ -22,6 +22,7 @@

+
$methodToCall    $individual.getName() Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm?rev=420950&r1=420949&r2=420950&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm Tue Jul 11 12:24:32 2006 @@ -16,12 +16,16 @@ ## $Id$ ## #if ($User.isAllowed($function) && $methodToCall && $actionLink) +
+

+
$methodToCall    $individual.getName()
+
#end