geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r567860 - /geronimo/sandbox/server-gshell-launcher/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
Date Mon, 20 Aug 2007 22:28:49 GMT
Author: jdillon
Date: Mon Aug 20 15:28:45 2007
New Revision: 567860

URL: http://svn.apache.org/viewvc?rev=567860&view=rev
Log:
Use command name prefix on rc.d scripts, fixed problem with classname of script when loaded

Modified:
    geronimo/sandbox/server-gshell-launcher/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy

Modified: geronimo/sandbox/server-gshell-launcher/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/server-gshell-launcher/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy?rev=567860&r1=567859&r2=567860&view=diff
==============================================================================
--- geronimo/sandbox/server-gshell-launcher/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
(original)
+++ geronimo/sandbox/server-gshell-launcher/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
Mon Aug 20 15:28:45 2007
@@ -380,7 +380,7 @@
     private void processScripts() {
         def scanner = ant.fileScanner {
             fileset(dir: "$geronimoHome/etc/rc.d") {
-                include(name: '*.groovy')
+                include(name: "${this.name}-*.groovy")
             }
         }
         
@@ -395,7 +395,8 @@
         
         for (file in scanner) {
             log.debug("Loading script: $file")
-            shell.evaluate(file)
+            // Use InputStream method to avoid classname problems from the file's name
+            shell.evaluate(file.newInputStream())
         }
     }
     



Mime
View raw message