changeset 365:a3f0ba8b7f92

Thermostat-client-gui to wrap thermostat review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-June/001798.html reviewed-by: omajid
author Mario Torre <neugens.limasoftware@gmail.com>
date Tue, 12 Jun 2012 17:22:06 +0200
parents 107fb5dd634e
children 7c12420ae95a
files distribution/scripts/thermostat-client-gui
diffstat 1 files changed, 1 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/scripts/thermostat-client-gui	Tue Jun 12 17:22:06 2012 +0200
+++ b/distribution/scripts/thermostat-client-gui	Tue Jun 12 17:22:06 2012 +0200
@@ -37,36 +37,10 @@
 #####################################################################
 #
 # Some necessary variables.
-JAVA_DIR="@java.dir@"
-JAVA="@java.home@/bin/java"
-
 if [ x"$THERMOSTAT_HOME" = x ] ; then
   THERMOSTAT_HOME="@thermostat.home@"
 fi
 export THERMOSTAT_HOME
 
-THERMOSTAT_LIBS="${THERMOSTAT_HOME}/libs"
-
-JCOMMON_JAR="${THERMOSTAT_LIBS}/jcommon.jar"
-JFREECHART_JAR="${THERMOSTAT_LIBS}/jfreechart/jfreechart.jar"
-MONGO_JAR="${THERMOSTAT_LIBS}/mongo.jar"
-BSON_JAR="${THERMOSTAT_LIBS}/bson.jar"
-OSGI_JAR="${THERMOSTAT_LIBS}/org.apache.felix.framework-4.0.2.jar"
-TOOLS_JAR="@java.home@/../lib/tools.jar"
-
-THERM_DIR="${THERMOSTAT_LIBS}"
-
-#CLIENT_CLASSPATH="${JCOMMON_JAR}:${JFREECHART_JAR}:${MONGO_JAR}:${BSON_JAR}:${TOOLS_JAR}:${OSGI_JAR}"
-#CLIENT_CLASSPATH="${THERM_DIR}/*"
-#CLIENT_CLASSPATH="${CLIENT_CLASSPATH}:${THERM_DIR}/thermostat-client-@project.version@.jar:${THERM_DIR}/thermostat-common-@project.version@.jar"
-DEPS=( $(cd ${THERM_DIR} ; find -iname '*jar' | grep -v 'thermostat-.*jar' ) )
-for dep in "${DEPS[@]}"; do
-  DEP_CLASSPATH="${DEP_CLASSPATH}:${THERM_DIR}${dep:1}"
-done
-DEP_CLASSPATH=${DEP_CLASSPATH:1}
-CLIENT_CLASSPATH="${THERM_DIR}/thermostat-launcher-@project.version@.jar:${DEP_CLASSPATH}"
-
-CLIENT_MAIN="com.redhat.thermostat.launcher.Thermostat"
-
-${JAVA} -cp ${CLIENT_CLASSPATH} ${CLIENT_MAIN} ${CLIENT_ARGS} "$@"
+$THERMOSTAT_HOME/bin/thermostat gui
 exit $?