[thermostat] Fix various bundle resolution problems.

[jerboaa]

commit f926aa5ad3dd500b89aae5cf95071fc70741c035
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Tue Mar 12 19:10:55 2013 +0100

    Fix various bundle resolution problems.

 fix_bundle_loading.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 thermostat.spec          |    6 +++++-
 2 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/fix_bundle_loading.patch b/fix_bundle_loading.patch
index 489eefe..6861d23 100644
--- a/fix_bundle_loading.patch
+++ b/fix_bundle_loading.patch
@@ -38,6 +38,50 @@ diff --git a/distribution/config/commands/gui.properties b/distribution/config/c
  
  description = launches the GUI client
  
+diff --git a/distribution/config/commands/list-vms.properties b/distribution/config/commands/list-vms.properties
+--- a/distribution/config/commands/list-vms.properties
++++ b/distribution/config/commands/list-vms.properties
+@@ -4,6 +4,7 @@
+           thermostat-web-client-${project.version}.jar, \
+           httpcomponents-core.jar, \
+           httpcomponents-client.jar, \
++          httpcomponents-mime.jar, \
+           gson.jar, \
+           mongo.jar, \
+           commons-beanutils.jar, \
+diff --git a/distribution/config/commands/ping.properties b/distribution/config/commands/ping.properties
+--- a/distribution/config/commands/ping.properties
++++ b/distribution/config/commands/ping.properties
+@@ -5,6 +5,7 @@
+           thermostat-web-client-${project.version}.jar, \
+           httpcomponents-core.jar, \
+           httpcomponents-client.jar, \
++          httpcomponents-mime.jar, \
+           gson.jar, \
+           mongo.jar, \
+           commons-beanutils.jar, \
+diff --git a/distribution/config/commands/vm-info.properties b/distribution/config/commands/vm-info.properties
+--- a/distribution/config/commands/vm-info.properties
++++ b/distribution/config/commands/vm-info.properties
+@@ -4,6 +4,7 @@
+           thermostat-web-client-${project.version}.jar, \
+           httpcomponents-core.jar, \
+           httpcomponents-client.jar, \
++          httpcomponents-mime.jar, \
+           gson.jar, \
+           mongo.jar, \
+           commons-beanutils.jar, \
+diff --git a/distribution/config/commands/vm-stat.properties b/distribution/config/commands/vm-stat.properties
+--- a/distribution/config/commands/vm-stat.properties
++++ b/distribution/config/commands/vm-stat.properties
+@@ -4,6 +4,7 @@
+           thermostat-web-client-${project.version}.jar, \
+           httpcomponents-core.jar, \
+           httpcomponents-client.jar, \
++          httpcomponents-mime.jar, \
+           gson.jar, \
+           mongo.jar, \
+           commons-beanutils.jar, \
 diff --git a/distribution/config/osgi-export.properties b/distribution/config/osgi-export.properties
 --- a/distribution/config/osgi-export.properties
 +++ b/distribution/config/osgi-export.properties
diff --git a/thermostat.spec b/thermostat.spec
index 318fa70..f3a1640 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -7,7 +7,7 @@ Name:       thermostat
 Version:    0.6.0
 # If building from snapshot out of hg, uncomment and adjust below value as appropriate
 #Release:    0.28.20121123hg%{hgrev}%{?dist}
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    A monitoring and serviceability tool for OpenJDK
 License:    GPLv2+ with exceptions
 URL:        http://icedtea.classpath.org/thermostat/
@@ -293,6 +293,10 @@ cp -a target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Mar 12 2013 Severin Gehwolf <sgehwolf at redhat.com> 0.6.0-4
+- Fix bundle-loading patch so that all commands depending on
+  httpcomponents-*.jars also start httpmime.
+
 * Tue Mar 12 2013 Severin Gehwolf <sgehwolf at redhat.com> 0.6.0-3
 - Update init-layout-patch (was missing plugins symlink).
 - Fix OSGi filter syntax (prevented thermostat gui from booting).