diff --git a/org.adempiere.server-feature/idempiere-server.bat b/org.adempiere.server-feature/idempiere-server.bat index 216310fdef..abaf87737c 100644 --- a/org.adempiere.server-feature/idempiere-server.bat +++ b/org.adempiere.server-feature/idempiere-server.bat @@ -1,5 +1,6 @@ @Echo off +CALL utils\myEnvironment.bat Server @if not "%JAVA_HOME%" == "" goto JAVA_HOME_OK @Set JAVA=java @@ -17,8 +18,6 @@ goto START @Echo Starting iDempiere Server ... @Echo ======================================= -CALL utils\myEnvironment.bat Server - FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c @Set VMOPTS=-Xbootclasspath/p:alpn-boot.jar diff --git a/org.adempiere.server-feature/idempiere-server.sh b/org.adempiere.server-feature/idempiere-server.sh index 1891706b18..cb171274d3 100644 --- a/org.adempiere.server-feature/idempiere-server.sh +++ b/org.adempiere.server-feature/idempiere-server.sh @@ -1,5 +1,8 @@ #!/bin/sh # +unset DISPLAY +BASE=`dirname $( readlink -f $0 )` +. $BASE/utils/myEnvironment.sh Server if [ $JAVA_HOME ]; then JAVA=$JAVA_HOME/bin/java else @@ -17,9 +20,6 @@ echo =================================== echo Starting iDempiere Server echo =================================== -unset DISPLAY -BASE=`dirname $( readlink -f $0 )` -. $BASE/utils/myEnvironment.sh Server VMOPTS="-Xbootclasspath/p:alpn-boot.jar -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.eclipse.jetty.alpn