You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/06/20 19:19:04 UTC
[1/3] karaf-cellar git commit: KARAF-4538 - fixed pattern matching
for the bundle symbolic name of bundles, matching the nameId
Repository: karaf-cellar
Updated Branches:
refs/heads/master b68bf96aa -> e6ee25907
KARAF-4538 - fixed pattern matching for the bundle symbolic name of bundles, matching the nameId
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/1a7fd2c0
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/1a7fd2c0
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/1a7fd2c0
Branch: refs/heads/master
Commit: 1a7fd2c0caab215060e496d8df0ae27c06661bb9
Parents: b0d954e
Author: Sergiy Shyrkov <ss...@jahia.com>
Authored: Wed May 25 11:58:44 2016 +0200
Committer: Sergiy Shyrkov <ss...@jahia.com>
Committed: Wed May 25 11:58:44 2016 +0200
----------------------------------------------------------------------
.../cellar/bundle/management/internal/CellarBundleMBeanImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/1a7fd2c0/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 f4ccc63..ec87ed9 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
@@ -516,14 +516,14 @@ public class CellarBundleMBeanImpl extends StandardMBean implements CellarBundle
bundles.add(bundle);
} else {
// no match on bundle name, fall back to symbolic name and check if it matches the regex
- matcher = namePattern.matcher(name);
+ matcher = namePattern.matcher(bundleSplit[0]);
if (matcher.find()) {
bundles.add(bundle);
}
}
} else {
// no bundle name, fall back to symbolic name and check if it matches the regex
- matcher = namePattern.matcher(name);
+ matcher = namePattern.matcher(bundleSplit[0]);
if (matcher.find()) {
bundles.add(bundle);
}
[3/3] karaf-cellar git commit: Merge branch 'master' of
https://github.com/shyrkov/karaf-cellar
Posted by jb...@apache.org.
Merge branch 'master' of https://github.com/shyrkov/karaf-cellar
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/e6ee2590
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/e6ee2590
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/e6ee2590
Branch: refs/heads/master
Commit: e6ee25907222e4acd928286ac3586f862c075a58
Parents: b68bf96 56330d9
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Mon Jun 20 21:15:58 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Jun 20 21:15:58 2016 +0200
----------------------------------------------------------------------
.../cellar/bundle/management/internal/CellarBundleMBeanImpl.java | 4 ++--
.../apache/karaf/cellar/bundle/shell/BundleCommandSupport.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/3] karaf-cellar git commit: KARAF-4538 - fixed pattern matching
for the bundle symbolic name of bundles,
matching the nameId (now also in BundleCommandSupport)
Posted by jb...@apache.org.
KARAF-4538 - fixed pattern matching for the bundle symbolic name of bundles, matching the nameId (now also in BundleCommandSupport)
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/56330d99
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/56330d99
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/56330d99
Branch: refs/heads/master
Commit: 56330d990cd61c4f9a0f8124b1a9c671e1295bea
Parents: 1a7fd2c
Author: Sergiy Shyrkov <ss...@jahia.com>
Authored: Wed May 25 17:27:09 2016 +0200
Committer: Sergiy Shyrkov <ss...@jahia.com>
Committed: Wed May 25 17:27:09 2016 +0200
----------------------------------------------------------------------
.../apache/karaf/cellar/bundle/shell/BundleCommandSupport.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/56330d99/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 06182ac..caf6e65 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
@@ -122,14 +122,14 @@ public abstract class BundleCommandSupport extends CellarCommandSupport {
bundles.add(bundle);
} else {
// no match on bundle name, fall back to symbolic name and check if it matches the regex
- matcher = namePattern.matcher(name);
+ matcher = namePattern.matcher(bundleSplit[0]);
if (matcher.find()) {
bundles.add(bundle);
}
}
} else {
// no bundle name, fall back to symbolic name and check if it matches the regex
- matcher = namePattern.matcher(name);
+ matcher = namePattern.matcher(bundleSplit[0]);
if (matcher.find()) {
bundles.add(bundle);
}