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 2015/11/23 08:34:02 UTC
[1/2] karaf git commit: [KARAF-4119] la outputs results twice
Repository: karaf
Updated Branches:
refs/heads/master 5794f0b81 -> a9ce45412
[KARAF-4119] la outputs results twice
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5801917a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5801917a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5801917a
Branch: refs/heads/master
Commit: 5801917aaaed3452c2336687b4f0077cc662f5d7
Parents: cb0f2b4
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sun Nov 22 21:32:04 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sun Nov 22 23:08:36 2015 +0100
----------------------------------------------------------------------
.../apache/karaf/bundle/core/internal/BundleSelectorImpl.java | 4 +++-
.../org/apache/karaf/itests/JaasSshCommandSecurityTest.java | 7 ++++---
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/5801917a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleSelectorImpl.java
----------------------------------------------------------------------
diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleSelectorImpl.java b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleSelectorImpl.java
index 638739b..a352117 100644
--- a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleSelectorImpl.java
+++ b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleSelectorImpl.java
@@ -18,6 +18,7 @@ package org.apache.karaf.bundle.core.internal;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -46,7 +47,8 @@ public class BundleSelectorImpl {
} else if (defaultAllBundles) {
Collections.addAll(bundles, bundleContext.getBundles());
}
- return bundles;
+ List<Bundle> filteredBundleList = new ArrayList<>(new LinkedHashSet<>(bundles));
+ return filteredBundleList;
}
private void addMatchingBundles(String id, List<Bundle> bundles) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/5801917a/itests/src/test/java/org/apache/karaf/itests/JaasSshCommandSecurityTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/JaasSshCommandSecurityTest.java b/itests/src/test/java/org/apache/karaf/itests/JaasSshCommandSecurityTest.java
index 8bf4282..d4314a0 100644
--- a/itests/src/test/java/org/apache/karaf/itests/JaasSshCommandSecurityTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/JaasSshCommandSecurityTest.java
@@ -13,7 +13,8 @@
*/
package org.apache.karaf.itests;
-import junit.framework.Assert;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -34,7 +35,7 @@ public class JaasSshCommandSecurityTest extends SshCommandTestBase {
"jaas:update", Result.NOT_FOUND);
String r = assertCommand(vieweruser, "jaas:realm-manage --realm karaf;" +
"jaas:user-list", Result.OK);
- Assert.assertFalse("The viewer should not have the credentials to add the new user",
+ assertFalse("The viewer should not have the credentials to add the new user",
r.contains(userName));
assertCommand("karaf", "jaas:realm-manage --realm karaf;" +
@@ -42,7 +43,7 @@ public class JaasSshCommandSecurityTest extends SshCommandTestBase {
"jaas:update", Result.OK);
String r2 = assertCommand(vieweruser, "jaas:realm-manage --realm karaf;" +
"jaas:user-list", Result.OK);
- Assert.assertTrue("The admin user should have the rights to add the new user",
+ assertTrue("The admin user should have the rights to add the new user",
r2.contains(userName));
}
}
[2/2] karaf git commit: Merge branch 'KARAF-4119' of
https://github.com/oscerd/karaf
Posted by jb...@apache.org.
Merge branch 'KARAF-4119' of https://github.com/oscerd/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a9ce4541
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a9ce4541
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a9ce4541
Branch: refs/heads/master
Commit: a9ce454128f54ce44c725b6230259d943b9e952c
Parents: 5794f0b 5801917
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Nov 23 07:50:05 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Nov 23 07:50:05 2015 +0100
----------------------------------------------------------------------
.../apache/karaf/bundle/core/internal/BundleSelectorImpl.java | 4 +++-
.../org/apache/karaf/itests/JaasSshCommandSecurityTest.java | 7 ++++---
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------