jerboaa pushed to thermostat (master). "Fix vm-stat bundle wiring issues."
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Mar 24 17:51:53 UTC 2015
jerboaa pushed to thermostat (master). "Fix vm-stat bundle wiring issues."
>From a5aacd4a58a6d56193129dfbf1fdf56686b53278 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf at redhat.com>
Date: Tue, 24 Mar 2015 18:38:20 +0100
Subject: Fix vm-stat bundle wiring issues.
diff --git a/fix_bundle_loading.patch b/fix_bundle_loading.patch
index 941045c..16b3393 100644
--- a/fix_bundle_loading.patch
+++ b/fix_bundle_loading.patch
@@ -1,96 +1,134 @@
+diff --git a/distribution/config/commands/agent-info.properties b/distribution/config/commands/agent-info.properties
+--- a/distribution/config/commands/agent-info.properties
++++ b/distribution/config/commands/agent-info.properties
+@@ -4,7 +4,6 @@
+ com.redhat.thermostat.web.client=${project.version}, \
+ org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
+ org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
+ com.google.gson=${gson.version}, \
+ org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
+ org.apache.commons.beanutils=${commons-beanutils.version}, \
diff --git a/distribution/config/commands/agent.properties b/distribution/config/commands/agent.properties
--- a/distribution/config/commands/agent.properties
+++ b/distribution/config/commands/agent.properties
-@@ -3,6 +3,7 @@
+@@ -3,7 +3,7 @@
com.redhat.thermostat.web.client=${project.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
com.google.gson=${gson.version}, \
com.redhat.thermostat.process=${project.version}, \
+ com.redhat.thermostat.common.core=${project.version}, \
diff --git a/distribution/config/commands/clean-data.properties b/distribution/config/commands/clean-data.properties
--- a/distribution/config/commands/clean-data.properties
+++ b/distribution/config/commands/clean-data.properties
-@@ -4,6 +4,7 @@
+@@ -4,7 +4,7 @@
com.redhat.thermostat.web.client=${project.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
com.google.gson=${gson.version}, \
org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
+ org.apache.commons.beanutils=${commons-beanutils.version}, \
diff --git a/distribution/config/commands/connect.properties b/distribution/config/commands/connect.properties
--- a/distribution/config/commands/connect.properties
+++ b/distribution/config/commands/connect.properties
-@@ -10,6 +10,7 @@
+@@ -10,7 +10,7 @@
org.apache.commons.logging=${commons-logging.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
com.google.gson=${gson.version}
+ description = persistently connect to storage
diff --git a/distribution/config/commands/gui.properties b/distribution/config/commands/gui.properties
--- a/distribution/config/commands/gui.properties
+++ b/distribution/config/commands/gui.properties
-@@ -19,8 +19,11 @@
+@@ -19,8 +19,10 @@
com.redhat.thermostat.process=${project.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
-+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
+- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
- org.jboss.netty=${netty.version}
++ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
+ org.jboss.netty=${netty.version}, \
+ org.jfree.jcommon=${jcommon.osgi.version} , \
+ org.jfree.jfreechart=${jfreechart.osgi.version}
description = launches the GUI client
+diff --git a/distribution/config/commands/list-agents.properties b/distribution/config/commands/list-agents.properties
+--- a/distribution/config/commands/list-agents.properties
++++ b/distribution/config/commands/list-agents.properties
+@@ -4,7 +4,6 @@
+ com.redhat.thermostat.web.client=${project.version}, \
+ org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
+ org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
+ com.google.gson=${gson.version}, \
+ org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
+ org.apache.commons.beanutils=${commons-beanutils.version}, \
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 @@
+@@ -4,7 +4,7 @@
com.redhat.thermostat.web.client=${project.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
com.google.gson=${gson.version}, \
org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
+ org.apache.commons.beanutils=${commons-beanutils.version}, \
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 @@
+@@ -5,7 +5,7 @@
com.redhat.thermostat.web.client=${project.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
com.google.gson=${gson.version}, \
org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
+ org.apache.commons.beanutils=${commons-beanutils.version}, \
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 @@
+@@ -4,7 +4,7 @@
com.redhat.thermostat.web.client=${project.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
com.google.gson=${gson.version}, \
org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
+ org.apache.commons.beanutils=${commons-beanutils.version}, \
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
-@@ -5,6 +5,7 @@
+@@ -5,13 +5,15 @@
com.redhat.thermostat.client.core=${project.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
com.google.gson=${gson.version}, \
org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
+ org.apache.commons.beanutils=${commons-beanutils.version}, \
+ org.apache.commons.codec=${commons-codec.osgi-version}, \
+ org.apache.commons.collections=${commons-collections.version}, \
+- org.apache.commons.logging=${commons-logging.version}
++ org.apache.commons.logging=${commons-logging.version}, \
++ org.jfree.jcommon=${jcommon.osgi.version}, \
++ org.jfree.jfreechart=${jfreechart.osgi.version}
+
+ description = show various statistics about a VM
+
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
@@ -149,14 +187,15 @@ diff --git a/distribution/scripts/thermostat b/distribution/scripts/thermostat
diff --git a/killvm/distribution/thermostat-plugin.xml b/killvm/distribution/thermostat-plugin.xml
--- a/killvm/distribution/thermostat-plugin.xml
+++ b/killvm/distribution/thermostat-plugin.xml
-@@ -80,6 +80,7 @@
+@@ -80,7 +80,7 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
+- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
<bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
+ </bundles>
diff --git a/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties b/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties
--- a/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties
+++ b/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties
@@ -172,8 +211,11 @@ diff --git a/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbu
diff --git a/storage-profile/distribution/thermostat-plugin.xml b/storage-profile/distribution/thermostat-plugin.xml
--- a/storage-profile/distribution/thermostat-plugin.xml
+++ b/storage-profile/distribution/thermostat-plugin.xml
-@@ -68,6 +68,7 @@
- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
+@@ -65,9 +65,9 @@
+ <bundle><symbolic-name>com.redhat.thermostat.storage.mongodb</symbolic-name><version>${project.version}</version></bundle>
+ <bundle><symbolic-name>com.redhat.thermostat.web.common</symbolic-name><version>${project.version}</version></bundle>
+ <bundle><symbolic-name>com.redhat.thermostat.web.client</symbolic-name><version>${project.version}</version></bundle>
+- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
+ <bundle><symbolic-name>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
@@ -183,23 +225,24 @@ diff --git a/storage-profile/distribution/thermostat-plugin.xml b/storage-profil
diff --git a/vm-gc/distribution/thermostat-plugin.xml b/vm-gc/distribution/thermostat-plugin.xml
--- a/vm-gc/distribution/thermostat-plugin.xml
+++ b/vm-gc/distribution/thermostat-plugin.xml
-@@ -74,6 +74,7 @@
+@@ -74,7 +74,7 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
+- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
<bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
+ </bundles>
diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analysis/distribution/thermostat-plugin.xml
--- a/vm-heap-analysis/distribution/thermostat-plugin.xml
+++ b/vm-heap-analysis/distribution/thermostat-plugin.xml
-@@ -86,9 +86,12 @@
+@@ -86,9 +86,11 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
+- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
<bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
+ <bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
@@ -207,12 +250,12 @@ diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analy
<bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
<bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
</bundles>
-@@ -142,9 +145,12 @@
+@@ -142,9 +144,11 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
+- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
<bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
+ <bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
@@ -220,12 +263,12 @@ diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analy
<bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
<bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
</bundles>
-@@ -201,9 +207,12 @@
+@@ -201,9 +205,11 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
+- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
<bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
+ <bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
@@ -233,12 +276,12 @@ diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analy
<bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
<bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
</bundles>
-@@ -254,9 +263,12 @@
+@@ -254,9 +260,11 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
+- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
<bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
+ <bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
@@ -246,12 +289,12 @@ diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analy
<bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
<bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
</bundles>
-@@ -307,9 +319,12 @@
+@@ -307,9 +315,11 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
+- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
<bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
+ <bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
@@ -259,12 +302,12 @@ diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analy
<bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
<bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
</bundles>
-@@ -360,9 +375,12 @@
+@@ -360,9 +370,11 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
+- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
<bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
+ <bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
@@ -272,12 +315,12 @@ diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analy
<bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
<bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
</bundles>
-@@ -406,9 +424,12 @@
+@@ -406,9 +418,11 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
+- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
<bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
+ <bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
@@ -288,22 +331,24 @@ diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analy
diff --git a/vm-profiler/distribution/thermostat-plugin.xml b/vm-profiler/distribution/thermostat-plugin.xml
--- a/vm-profiler/distribution/thermostat-plugin.xml
+++ b/vm-profiler/distribution/thermostat-plugin.xml
-@@ -94,6 +94,7 @@
+@@ -94,7 +94,7 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
+- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
</bundles>
</command>
+ </commands>
diff --git a/web/endpoint-plugin/distribution/thermostat-plugin.xml b/web/endpoint-plugin/distribution/thermostat-plugin.xml
--- a/web/endpoint-plugin/distribution/thermostat-plugin.xml
+++ b/web/endpoint-plugin/distribution/thermostat-plugin.xml
-@@ -68,6 +68,7 @@
+@@ -68,7 +68,7 @@
<bundle><symbolic-name>com.redhat.thermostat.web.client</symbolic-name><version>${project.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
<bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
+- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.httpmime.version}</version></bundle>
- <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
<bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
<bundle><symbolic-name>com.redhat.thermostat.process</symbolic-name><version>${project.version}</version></bundle>
+ <bundle><symbolic-name>com.redhat.thermostat.agent.cli</symbolic-name><version>${project.version}</version></bundle>
diff --git a/thermostat.spec b/thermostat.spec
index 6dcea32..4617669 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -80,7 +80,7 @@ Name: %{?scl_prefix}thermostat
Version: %{major}.%{minor}.%{patchlevel}
# If building from snapshot out of hg, uncomment and adjust below value as appropriate
#Release: 0.1.20131122hg%{hgrev}%{?dist}
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: A monitoring and serviceability tool for OpenJDK
License: GPLv2+ with exceptions and OFL
URL: http://icedtea.classpath.org/thermostat/
@@ -813,6 +813,9 @@ end
%{_datadir}/%{pkg_name}/plugins/embedded-web-endpoint
%changelog
+* Tue Mar 24 2015 Severin Gehwolf <sgehwolf at redhat.com> - 1.2.2-7
+- Fix vm-stat bundle wiring issues.
+
* Mon Mar 23 2015 Severin Gehwolf <sgehwolf at redhat.com> - 1.2.2-6
- Move endpoint plugin to thermostat-webapp package.
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/thermostat.git/commit/?h=master&id=a5aacd4a58a6d56193129dfbf1fdf56686b53278
--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390
More information about the scm-commits
mailing list