You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/12/06 01:14:27 UTC

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/

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) {