Mercurial > hg > release > thermostat-0.13
changeset 185:4f2137a2f3d8
Merge
| author | Roman Kennke <rkennke@redhat.com> |
|---|---|
| date | Mon, 02 Apr 2012 14:49:04 +0200 |
| parents | ad08bad26237 (current diff) def361b04147 (diff) |
| children | b620b02b15fc b196e5b5ba8c |
| files | pom.xml |
| diffstat | 7 files changed, 88 insertions(+), 61 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/main/java/com/redhat/thermostat/client/ClientArgs.java Mon Apr 02 14:48:02 2012 +0200 +++ b/client/src/main/java/com/redhat/thermostat/client/ClientArgs.java Mon Apr 02 14:49:04 2012 +0200 @@ -36,51 +36,22 @@ package com.redhat.thermostat.client; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.IOException; -import java.io.Reader; -import java.util.Properties; - public class ClientArgs { private boolean isDebugLayout = Boolean.getBoolean("thermostat.debug-layout"); - private Properties props = new Properties(); public ClientArgs(String[] args) { - boolean hasValidPropertiesArg = false; for (int i=0; i < args.length; i++) { if (args[i].equals("--debug-layout")) { isDebugLayout = true; - } else if (args[i].equals("--properties")) { - i++; - if (i >= args.length) { - throw new IllegalArgumentException("--properties argument requires filename."); - } - try (Reader reader = new FileReader(args[i])){ - props.load(reader); - } catch (FileNotFoundException e) { - // ignore - } catch (IOException e) { - // ignore - } - // Ok props file must be good. - hasValidPropertiesArg = true; } } - if (!hasValidPropertiesArg) { - throw new IllegalArgumentException("Properties argument with valid properties file is required."); - } // TODO what other arguments do we care about? // perhaps skipping the mode selection? - } public boolean isDebugLayout() { return isDebugLayout; } - public Properties getProperties() { - return props; - } }
--- a/distribution/pom.xml Mon Apr 02 14:48:02 2012 +0200 +++ b/distribution/pom.xml Mon Apr 02 14:49:04 2012 +0200 @@ -68,8 +68,8 @@ <goal>copy-dependencies</goal> </goals> <configuration> - <excludeTransitive>true</excludeTransitive> - <outputDirectory>${project.build.directory}/lib</outputDirectory> + <excludeTransitive>false</excludeTransitive> + <outputDirectory>${project.build.directory}/libs</outputDirectory> </configuration> </execution> </executions> @@ -89,15 +89,34 @@ <resources> <resource> <directory>scripts</directory> - <targetPath>scripts</targetPath> + <targetPath>bin</targetPath> <filtering>true</filtering> </resource> <resource> <directory>config</directory> - <targetPath>config</targetPath> + <targetPath>agent</targetPath> + <filtering>true</filtering> + <includes> + <include>agent.properties</include> + </includes> + </resource> + <resource> + <directory>config</directory> + <targetPath>storage</targetPath> <filtering>true</filtering> + <includes> + <include>db.properties</include> + </includes> </resource> - /</resources> + <resource> + <directory>config</directory> + <targetPath>backends</targetPath> + <filtering>true</filtering> + <includes> + <include>system/backend.properties</include> + </includes> + </resource> + </resources> </configuration> </execution> </executions> @@ -112,7 +131,24 @@ <phase>prepare-package</phase> <configuration> <target> - <chmod file="${project.build.directory}/scripts/*" perm="755"/> + <chmod file="${project.build.directory}/bin/*" perm="755"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>directory-structure</id> + <phase>prepare-package</phase> + <configuration> + <target> + <mkdir dir="${project.build.directory}/storage" /> + <mkdir dir="${project.build.directory}/storage/db" /> + <mkdir dir="${project.build.directory}/storage/logs" /> + <mkdir dir="${project.build.directory}/storage/run" /> + <mkdir dir="${project.build.directory}/agent/logs" /> + <mkdir dir="${project.build.directory}/agent/run" /> </target> </configuration> <goals>
--- a/distribution/scripts/thermostat-agent Mon Apr 02 14:48:02 2012 +0200 +++ b/distribution/scripts/thermostat-agent Mon Apr 02 14:49:04 2012 +0200 @@ -40,6 +40,11 @@ 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" @@ -48,11 +53,13 @@ JOPT_JAR="${THERMOSTAT_LIBS}/jopt-simple-4.3.jar" TOOLS_JAR="@java.home@/../lib/tools.jar" -SERVICE_CLASSPATH="${JCOMMON_JAR}:${MONGO_JAR}:${BSON_JAR}:${TOOLS_JAR}:${JOPT_JAR}" +#SERVICE_CLASSPATH="${JCOMMON_JAR}:${MONGO_JAR}:${BSON_JAR}:${TOOLS_JAR}:${JOPT_JAR}" +SERVICE_CLASSPATH="${THERMOSTAT_LIBS}/*" THERM_DIR=${THERMOSTAT_LIBS} SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERM_DIR}/thermostat-agent-@project.version@.jar:${THERM_DIR}/thermostat-common-@project.version@.jar:${THERM_DIR}/thermostat-tools-@project.version@.jar" SERVICE_MAIN="com.redhat.thermostat.agent.AgentApplication" -${JAVA} -cp ${SERVICE_CLASSPATH} ${SERVICE_MAIN} $@ +${JAVA} -cp ${SERVICE_CLASSPATH} ${SERVICE_MAIN} "$@" +exit $?
--- a/distribution/scripts/thermostat-client-gui Mon Apr 02 14:48:02 2012 +0200 +++ b/distribution/scripts/thermostat-client-gui Mon Apr 02 14:49:04 2012 +0200 @@ -39,29 +39,28 @@ # Some necessary variables. JAVA_DIR="@java.dir@" JAVA="@java.home@/bin/java" -JCOMMON_JAR="${JAVA_DIR}/jcommon.jar" -JFREECHART_JAR="${JAVA_DIR}/jfreechart/jfreechart.jar" -MONGO_JAR="${JAVA_DIR}/mongo.jar" -BSON_JAR="${JAVA_DIR}/bson.jar" + +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" TOOLS_JAR="@java.home@/../lib/tools.jar" -CLIENT_CLASSPATH="${JCOMMON_JAR}:${JFREECHART_JAR}:${MONGO_JAR}:${BSON_JAR}:${TOOLS_JAR}" -# Find the directory where thermostat is installed. -# Note this will not work if there are symlinks to resolve that -# are not full paths. -SOURCE="${BASH_SOURCE[0]}" -while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done -THERM_DIR=`dirname "$( cd -P "$( dirname "$SOURCE" )" && pwd )"` -# Some other necessary variables. -CLIENT_CLASSPATH="${CLIENT_CLASSPATH}:${THERM_DIR}/lib/thermostat-client-@project.version@.jar:${THERM_DIR}/lib/thermostat-common-@project.version@.jar" + +THERM_DIR="${THERMOSTAT_LIBS}" + +#CLIENT_CLASSPATH="${JCOMMON_JAR}:${JFREECHART_JAR}:${MONGO_JAR}:${BSON_JAR}:${TOOLS_JAR}" +CLIENT_CLASSPATH="${THERM_DIR}/*" +CLIENT_CLASSPATH="${CLIENT_CLASSPATH}:${THERM_DIR}/thermostat-client-@project.version@.jar:${THERM_DIR}/thermostat-common-@project.version@.jar" + CLIENT_MAIN="com.redhat.thermostat.client.Main" -CLIENT_ARGS="--properties ${THERM_DIR}/config/agent.properties" - -function usage { - echo "Usage:" - echo " thermostat-client-gui [args]" -} - -${JAVA} -cp ${CLIENT_CLASSPATH} ${CLIENT_MAIN} ${CLIENT_ARGS} +${JAVA} -cp ${CLIENT_CLASSPATH} ${CLIENT_MAIN} ${CLIENT_ARGS} "$@" exit $?
--- a/distribution/scripts/thermostat-db Mon Apr 02 14:48:02 2012 +0200 +++ b/distribution/scripts/thermostat-db Mon Apr 02 14:49:04 2012 +0200 @@ -40,6 +40,11 @@ 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" @@ -48,11 +53,13 @@ JOPT_JAR="${THERMOSTAT_LIBS}/jopt-simple-4.3.jar" TOOLS_JAR="@java.home@/../lib/tools.jar" -SERVICE_CLASSPATH="${JCOMMON_JAR}:${MONGO_JAR}:${BSON_JAR}:${TOOLS_JAR}:${JOPT_JAR}" +#SERVICE_CLASSPATH="${JCOMMON_JAR}:${MONGO_JAR}:${BSON_JAR}:${TOOLS_JAR}:${JOPT_JAR}" +SERVICE_CLASSPATH="${THERMOSTAT_LIBS}/*" THERM_DIR=${THERMOSTAT_LIBS} SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERM_DIR}/thermostat-agent-@project.version@.jar:${THERM_DIR}/thermostat-common-@project.version@.jar:${THERM_DIR}/thermostat-tools-@project.version@.jar" SERVICE_MAIN="com.redhat.thermostat.tools.db.DBService" -${JAVA} -cp ${SERVICE_CLASSPATH} ${SERVICE_MAIN} $@ +${JAVA} -cp ${SERVICE_CLASSPATH} ${SERVICE_MAIN} "$@" +exit $?
--- a/distribution/scripts/thermostat-service Mon Apr 02 14:48:02 2012 +0200 +++ b/distribution/scripts/thermostat-service Mon Apr 02 14:49:04 2012 +0200 @@ -40,6 +40,10 @@ 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" @@ -48,7 +52,8 @@ JOPT_JAR="${THERMOSTAT_LIBS}/jopt-simple-4.3.jar" TOOLS_JAR="@java.home@/../lib/tools.jar" -SERVICE_CLASSPATH="${JCOMMON_JAR}:${MONGO_JAR}:${BSON_JAR}:${TOOLS_JAR}:${JOPT_JAR}" +#SERVICE_CLASSPATH="${JCOMMON_JAR}:${MONGO_JAR}:${BSON_JAR}:${TOOLS_JAR}:${JOPT_JAR}" +SERVICE_CLASSPATH="${THERMOSTAT_LIBS}/*" THERM_DIR=${THERMOSTAT_LIBS} @@ -56,3 +61,4 @@ SERVICE_MAIN="com.redhat.thermostat.tools.ThermostatService" ${JAVA} -cp ${SERVICE_CLASSPATH} ${SERVICE_MAIN} "$@" +exit $?
--- a/pom.xml Mon Apr 02 14:48:02 2012 +0200 +++ b/pom.xml Mon Apr 02 14:49:04 2012 +0200 @@ -54,6 +54,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <thermostat.build.directory>target</thermostat.build.directory> <thermostat.java.version>1.7</thermostat.java.version> + <thermostat.home>${project.build.directory}</thermostat.home> <java.dir>/usr/share/java</java.dir> <junit.version>4.10</junit.version>