You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/07/28 11:24:59 UTC
svn commit: r798464 - in /felix/trunk/karaf:
assembly/src/main/filtered-resources/etc/config.properties
main/src/main/java/org/apache/felix/karaf/main/Main.java
Author: gnodet
Date: Tue Jul 28 09:24:58 2009
New Revision: 798464
URL: http://svn.apache.org/viewvc?rev=798464&view=rev
Log:
Fix bundle start level so that it is independant of the framework
Modified:
felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
Modified: felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties?rev=798464&r1=798463&r2=798464&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/etc/config.properties Tue Jul 28 09:24:58 2009
@@ -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.
Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java?rev=798464&r1=798463&r2=798464&view=diff
==============================================================================
--- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java (original)
+++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java Tue Jul 28 09:24:58 2009
@@ -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