geronimo-scm mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=567862&view=rev
Log:
Tidy up

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=567862&r1=567861&r2=567862&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:32:36 2007
@@ -377,13 +377,22 @@
         return Command.SUCCESS
     }
     
+    /**
+     * Process custom rc.d scripts.
+     */
     private void processScripts() {
+        //
+        // FIXME: Make the base directory configurable
+        //
+        
+        def basedir = new File(geronimoHome, 'etc/rc.d')
+        if (!basedir.exists()) {
+            log.debug("Skipping script processing; missing base directory: $basedir")
+            return
+        }
+        
         def scanner = ant.fileScanner {
-            //
-            // FIXME: Make the base directory configurable
-            //
-            
-            fileset(dir: "$geronimoHome/etc/rc.d") {
+            fileset(dir: basedir) {
                 include(name: "${this.name}-*.groovy")
             }
         }
@@ -393,6 +402,7 @@
         
         for (file in scanner) {
             log.debug("Loading script: $file")
+            
             // Use InputStream method to avoid classname problems from the file's name
             shell.evaluate(file.newInputStream())
         }



Mime
View raw message