geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r580870 - /geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
Date Mon, 01 Oct 2007 06:59:19 GMT
Author: jdillon
Date: Sun Sep 30 23:59:17 2007
New Revision: 580870

URL: http://svn.apache.org/viewvc?rev=580870&view=rev
Log:
Use ShellInfo to get the homeDir

Modified:
    geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy

Modified: geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy?rev=580870&r1=580869&r2=580870&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
(original)
+++ geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
Sun Sep 30 23:59:17 2007
@@ -29,6 +29,8 @@
 
 // Make sure we use our custom builder
 import org.apache.geronimo.commands.AntBuilder
+import org.codehaus.plexus.component.annotations.Requirement
+import org.apache.geronimo.gshell.shell.ShellInfo
 
 /**
  * Starts a new Geronimo server instance.
@@ -40,6 +42,9 @@
     extends CommandSupport
 {
     private AntBuilder ant
+
+    @Requirement
+    ShellInfo shellInfo
     
     @Option(name='-H', aliases=['--home'], metaVar='DIR', description='Use a specific Geronimo
home directory')
     File geronimoHome
@@ -151,8 +156,9 @@
         ant = new AntBuilder(log, io)
         
         if (!geronimoHome) {
-            geronimoHome = new File(System.properties['gshell.home'])
+            geronimoHome = shellInfo.homeDir
         }
+        
         log.debug("Geronimo home: $geronimoHome")
         
         // Setup default java flags



Mime
View raw message