changeset 555:f7f315bd6a53

Add explicit Bundle-SymbolicName config to bundles. This allows us to uniquely identify bundles within the framework. Without this configuration the Maven bundle plug-in generates a bundle symbolic name. Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-August/002842.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Mon, 20 Aug 2012 18:22:27 +0200
parents 6ca85a6f23c7
children 517f3d4796af
files agent/cli/pom.xml agent/command/pom.xml agent/core/pom.xml bundles/pom.xml client/command/pom.xml client/core/pom.xml client/heapdumper/pom.xml client/killvm/pom.xml client/living-vm-filter/pom.xml client/memory-stats-panel/pom.xml client/swing-components/pom.xml client/vmclassstat/pom.xml common/command/pom.xml common/core/pom.xml dolphin/pom.xml keyring/pom.xml launcher/pom.xml main/pom.xml thread/client-common/pom.xml thread/client-controllers/pom.xml thread/client-swing/pom.xml thread/collector/pom.xml tools/pom.xml unix-process-handler/pom.xml
diffstat 24 files changed, 24 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/agent/cli/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/agent/cli/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -97,6 +97,7 @@
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <Bundle-Activator>com.redhat.thermostat.agent.cli.impl.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>com.redhat.thermostat.agent.cli</Bundle-SymbolicName>
             <Export-Package>
               com.redhat.thermostat.agent.cli,
             </Export-Package>
--- a/agent/command/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/agent/command/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -98,6 +98,7 @@
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <Bundle-Activator>com.redhat.thermostat.agent.command.internal.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>com.redhat.thermostat.agent.command</Bundle-SymbolicName>
             <Export-Package>
               com.redhat.thermostat.agent.command
             </Export-Package>
--- a/agent/core/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/agent/core/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -97,6 +97,7 @@
         <configuration>
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
+            <Bundle-SymbolicName>com.redhat.thermostat.agent.core</Bundle-SymbolicName>
             <Export-Package>
               com.redhat.thermostat.agent,
               com.redhat.thermostat.agent.config,
--- a/bundles/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/bundles/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -99,6 +99,7 @@
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <Bundle-Activator>com.redhat.thermostat.bundles.impl.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>com.redhat.thermostat.bundles.core</Bundle-SymbolicName>
             <Export-Package>
               com.redhat.thermostat.bundles
             </Export-Package>
--- a/client/command/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/client/command/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -97,6 +97,7 @@
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <Bundle-Activator>com.redhat.thermostat.client.command.internal.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>com.redhat.thermostat.client.command</Bundle-SymbolicName>
             <Export-Package>
               com.redhat.thermostat.client.command,
               com.redhat.thermostat.client.command.cli
--- a/client/core/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/client/core/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -145,6 +145,7 @@
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <Bundle-Activator>com.redhat.thermostat.client.internal.osgi.ThermostatActivator</Bundle-Activator>
+            <Bundle-SymbolicName>com.redhat.thermostat.client.core</Bundle-SymbolicName>
             <Export-Package>
               com.redhat.thermostat.client.osgi.service,
               com.redhat.thermostat.client.ui,
--- a/client/heapdumper/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/client/heapdumper/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -56,6 +56,7 @@
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <Bundle-Activator>com.redhat.thermostat.client.heap.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>com.redhat.thermostat.client.heapdumper</Bundle-SymbolicName>
             <Private-Package>
                com.redhat.thermostat.client.heap,
                com.redhat.thermostat.client.heap.cli,
--- a/client/killvm/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/client/killvm/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -19,6 +19,7 @@
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <Bundle-Activator>com.redhat.thermostat.client.killvm.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>com.redhat.thermostat.client.killvm</Bundle-SymbolicName>
             <Private-Package>com.redhat.thermostat.client.killvm</Private-Package>
           </instructions>
           <!-- Do not autogenerate uses clauses in Manifests -->
--- a/client/living-vm-filter/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/client/living-vm-filter/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -29,6 +29,7 @@
           <instructions>
             <Private-Package>com.redhat.thermostat.client.filter.vm</Private-Package>
             <Bundle-Activator>com.redhat.thermostat.client.filter.vm.VMFilterActivator</Bundle-Activator>
+            <Bundle-SymbolicName>com.redhat.thermostat.filter.livingvm</Bundle-SymbolicName>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <!-- Do not autogenerate uses clauses in Manifests -->
             <_nouses>true</_nouses>
--- a/client/memory-stats-panel/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/client/memory-stats-panel/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -20,6 +20,7 @@
             <Private-Package>com.redhat.thermostat.client.stats.memory</Private-Package>
             <Bundle-Activator>com.redhat.thermostat.client.stats.memory.MemoryStatsPanelActivator</Bundle-Activator>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
+            <Bundle-SymbolicName>com.redhat.thermostat.client.stats.memory</Bundle-SymbolicName>
             <!-- Do not autogenerate uses clauses in Manifests -->
             <_nouses>true</_nouses>
           </instructions>
--- a/client/swing-components/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/client/swing-components/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -52,6 +52,7 @@
         <configuration>
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
+            <Bundle-SymbolicName>com.redhat.thermostat.client.swing.components</Bundle-SymbolicName>
             <Export-Package>
               com.redhat.thermostat.swing,
               com.redhat.thermostat.models,
