Repository: karaf Updated Branches: refs/heads/karaf-3.0.x cc1524739 -> e5accff46
[KARAF-3138] Improve the start level management during features installation Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e5accff4 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e5accff4 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e5accff4 Branch: refs/heads/karaf-3.0.x Commit: e5accff46cb9fbd490d8d3905b4a070bb97fb447 Parents: cc15247 Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue Aug 5 11:19:48 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue Aug 5 11:19:48 2014 +0200 ---------------------------------------------------------------------- assemblies/features/standard/src/main/feature/feature.xml | 1 - .../apache/karaf/features/internal/FeaturesServiceImpl.java | 3 ++- main/src/main/java/org/apache/karaf/main/Main.java | 8 ++------ 3 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/e5accff4/assemblies/features/standard/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index 6fbc426..afb8976 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -191,7 +191,6 @@ </feature> <feature name="scr" description="Declarative Service support" version="${project.version}" resolver="(obr)"> - <feature>eventadmin</feature> <bundle dependency="true" start-level="30">mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle> <bundle dependency="true" start-level="30">mvn:org.apache.felix/org.apache.felix.scr/${felix.scr.version}</bundle> <bundle start-level="30">mvn:org.apache.karaf.scr/org.apache.karaf.scr.command/${project.version}</bundle> http://git-wip-us.apache.org/repos/asf/karaf/blob/e5accff4/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java b/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java index 9c065e2..70261ba 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java @@ -425,7 +425,8 @@ public class FeaturesServiceImpl implements FeaturesService { Collections.sort(bundlesSortedByStartLvl, new Comparator<Bundle>() { @Override public int compare(Bundle bundle, Bundle bundle1) { - return state.bundleStartLevels.get(bundle) - state.bundleStartLevels.get(bundle1); + return bundle.adapt(BundleStartLevel.class).getStartLevel() + - bundle1.adapt(BundleStartLevel.class).getStartLevel(); } }); } http://git-wip-us.apache.org/repos/asf/karaf/blob/e5accff4/main/src/main/java/org/apache/karaf/main/Main.java ---------------------------------------------------------------------- diff --git a/main/src/main/java/org/apache/karaf/main/Main.java b/main/src/main/java/org/apache/karaf/main/Main.java index c1e36a8..51f6065 100644 --- a/main/src/main/java/org/apache/karaf/main/Main.java +++ b/main/src/main/java/org/apache/karaf/main/Main.java @@ -44,12 +44,8 @@ import org.apache.karaf.main.util.BootstrapLogManager; import org.apache.karaf.main.util.SimpleMavenResolver; import org.apache.karaf.main.util.StringMap; import org.apache.karaf.main.util.Utils; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; -import org.osgi.framework.Constants; -import org.osgi.framework.FrameworkEvent; -import org.osgi.framework.FrameworkListener; + +import org.osgi.framework.*; import org.osgi.framework.launch.Framework; import org.osgi.framework.launch.FrameworkFactory; import org.osgi.framework.startlevel.BundleStartLevel;
