svn commit: r824897 - /felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java

[gn...@apache.org]

Author: gnodet
Date: Tue Oct 13 19:58:09 2009
New Revision: 824897

URL: http://svn.apache.org/viewvc?rev=824897&view=rev
Log:
FELIX-1689: make sure boot features are installed in batch to avoid unnecessary refresh

Modified:
    felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java

Modified: felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java?rev=824897&r1=824896&r2=824897&view=diff
==============================================================================
--- felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java (original)
+++ felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java Tue Oct 13 19:58:09 2009
@@ -24,6 +24,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Dictionary;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -212,15 +213,25 @@
     }
 
     public void installFeature(String name, String version, EnumSet<Option> options) throws Exception {
-        InstallationState state = new InstallationState();
         Feature f = getFeature(name, version);
         if (f == null) {
             throw new Exception("No feature named '" + name
             		+ "' with version '" + version + "' available");
         }
+        installFeature(f, options);
+    }
+
+    public void installFeature(Feature f, EnumSet<Option> options) throws Exception {
+        installFeatures(Collections.singleton(f), options);
+    }
+
+    public void installFeatures(Set<Feature> features, EnumSet<Option> options) throws Exception {
+        InstallationState state = new InstallationState();
         try {
             // Install everything
-            doInstallFeature(state, f);
+            for (Feature f : features) {
+                doInstallFeature(state, f);
+            }
             // Find bundles to refresh
             boolean print = options.contains(Option.PrintBundlesToRefresh);
             boolean refresh = !options.contains(Option.NoAutoRefreshBundles);
@@ -286,7 +297,9 @@
             // rethrow exception
             throw e;
         }
-        callListeners(new FeatureEvent(f, FeatureEvent.EventType.FeatureInstalled, false));
+        for (Feature f : features) {
+            callListeners(new FeatureEvent(f, FeatureEvent.EventType.FeatureInstalled, false));
+        }
         for (Map.Entry<Feature, Set<Long>> e : state.features.entrySet()) {
             installed.put(e.getKey(), e.getValue());
         }
@@ -590,15 +603,26 @@
             new Thread() {
                 public void run() {
                     String[] list = boot.split(",");
+                    Set<Feature> features = new HashSet<Feature>();
                     for (String f : list) {
                         if (f.length() > 0) {
                             try {
-                                installFeature(f);
+                                Feature feature = getFeature(f, FeatureImpl.DEFAULT_VERSION);
+                                if (feature != null) {
+                                    features.add(feature);
+                                } else {
+                                    LOGGER.error("Error installing boot feature " + f + ": feature not found");
+                                }
                             } catch (Exception e) {
                                 LOGGER.error("Error installing boot feature " + f, e);
                             }
                         }
                     }
+                    try {
+                        installFeatures(features, EnumSet.of(Option.NoCleanIfFailure));
+                    } catch (Exception e) {
+                        LOGGER.error("Error installing boot features", e);
+                    }
                     bootFeaturesInstalled = true;
                     saveState();
                 }