midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use "user.dir" as the default adempiere home folder when running on server.

This commit is contained in:
Heng Sin Low 2010-10-26 19:05:14 +08:00
parent d4be04bd12
commit 2c4cb3b712
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.adempiere.base/src/org/compiere/Adempiere.java
View File

@ -387,13 +387,6 @@ public final class Adempiere
{ {
// Try Environment // Try Environment
String retValue = Ini.getAdempiereHome(); 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) if (retValue == null)
retValue = File.separator + "Adempiere"; retValue = File.separator + "Adempiere";
return retValue; return retValue;
@ -455,11 +448,11 @@ public final class Adempiere
return url.getHost(); return url.getHost();
} // getCodeBase } // getCodeBase
public static synchronized boolean isStarted() public static synchronized boolean isStarted()
{ {
return (log != null); return (log != null);
} }
/************************************************************************* /*************************************************************************
* Startup Client/Server. * Startup Client/Server.
* - Print greeting, * - Print greeting,