Fix bundle start level so that it is independant of the framework
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@798464 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/src/main/filtered-resources/etc/config.properties b/karaf/assembly/src/main/filtered-resources/etc/config.properties
index 09cf1ab..59c1ade 100644
--- a/karaf/assembly/src/main/filtered-resources/etc/config.properties
+++ b/karaf/assembly/src/main/filtered-resources/etc/config.properties
@@ -35,16 +35,11 @@
org.osgi.framework.bootdelegation=sun.*,com.sun.management*
# To enable the use of the startup.properties file to control the start level:
-felix.auto.start=startup.properties
+karaf.auto.start=startup.properties
#felix.auto.start=all
org.osgi.framework.startlevel.beginning=100
-felix.startlevel.bundle=60
-#framework.service.urlhandlers=false
-
-# Only works on Felix 1.4+
-felix.fragment.validation=warning
-# felix.log.level=1
+karaf.startlevel.bundle=60
#
# Bundle config properties.
diff --git a/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java b/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
index 3c5e66e..07aa856 100644
--- a/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
+++ b/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
@@ -74,11 +74,11 @@
/**
* The property name prefix for the launcher's auto-install property.
*/
- public static final String PROPERTY_AUTO_INSTALL = "felix.auto.install";
+ public static final String PROPERTY_AUTO_INSTALL = "karaf.auto.install";
/**
* The property for auto-discovering the bundles
*/
- public static final String PROPERTY_AUTO_START = "felix.auto.start";
+ public static final String PROPERTY_AUTO_START = "karaf.auto.start";
/**
* The system property for specifying the Karaf home directory. The home directory
* hold the binary install of Karaf.
@@ -349,6 +349,17 @@
StartLevel sl = (StartLevel) context.getService(
context.getServiceReference(org.osgi.service.startlevel.StartLevel.class.getName()));
+ // Set the default bundle start level
+ int ibsl = 60;
+ try {
+ String str = configProps.getProperty("karaf.startlevel.bundle");
+ if (str != null) {
+ ibsl = Integer.parseInt(str);
+ }
+ } catch (Throwable t) {
+ }
+ sl.setInitialBundleStartLevel(ibsl);
+
// The auto-install property specifies a space-delimited list of
// bundle URLs to be automatically installed into each new profile;
// the start level to which the bundles are assigned is specified by