* apply osgi changes to windows batch file.

This commit is contained in:
Heng Sin Low 2010-07-18 17:18:04 +08:00
parent 9683dc8cdc
commit 1be6844703
2 changed files with 19 additions and 27 deletions

View File

@ -22,7 +22,6 @@
:CHECK_ADEMPIERE :CHECK_ADEMPIERE
@if not "%ADEMPIERE_HOME%" == "" goto ADEMPIERE_HOME_OK @if not "%ADEMPIERE_HOME%" == "" goto ADEMPIERE_HOME_OK
Set CLASSPATH=lib\Adempiere.jar;lib\AdempiereCLib.jar;lib\CompiereJasperReqs.jar;%CLASSPATH%
set ADEMPIERE_HOME=%~dp0.. set ADEMPIERE_HOME=%~dp0..
@Echo ADEMPIERE_HOME is not set. @Echo ADEMPIERE_HOME is not set.
@Echo You may not be able to start Adempiere @Echo You may not be able to start Adempiere
@ -31,7 +30,6 @@ set ADEMPIERE_HOME=%~dp0..
@Echo cscript WinEnv.js C:\Adempiere C:\j2sdk1.4.2_08 @Echo cscript WinEnv.js C:\Adempiere C:\j2sdk1.4.2_08
@goto MULTI_INSTALL @goto MULTI_INSTALL
:ADEMPIERE_HOME_OK :ADEMPIERE_HOME_OK
@Set CLASSPATH=%ADEMPIERE_HOME%\lib\Adempiere.jar;%ADEMPIERE_HOME%\lib\AdempiereCLib.jar;%ADEMPIERE_HOME%\lib\CompiereJasperReqs.jar;%CLASSPATH%
:MULTI_INSTALL :MULTI_INSTALL
@REM To switch between multiple installs, copy the created Adempiere.properties file @REM To switch between multiple installs, copy the created Adempiere.properties file
@ -49,7 +47,7 @@ set ADEMPIERE_HOME=%~dp0..
@SET SECURE= @SET SECURE=
:START :START
@"%JAVA%" -Xms32m -Xmx512m -DADEMPIERE_HOME=%ADEMPIERE_HOME% %PROP% %SECURE% -classpath "%CLASSPATH%" org.compiere.Adempiere @"%JAVA%" -Xms32m -Xmx512m -Dosgi.compatibility.bootdelegation=true -DADEMPIERE_HOME=%ADEMPIERE_HOME% %PROP% %SECURE% -jar %ADEMPIERE_HOME%/osgi/org.eclipse.osgi_3.6.0.v20100517.jar -clean -console -install %ADEMPIERE_HOME%/osgi -configuration %ADEMPIERE_HOME%/osgi/client -application org.adempiere.Client
@Rem @sleep 15 @Rem @sleep 15
@CHOICE /C YN /T 15 /D N > NUL @CHOICE /C YN /T 15 /D N > NUL

View File

@ -3,29 +3,23 @@
@Rem $Id: RUN_Server2.bat,v 1.24 2005/10/26 00:38:18 jjanke Exp $ @Rem $Id: RUN_Server2.bat,v 1.24 2005/10/26 00:38:18 jjanke Exp $
:CHECK_JAVA:
@if not "%JAVA_HOME%" == "" goto JAVA_HOME_OK
@Set JAVA=java
@Echo JAVA_HOME is not set.
@Echo You may not be able to start Adempiere
@Echo Set JAVA_HOME to the directory of your local JDK.
@Echo You could set it via WinEnv.js e.g.:
@Echo cscript WinEnv.js C:\Adempiere C:\j2sdk1.4.2_06
@goto CHECK_ADEMPIERE
:JAVA_HOME_OK
@Set JAVA=%JAVA_HOME%\bin\java
@Rem To use your own Encryption class (implementing org.compiere.util.SecureInterface), @Rem To use your own Encryption class (implementing org.compiere.util.SecureInterface),
@Rem you need to set it here (and in the client start script) - example: @Rem you need to set it here (and in the client start script) - example:
@Rem SET SECURE=-DADEMPIERE_SECURE=org.compiere.util.Secure @Rem SET SECURE=-DADEMPIERE_SECURE=org.compiere.util.Secure
@SET SECURE= @SET SECURE=
VMARGS="-Dosgi.compatibility.bootdelegation=true -Djava.awt.headless=true -Declipse.ignoreApp=true -Dosgi.noShutdown=true -DADEMPIERE_HOME=%ADEMPIERE_HOME%"
@IF '%ADEMPIERE_APPS_TYPE%' == 'jboss' GOTO JBOSS # headless option if you don't have X installed on the server
@GOTO UNSUPPORTED @"%JAVA%" -server %VMARGS% -jar %ADEMPIERE_HOME%/osgi/org.eclipse.osgi_3.6.0.v20100517.jar -install %ADEMPIERE_HOME%/osgi -configuration %ADEMPIERE_HOME%/osgi/server -clean -console
:JBOSS
@Set NOPAUSE=Yes
@Set JAVA_OPTS=-server %ADEMPIERE_JAVA_OPTIONS% %SECURE% -Dorg.adempiere.server.embedded=true
@Echo Start Adempiere Apps Server %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%)
@Call %JBOSS_HOME%\bin\run -c adempiere -b %ADEMPIERE_APPS_SERVER%
@Echo Done Adempiere Apps Server %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%)
@GOTO END
:UNSUPPORTED
@Echo Apps Server start of %ADEMPIERE_APPS_TYPE% not supported
:END
@Rem Sleep 60
@CHOICE /C YN /T 60 /D N > NUL
@Exit