From 2c4cb3b712a1c36e02139b02d78b6198a6c17987 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Tue, 26 Oct 2010 19:05:14 +0800 Subject: [PATCH] Use "user.dir" as the default adempiere home folder when running on server. --- org.adempiere.base/src/org/compiere/Adempiere.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/Adempiere.java b/org.adempiere.base/src/org/compiere/Adempiere.java index 1440a12682..00a55642e9 100644 --- a/org.adempiere.base/src/org/compiere/Adempiere.java +++ b/org.adempiere.base/src/org/compiere/Adempiere.java @@ -387,13 +387,6 @@ public final class Adempiere { // Try Environment String retValue = Ini.getAdempiereHome(); - // Look in current Directory - if (retValue == null && System.getProperty("user.dir").indexOf("Adempiere") != -1) - { - retValue = System.getProperty("user.dir"); - int pos = retValue.indexOf("Adempiere"); - retValue = retValue.substring(pos+9); - } if (retValue == null) retValue = File.separator + "Adempiere"; return retValue; @@ -455,11 +448,11 @@ public final class Adempiere return url.getHost(); } // getCodeBase - public static synchronized boolean isStarted() + public static synchronized boolean isStarted() { return (log != null); } - + /************************************************************************* * Startup Client/Server. * - Print greeting,