--- a/client/vmclassstat/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/client/vmclassstat/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -20,6 +20,7 @@
             <Private-Package>com.redhat.thermostat.client.vmclassstat</Private-Package>
             <Bundle-Activator>com.redhat.thermostat.client.vmclassstat.Activator</Bundle-Activator>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
+            <Bundle-SymbolicName>com.redhat.thermostat.client.classstat</Bundle-SymbolicName>
             <!-- Do not autogenerate uses clauses in Manifests -->
             <_nouses>true</_nouses>
           </instructions>
--- a/common/command/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/common/command/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -83,6 +83,7 @@
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <Bundle-Activator />
+            <Bundle-SymbolicName>com.redhat.thermostat.common.command</Bundle-SymbolicName>
             <Export-Package>
               com.redhat.thermostat.common.command,
               com.redhat.thermostat.common.command.cli
--- a/common/core/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/common/core/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -75,6 +75,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
+            <Bundle-SymbolicName>com.redhat.thermostat.common.core</Bundle-SymbolicName>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <Export-Package>
               com.redhat.thermostat.common.cli,
--- a/dolphin/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/dolphin/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -50,6 +50,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
+            <Bundle-SymbolicName>com.redhat.thermostat.laf.dolphin</Bundle-SymbolicName>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <Export-Package>
               com.redhat.swing.laf.dolphin,
--- a/keyring/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/keyring/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -20,6 +20,7 @@
         <configuration>
           <instructions>
             <Bundle-Activator>com.redhat.thermostat.utils.keyring.activator.Activator</Bundle-Activator>
+	        <Bundle-SymbolicName>com.redhat.thermostat.keyring</Bundle-SymbolicName>
 	        <Private-Package>com.redhat.thermostat.utils.keyring.activator</Private-Package>
             <Export-Package>com.redhat.thermostat.utils.keyring</Export-Package>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
--- a/launcher/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/launcher/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -61,6 +61,7 @@
         <configuration>
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
+            <Bundle-SymbolicName>com.redhat.thermostat.launcher</Bundle-SymbolicName>
             <Bundle-Activator>com.redhat.thermostat.launcher.internal.Activator</Bundle-Activator>
             <Export-Package>
               com.redhat.thermostat.launcher,
--- a/main/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/main/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -112,6 +112,7 @@
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <Bundle-Activator>com.redhat.thermostat.main.impl.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>com.redhat.thermostat.main</Bundle-SymbolicName>
             <Export-Package>
               com.redhat.thermostat.main,
             </Export-Package>
--- a/thread/client-common/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/thread/client-common/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -101,6 +101,7 @@
         <configuration>
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
+            <Bundle-SymbolicName>com.redhat.thermostat.thread.client.common</Bundle-SymbolicName>
             <Export-Package>
               com.redhat.thermostat.thread.client.common,
               com.redhat.thermostat.thread.client.common.locale,
--- a/thread/client-controllers/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/thread/client-controllers/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -108,6 +108,7 @@
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <Bundle-Activator>com.redhat.thermostat.thread.client.controller.osgi.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>com.redhat.thermostat.thread.client.controller</Bundle-SymbolicName>
             <Private-Package>
               com.redhat.thermostat.thread.client.controller.osgi,
               com.redhat.thermostat.thread.client.controller.impl,
--- a/thread/client-swing/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/thread/client-swing/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -95,6 +95,7 @@
         <configuration>
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
+            <Bundle-SymbolicName>com.redhat.thermostat.thread.client.swing</Bundle-SymbolicName>
             <Bundle-Activator>com.redhat.thermostat.thread.client.swing.osgi.Activator</Bundle-Activator>
             <Export-Package>
               com.redhat.thermostat.thread.client.swing,
--- a/thread/collector/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/thread/collector/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -96,6 +96,7 @@
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <Bundle-Activator>com.redhat.thermostat.thread.collector.osgi.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>com.redhat.thermostat.thread.collector</Bundle-SymbolicName>
             <Export-Package>
               com.redhat.thermostat.thread.collector,
               com.redhat.thermostat.thread.dao,
--- a/tools/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/tools/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -112,6 +112,7 @@
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
             <Bundle-Activator>com.redhat.thermostat.tools.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>com.redhat.thermostat.tools</Bundle-SymbolicName>
             <Export-Package>
               com.redhat.thermostat.tools,
               com.redhat.thermostat.tools.cli,
--- a/unix-process-handler/pom.xml	Tue Aug 21 09:45:24 2012 +0200
+++ b/unix-process-handler/pom.xml	Mon Aug 20 18:22:27 2012 +0200
@@ -23,6 +23,7 @@
             <Export-Package>com.redhat.thermostat.service.process</Export-Package>
             <Bundle-Activator>com.redhat.thermostat.service.activator.Activator</Bundle-Activator>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
+            <Bundle-SymbolicName>com.redhat.thermostat.process</Bundle-SymbolicName>
             <!-- Do not autogenerate uses clauses in Manifests -->
             <_nouses>true</_nouses>
           </instructions>