date:20160801

karaf git commit: [KARAF-4642] featuresBoot order is not honored. Thank you James Carman for the patch.

2016-08-01 Thread jgoodyear

Repository: karaf
Updated Branches:
  refs/heads/master 90edb946a -> 78ec18859


[KARAF-4642] featuresBoot order is not honored. Thank you James Carman for the 
patch.


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/78ec1885
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/78ec1885
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/78ec1885

Branch: refs/heads/master
Commit: 78ec188594794ae549e36a1ef5bc3ffcd3fcb339
Parents: 90edb94
Author: jgoodyear 
Authored: Mon Aug 1 22:23:17 2016 -0230
Committer: jgoodyear 
Committed: Mon Aug 1 22:23:17 2016 -0230

--
 .../internal/service/BootFeaturesInstaller.java |  5 +-
 .../service/BootFeaturesInstallerTest.java  | 55 
 2 files changed, 37 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/78ec1885/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
--
diff --git 
a/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
 
b/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
index 2b3f81b..d0a703f 100644
--- 
a/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
+++ 
b/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -58,7 +59,7 @@ public class BootFeaturesInstaller {
  * The system separator character.
  */
 private static final char SYSTEM_SEPARATOR = File.separatorChar;
-
+
 public BootFeaturesInstaller(BundleContext bundleContext,
  FeaturesServiceImpl featuresService,
  String repositories,
@@ -138,7 +139,7 @@ public class BootFeaturesInstaller {
 }
 
 protected Set parseFeatureList(String group) {
-HashSet features = new HashSet<>();
+HashSet features = new LinkedHashSet<>();
 for (String feature : Arrays.asList(group.trim().split("\\s*,\\s*"))) {
 if (feature.length() > 0) {
 features.add(feature);

http://git-wip-us.apache.org/repos/asf/karaf/blob/78ec1885/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
--
diff --git 
a/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
 
b/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
index 1754e25..1c6b0d5 100644
--- 
a/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
+++ 
b/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
@@ -16,21 +16,28 @@
  */
 package org.apache.karaf.features.internal.service;
 
-import static java.util.Arrays.asList;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.junit.Assert.fail;
-
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
 
-import org.apache.karaf.features.Feature;
 import org.apache.karaf.features.FeaturesService.Option;
 import org.apache.karaf.features.TestBase;
-import org.easymock.EasyMock;
+import org.easymock.Capture;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static java.util.Arrays.asList;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.newCapture;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+
 public class BootFeaturesInstallerTest extends TestBase {
 
 @Test
@@ -44,51 +51,57 @@ public class BootFeaturesInstallerTest extends TestBase {
 
 @Test
 public void testDefaultBootFeatures() throws Exception  {
-FeaturesServiceImpl impl = 
EasyMock.createMock(FeaturesServiceImpl.class);
+FeaturesServiceImpl impl = createMock(FeaturesServiceImpl.class);
 
-impl.installFeatures(setOf("config", "standard", "region"), 
EnumSet.of(Option.NoFailOnFeatureNotFound));
-EasyMock.expectLastCall();
+