From f100d9b4bc2557405fc207746aa1ac6b4d3e9108 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Tue, 13 Jul 2010 16:13:36 +0800
Subject: [PATCH] modify *nix script to launch osgi client and server.

---
 utils/RUN_Adempiere.sh |  2 +-
 utils/RUN_Server2.sh   | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/utils/RUN_Adempiere.sh b/utils/RUN_Adempiere.sh
index 1d9bf85b89..2a63ce5df3 100644
--- a/utils/RUN_Adempiere.sh
+++ b/utils/RUN_Adempiere.sh
@@ -40,5 +40,5 @@ SECURE=
 
 #$JAVA -Xms32m -Xmx512m -DADEMPIERE_HOME=$ADEMPIERE_HOME $PROP $SECURE -classpath $CLASSPATH org.compiere.Adempiere
 # OSGi:
-$JAVA -Xms32m -Xmx512m -DADEMPIERE_HOME=$ADEMPIERE_HOME $PROP $SECURE -jar $ADEMPIERE_HOME/osgi/org.eclipse.osgi_3.6.0.v20100517.jar -clean -console -application org.adempiere.Client
+$JAVA -Xms32m -Xmx512m -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
 
diff --git a/utils/RUN_Server2.sh b/utils/RUN_Server2.sh
index 10b413cae1..ef73150476 100644
--- a/utils/RUN_Server2.sh
+++ b/utils/RUN_Server2.sh
@@ -7,14 +7,23 @@ fi
 
 . ./myEnvironment.sh Server
 
+##	Check Java Home
+if [ $JAVA_HOME ]; then
+  JAVA=$JAVA_HOME/bin/java
+else
+  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.
+fi
+
 # To use your own Encryption class (implementing org.compiere.util.SecureInterface),
 # you need to set it here (and in the client start script) - example:
 # SECURE=-DADEMPIERE_SECURE=org.compiere.util.Secure
 SECURE=
 
+VMARGS="-Djava.awt.headless=true -Declipse.ignoreApp=true -Dosgi.noShutdown=true -DADEMPIERE_HOME=$ADEMPIERE_HOME"
 # headless option if you don't have X installed on the server
-JAVA_OPTS="-server $ADEMPIERE_JAVA_OPTIONS $SECURE -Djava.awt.headless=true -Dorg.adempiere.server.embedded=true"
+$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
 
-export JAVA_OPTS
 
-$JBOSS_HOME/bin/run.sh -c adempiere -b $ADEMPIERE_APPS_SERVER