(GSHELL-127) Add GSHELL_HOME_DETECTED, default ${gshell.home} to this value
git-svn-id: https://svn.apache.org/repos/asf/geronimo/gshell/trunk@726410 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Configuration.java b/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Configuration.java
index c347232..16d227b 100644
--- a/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Configuration.java
+++ b/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Configuration.java
@@ -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;
diff --git a/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/ConfigurationImpl.java b/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/ConfigurationImpl.java
index e6678f2..7c89fd3 100644
--- a/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/ConfigurationImpl.java
+++ b/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/ConfigurationImpl.java
@@ -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) {
diff --git a/gshell-bootstrap/src/main/resources/org/apache/geronimo/gshell/bootstrap/default.properties b/gshell-bootstrap/src/main/resources/org/apache/geronimo/gshell/bootstrap/default.properties
index 0f0aeac..cd49008 100644
--- a/gshell-bootstrap/src/main/resources/org/apache/geronimo/gshell/bootstrap/default.properties
+++ b/gshell-bootstrap/src/main/resources/org/apache/geronimo/gshell/bootstrap/default.properties
@@ -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
