Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 79302 invoked from network); 6 Dec 2007 00:14:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Dec 2007 00:14:49 -0000 Received: (qmail 1720 invoked by uid 500); 6 Dec 2007 00:14:37 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 1675 invoked by uid 500); 6 Dec 2007 00:14:37 -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 1664 invoked by uid 99); 6 Dec 2007 00:14:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Dec 2007 16:14:37 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Dec 2007 00:14:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 052191A9832; Wed, 5 Dec 2007 16:14:28 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r601585 - in /geronimo/server/trunk: assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/ framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ Date: Thu, 06 Dec 2007 00:14:27 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071206001428.052191A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdillon Date: Wed Dec 5 16:14:26 2007 New Revision: 601585 URL: http://svn.apache.org/viewvc?rev=601585&view=rev Log: (GERONIMO-3624) Get previous style rc.d scripts working again Added: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/start-server,default.groovy - copied unchanged from r601558, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/geronimo-commandsCOLONstart-serverCOMMAdefault.groovy Removed: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/geronimo-commandsCOLONstart-serverCOMMAdefault.groovy Modified: geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy Modified: geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy?rev=601585&r1=601584&r2=601585&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy (original) +++ geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy Wed Dec 5 16:14:26 2007 @@ -284,7 +284,8 @@ return } - def name = id + // Use the target commands name (not the alias name) + def name = context.info.name def scanner = ant.fileScanner { fileset(dir: basedir) {