Author: fmeschbe
Date: Wed Apr 1 07:11:25 2009
New Revision: 760795
URL: http://svn.apache.org/viewvc?rev=760795&view=rev
Log:
SLING-905 Migrate all (known) previous framework start level properties
and use the official one from the latest draft in the sling.properties file
Modified:
incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties
Modified:
incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java?rev=760795&r1=760794&r2=760795&view=diff
==============================================================================
---
incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
(original)
+++
incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
Wed Apr 1 07:11:25 2009
@@ -394,10 +394,18 @@
// migrate old properties to new properties
migrateProp(staticProps, "felix.cache.profiledir",
Constants.FRAMEWORK_STORAGE);
- migrateProp(staticProps, "felix.startlevel.framework",
Constants.FRAMEWORK_BEGINNING_STARTLEVEL);
migrateProp(staticProps, "sling.osgi-core-packages",
"osgi-core-packages");
migrateProp(staticProps, "sling.osgi-compendium-services",
"osgi-compendium-services");
+ // migrate initial start level property: Felix used to have
+ // felix.startlevel.framework, later moved to
org.osgi.framework.startlevel
+ // and finally now uses org.osgi.framework.startlevel.beginning as
+ // speced in the latest R 4.2 draft (2009/03/10). We first check the
+ // intermediate Felix property, then the initial property, thus
allowing
+ // the older (and more probable value) to win
+ migrateProp(staticProps, "org.osgi.framework.startlevel",
Constants.FRAMEWORK_BEGINNING_STARTLEVEL);
+ migrateProp(staticProps, "felix.startlevel.framework",
Constants.FRAMEWORK_BEGINNING_STARTLEVEL);
+
// create a copy of the properties to perform variable substitution
final Map<String, String> runtimeProps = new HashMap<String, String>();
runtimeProps.putAll(staticProps);
Modified:
incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties?rev=760795&r1=760794&r2=760795&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties
(original)
+++ incubator/sling/trunk/launchpad/base/src/main/resources/sling.properties
Wed Apr 1 07:11:25 2009
@@ -109,7 +109,7 @@
#
# Default initial Framework start level
-org.osgi.framework.startlevel=30
+org.osgi.framework.startlevel.beginning=30
#
