Merged in tbayen/idempiere (pull request #53: IDEMPIERE-428, IDEMPIERE-81, equinox launcher version independence in adempiere-client.sh)

This commit is contained in:
Carlos Ruiz 2012-12-19 09:52:24 -05:00
commit f388799354
2 changed files with 6 additions and 2 deletions

View File

@ -17,4 +17,4 @@ goto START
@Echo Starting Adempiere Client ... @Echo Starting Adempiere Client ...
@Echo ======================================= @Echo =======================================
@"%JAVA%" -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -application org.adempiere.ui.swing.client @"%JAVA%" -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.ui.swing.client

View File

@ -1,5 +1,9 @@
#!/bin/sh #!/bin/sh
# #
# script parameters are used as VM args. e.g.:
# ./adempiere-client.sh -DPropertyFile=/home/tbayen/idempiere-conf2.properties
# -- tbayen
if [ $JAVA_HOME ]; then if [ $JAVA_HOME ]; then
JAVA=$JAVA_HOME/bin/java JAVA=$JAVA_HOME/bin/java
else else
@ -13,4 +17,4 @@ echo ===================================
echo Starting Adempiere Client echo Starting Adempiere Client
echo =================================== echo ===================================
$JAVA -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -application org.adempiere.ui.swing.client $JAVA -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true $@ -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_ 1.*.jar -application org.adempiere.ui.swing.client