Mercurial > hg > release > thermostat-2.0

changeset 1591:cce1d8d2d561

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2029: web-storage-service fails to start if machine is not connected to the internet Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2014-December/011937.html
author Omair Majid <omajid@redhat.com>
date Thu, 04 Dec 2014 10:30:07 -0500
parents 88778816058c
children 3c55a3f203b8
files distribution/scripts/thermostat pom.xml web/endpoint-plugin/distribution/pom.xml
diffstat 3 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/scripts/thermostat	Wed Dec 03 15:59:31 2014 -0500
+++ b/distribution/scripts/thermostat	Thu Dec 04 10:30:07 2014 -0500
@@ -65,6 +65,8 @@
 # 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"
+# Needed to parse web.xml files without network connection See PR 2029.
+SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_HOME}/plugins/embedded-web-endpoint/jetty-schemas-@jetty-schemas.version@.jar"
 SERVICE_CLASSPATH="${TOOLS_JAR}:${SERVICE_CLASSPATH}"
 
 THERMOSTAT_MAIN="com.redhat.thermostat.main.Thermostat"
--- a/pom.xml	Wed Dec 03 15:59:31 2014 -0500
+++ b/pom.xml	Thu Dec 04 10:30:07 2014 -0500
@@ -266,6 +266,7 @@
     <httpcomponents.client.version>4.3.4</httpcomponents.client.version>
     <gson.version>2.2.2</gson.version>
     <jetty.version>9.1.0.v20131115</jetty.version>
+    <jetty-schemas.version>3.1.M0</jetty-schemas.version>
     <!-- web-endpoint-plugin requires the javax.servlet bundle to be started.
          Jetty 9 drags in version 3.1.0. That is, if you change the jetty
          version, please also make sure the javax.servlet api version is
--- a/web/endpoint-plugin/distribution/pom.xml	Wed Dec 03 15:59:31 2014 -0500
+++ b/web/endpoint-plugin/distribution/pom.xml	Thu Dec 04 10:30:07 2014 -0500
@@ -137,6 +137,11 @@
       <artifactId>jetty-jaas</artifactId>
       <version>${jetty.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-schemas</artifactId>
+      <version>${jetty-schemas.version}</version>
+    </dependency>
     <!-- This will likely have to match what jetty-project's pom uses -->
     <dependency>
       <groupId>javax.servlet</groupId>