Repository: karaf-cellar Updated Branches: refs/heads/cellar-3.0.x d7b8c064e -> 6e67f1a31
[KARAF-3716] Fix bundles selector Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/6e67f1a3 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/6e67f1a3 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/6e67f1a3 Branch: refs/heads/cellar-3.0.x Commit: 6e67f1a31000e70df025e121dea20c7990f60e33 Parents: d7b8c06 Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue May 5 14:51:05 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue May 5 14:53:51 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/karaf/cellar/bundle/BundleSupport.java | 8 ++++---- .../bundle/management/internal/CellarBundleMBeanImpl.java | 4 ++-- .../karaf/cellar/bundle/shell/BundleCommandSupport.java | 2 +- .../bundle/shell/completers/AllBundlesVersionCompleter.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/6e67f1a3/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSupport.java ---------------------------------------------------------------------- diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSupport.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSupport.java index 5e08447..da649cc 100644 --- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSupport.java +++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSupport.java @@ -53,7 +53,7 @@ public class BundleSupport extends CellarSupport { Bundle[] bundles = getBundleContext().getBundles(); if (bundles != null) { for (Bundle bundle : bundles) { - if (bundle.getSymbolicName().equals(symbolicName) && bundle.getVersion().toString().equals(version)) { + if (bundle.getSymbolicName().equals(symbolicName) && bundle.getHeaders().get("Bundle-Version").toString().equals(version)) { bundle.uninstall(); } } @@ -71,7 +71,7 @@ public class BundleSupport extends CellarSupport { Bundle[] bundles = getBundleContext().getBundles(); if (bundles != null) { for (Bundle bundle : bundles) { - if (bundle.getSymbolicName().equals(symbolicName) && bundle.getVersion().toString().equals(version)) { + if (bundle.getSymbolicName().equals(symbolicName) && bundle.getHeaders().get("Bundle-Version").toString().equals(version)) { bundle.start(); } } @@ -89,7 +89,7 @@ public class BundleSupport extends CellarSupport { Bundle[] bundles = getBundleContext().getBundles(); if (bundles != null) { for (Bundle bundle : bundles) { - if (bundle.getSymbolicName().equals(symbolicName) && bundle.getVersion().toString().equals(version)) { + if (bundle.getSymbolicName().equals(symbolicName) && bundle.getHeaders().get("Bundle-Version").toString().equals(version)) { bundle.stop(); } } @@ -107,7 +107,7 @@ public class BundleSupport extends CellarSupport { Bundle[] bundles = getBundleContext().getBundles(); if (bundles != null) { for (Bundle bundle : bundles) { - if (bundle.getSymbolicName().equals(symbolicName) && bundle.getVersion().toString().equals(version)) { + if (bundle.getSymbolicName().equals(symbolicName) && bundle.getHeaders().get("Bundle-Version").toString().equals(version)) { bundle.update(); } } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/6e67f1a3/bundle/src/main/java/org/apache/karaf/cellar/bundle/management/internal/CellarBundleMBeanImpl.java ---------------------------------------------------------------------- diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/management/internal/CellarBundleMBeanImpl.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/management/internal/CellarBundleMBeanImpl.java index 225b99e..3c2d9fe 100644 --- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/management/internal/CellarBundleMBeanImpl.java +++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/management/internal/CellarBundleMBeanImpl.java @@ -588,7 +588,7 @@ public class CellarBundleMBeanImpl extends StandardMBean implements CellarBundle // retrieve local bundles for (Bundle bundle : bundleContext.getBundles()) { - String key = bundle.getSymbolicName() + "/" + bundle.getVersion().toString(); + String key = bundle.getSymbolicName() + "/" + bundle.getHeaders().get("Bundle-Version").toString(); if (bundles.containsKey(key)) { ExtendedBundleState extendedState = bundles.get(key); extendedState.setLocal(true); @@ -603,7 +603,7 @@ public class CellarBundleMBeanImpl extends StandardMBean implements CellarBundle name = (name == null) ? bundle.getLocation() : name; extendedState.setId(bundle.getBundleId()); extendedState.setName(name); - extendedState.setVersion(bundle.getVersion().toString()); + extendedState.setVersion(bundle.getHeaders().get("Bundle-Version").toString()); extendedState.setSymbolicName(bundle.getSymbolicName()); extendedState.setLocation(bundle.getLocation()); int status = bundle.getState(); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/6e67f1a3/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BundleCommandSupport.java ---------------------------------------------------------------------- diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BundleCommandSupport.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BundleCommandSupport.java index ad3b0af..66a73e5 100644 --- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BundleCommandSupport.java +++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BundleCommandSupport.java @@ -195,7 +195,7 @@ public abstract class BundleCommandSupport extends CellarCommandSupport { name = (name == null) ? bundle.getLocation() : name; extendedState.setId(bundle.getBundleId()); extendedState.setName(name); - extendedState.setVersion(bundle.getVersion().toString()); + extendedState.setVersion(bundle.getHeaders().get("Bundle-Version").toString()); extendedState.setLocation(bundle.getLocation()); int status = bundle.getState(); if (status == Bundle.ACTIVE) http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/6e67f1a3/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/completers/AllBundlesVersionCompleter.java ---------------------------------------------------------------------- diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/completers/AllBundlesVersionCompleter.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/completers/AllBundlesVersionCompleter.java index 7ffba00..a547e5e 100644 --- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/completers/AllBundlesVersionCompleter.java +++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/completers/AllBundlesVersionCompleter.java @@ -30,7 +30,7 @@ public class AllBundlesVersionCompleter implements Completer { public int complete(String buffer, int cursor, List<String> candidates) { StringsCompleter delegate = new StringsCompleter(); for (Bundle bundle : bundleContext.getBundles()) { - delegate.getStrings().add(bundle.getVersion().toString()); + delegate.getStrings().add(bundle.getHeaders().get("Bundle-Version").toString()); } return delegate.complete(buffer, cursor, candidates); }
