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 2008/12/14 11:48:08 UTC
svn commit: r726410 - in /geronimo/gshell/trunk/gshell-bootstrap/src/main: java/org/apache/geronimo/gshell/bootstrap/ resources/org/apache/geronimo/gshell/bootstrap/

Author: jdillon
Date: Sun Dec 14 02:48:08 2008
New Revision: 726410

URL: http://svn.apache.org/viewvc?rev=726410&view=rev
Log:
(GSHELL-127) Add GSHELL_HOME_DETECTED, default ${gshell.home} to this value

Modified:
    geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Configuration.java
    geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/ConfigurationImpl.java
    geronimo/gshell/trunk/gshell-bootstrap/src/main/resources/org/apache/geronimo/gshell/bootstrap/default.properties

Modified: geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Configuration.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Configuration.java?rev=726410&r1=726409&r2=726410&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Configuration.java (original)
+++ geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Configuration.java Sun Dec 14 02:48:08 2008
@@ -29,6 +29,8 @@
  */
 public interface Configuration
 {
+    String GSHELL_HOME_DETECTED = "gshell.home.detected";
+
     String GSHELL_HOME = "gshell.home";
 
     String GSHELL_ETC = "gshell.etc";
@@ -37,6 +39,8 @@
 
     String GSHELL_PROGRAM = "gshell.program";
 
+    String GSHELL_PROPERTIES = "gshell.properties";
+
     void configure() throws Exception;
 
     List<URL> getClassPath() throws Exception;

Modified: geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/ConfigurationImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/ConfigurationImpl.java?rev=726410&r1=726409&r2=726410&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/ConfigurationImpl.java (original)
+++ geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/ConfigurationImpl.java Sun Dec 14 02:48:08 2008
@@ -84,11 +84,10 @@
             input.close();
         }
 
-        // HACK: Should probably have gshell.home.detected property and pre-set gshell.home=${gshell.home.detected}
-        props.setProperty(GSHELL_HOME, detectHomeDir().getAbsolutePath());
+        props.setProperty(GSHELL_HOME_DETECTED, detectHomeDir().getAbsolutePath());
 
         //
-        // TODO: Load user configuration properties as configured via gshell.properties
+        // TODO: Load user configuration properties as configured via GSHELL_PROPERTIES
         //
         
         if (Log.DEBUG) {

Modified: geronimo/gshell/trunk/gshell-bootstrap/src/main/resources/org/apache/geronimo/gshell/bootstrap/default.properties
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-bootstrap/src/main/resources/org/apache/geronimo/gshell/bootstrap/default.properties?rev=726410&r1=726409&r2=726410&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-bootstrap/src/main/resources/org/apache/geronimo/gshell/bootstrap/default.properties (original)
+++ geronimo/gshell/trunk/gshell-bootstrap/src/main/resources/org/apache/geronimo/gshell/bootstrap/default.properties Sun Dec 14 02:48:08 2008
@@ -21,10 +21,12 @@
 ## $Rev$ $Date$
 ##
 
-gshell.home=
+gshell.home=${gshell.home.detected}
 
 gshell.etc=${gshell.home}/etc
 
 gshell.lib=${gshell.home}/lib
 
 gshell.program=gsh
+
+gshell.properties=${gshell.etc}/${gshell.program}.properties