Repository: karaf-cellar Updated Branches: refs/heads/cellar-2.3.x 27189f397 -> 34699a85a
[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/34699a85 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/34699a85 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/34699a85 Branch: refs/heads/cellar-2.3.x Commit: 34699a85a5dd5448759d85f2720cdea3120105f3 Parents: 27189f3 Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue May 5 15:17:42 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue May 5 15:17:42 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/karaf/cellar/bundle/BundleSupport.java | 8 ++++---- .../org/apache/karaf/cellar/bundle/BundleSynchronizer.java | 2 +- .../bundle/shell/completers/AllBundlesVersionCompleter.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/34699a85/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 deb6806..91b8bd9 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/34699a85/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java ---------------------------------------------------------------------- diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java index 9f26d1a..9c18ab6 100644 --- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java +++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java @@ -148,7 +148,7 @@ public class BundleSynchronizer extends BundleSupport implements Synchronizer { for (Bundle bundle : bundles) { long bundleId = bundle.getBundleId(); String symbolicName = bundle.getSymbolicName(); - String version = bundle.getVersion().toString(); + String version = bundle.getHeaders().get("Bundle-Version").toString(); String bundleLocation = bundle.getLocation(); int status = bundle.getState(); String id = symbolicName + "/" + version; http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/34699a85/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 1e87980..f8a7f09 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); }
