Mercurial > hg > release > thermostat-1.0
changeset 1305:b69449c66e57
Fix SERVICE_CLASSPATH in boot-up script.
Reviewed-by: omajid
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-November/008663.html
| author | Severin Gehwolf <sgehwolf@redhat.com> |
|---|---|
| date | Thu, 07 Nov 2013 19:10:06 +0100 |
| parents | 271febce6e59 |
| children | ac26a7ee871d |
| files | distribution/scripts/thermostat pom.xml |
| diffstat | 2 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/distribution/scripts/thermostat Thu Nov 07 09:42:26 2013 +0100 +++ b/distribution/scripts/thermostat Thu Nov 07 19:10:06 2013 +0100 @@ -54,10 +54,17 @@ # need tools from the JVM TOOLS_JAR="@java.home@/../lib/tools.jar" -# plus the main services we use and export -SERVICE_CLASSPATH="${THERMOSTAT_LIBS}/*" +# This is the minimal boot classpath thermostat needs. Other dependencies +# will get started by the OSGi framework once that's up. +SERVICE_CLASSPATH="${THERMOSTAT_LIBS}/org.apache.felix.framework-@felix.framework.version@.jar" +SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_LIBS}/thermostat-launcher-@project.version@.jar" +SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_LIBS}/thermostat-main-@project.version@.jar" +SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_LIBS}/thermostat-shared-config-@project.version@.jar" +# FIXME: Remove once jfreechart is a real OSGi bundle upstream +SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_LIBS}/jfreechart-@jfreechart.version@.jar" +SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_LIBS}/jcommon-@jcommon.version@.jar" +SERVICE_CLASSPATH="${TOOLS_JAR}:${SERVICE_CLASSPATH}" -SERVICE_CLASSPATH="${TOOLS_JAR}:${SERVICE_CLASSPATH}" THERMOSTAT_MAIN="com.redhat.thermostat.main.Thermostat" function usage() {
--- a/pom.xml Thu Nov 07 09:42:26 2013 +0100 +++ b/pom.xml Thu Nov 07 19:10:06 2013 +0100 @@ -168,6 +168,10 @@ <jdktools.version>1.7.0</jdktools.version> <jfreechart.version>1.0.14</jfreechart.version> + <!-- This should match the version jfreechart pulls in (if any). + See the main thermostat bash script where this property is + used. --> + <jcommon.version>1.0.17</jcommon.version> <mongo-driver.version>2.11.2</mongo-driver.version> <!-- the OSGi Bundle-Version; should match the manifest in the jar --> <mongo-driver.osgi-version>2.11.2.RELEASE</mongo-driver.osgi-version> @@ -376,6 +380,9 @@ <version>${netty.version}</version> </dependency> + <!-- Note that jfreechart pulls in jcommon as a dep. + The jcommon jar is used explicitly in the main + boot script (SERVICE_CLASSPATH). --> <dependency> <groupId>org.jfree</groupId> <artifactId>jfreechart</artifactId>