From a9fd85fa31543c0be836f088972b34938aaac1c3 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 23 Jun 2015 21:46:27 -0500 Subject: [PATCH] IDEMPIERE-2662 Windows idempiere-server.bat broken --- org.adempiere.server-feature/console-setup-alt.bat | 5 +++-- org.adempiere.server-feature/idempiere-server.bat | 3 ++- org.adempiere.server-feature/setup-alt.bat | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/org.adempiere.server-feature/console-setup-alt.bat b/org.adempiere.server-feature/console-setup-alt.bat index 543681e07a..e023c144b1 100644 --- a/org.adempiere.server-feature/console-setup-alt.bat +++ b/org.adempiere.server-feature/console-setup-alt.bat @@ -18,7 +18,8 @@ goto START :START @REM Setup idempiere.properties and idempiereEnv.properties -@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.adempiere.install.console-application +FOR %%c in (plugins\org.eclipse.osgi_3.7.*.jar) DO set JARFILE=%%c +@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar %JARFILE% -application org.adempiere.install.console-application @Echo ErrorLevel = %ERRORLEVEL% @IF NOT ERRORLEVEL = 1 GOTO NEXT @@ -30,7 +31,7 @@ goto START :NEXT @REM setup tomcat -@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml +@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar %JARFILE% -application org.eclipse.ant.core.antRunner -buildfile build.xml @Echo . @Echo For problems, check log file in base directory diff --git a/org.adempiere.server-feature/idempiere-server.bat b/org.adempiere.server-feature/idempiere-server.bat index b87feb61ff..cb7461db98 100644 --- a/org.adempiere.server-feature/idempiere-server.bat +++ b/org.adempiere.server-feature/idempiere-server.bat @@ -17,4 +17,5 @@ goto START @Echo Starting iDempiere Server ... @Echo ======================================= -@"%JAVA%" -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.*.jar -console 12612 -application org.adempiere.server.application +FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c +@"%JAVA%" -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar %JARFILE% -console 12612 -application org.adempiere.server.application diff --git a/org.adempiere.server-feature/setup-alt.bat b/org.adempiere.server-feature/setup-alt.bat index 708be99ad8..8b4b612b5b 100644 --- a/org.adempiere.server-feature/setup-alt.bat +++ b/org.adempiere.server-feature/setup-alt.bat @@ -18,7 +18,8 @@ goto START :START @REM Setup idempiere.properties and idempiereEnv.properties -@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.adempiere.install.application -consoleLog +FOR %%c in (plugins\org.eclipse.osgi_3.7.*.jar) DO set JARFILE=%%c +@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar %JARFILE% -application org.adempiere.install.application -consoleLog @Echo ErrorLevel = %ERRORLEVEL% @IF NOT ERRORLEVEL = 1 GOTO NEXT @@ -31,7 +32,7 @@ goto START :NEXT @REM setup tomcat @Echo ... Setup Tomcat -@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml +@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar %JARFILE% -application org.eclipse.ant.core.antRunner -buildfile build.xml @Echo ... @Echo For problems, check log file in base directory