You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2008/12/17 20:46:10 UTC
svn commit: r727491 - in
/felix/trunk/framework/src/main/java/org/apache/felix/framework: Felix.java
util/FelixConstants.java
Author: rickhall
Date: Wed Dec 17 11:46:09 2008
New Revision: 727491
URL: http://svn.apache.org/viewvc?rev=727491&view=rev
Log:
Removed unnecessary constant.
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/FelixConstants.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=727491&r1=727490&r2=727491&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Wed Dec 17 11:46:09 2008
@@ -894,7 +894,7 @@
{
// Get the framework's default start level.
int startLevel = FelixConstants.FRAMEWORK_DEFAULT_STARTLEVEL;
- String s = (String) m_configMap.get(FelixConstants.FRAMEWORK_STARTLEVEL_PROP);
+ String s = (String) m_configMap.get(Constants.FRAMEWORK_BEGINNING_STARTLEVEL);
if (s != null)
{
try
@@ -4522,4 +4522,4 @@
m_bundleLock.notifyAll();
}
}
-}
\ No newline at end of file
+}
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/FelixConstants.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/FelixConstants.java?rev=727491&r1=727490&r2=727491&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/FelixConstants.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/FelixConstants.java Wed Dec 17 11:46:09 2008
@@ -46,8 +46,6 @@
public static final String LOG_LOGGER_PROP = "felix.log.logger";
public static final String SYSTEMBUNDLE_ACTIVATORS_PROP
= "felix.systembundle.activators";
- public static final String FRAMEWORK_STARTLEVEL_PROP
- = "org.osgi.framework.startlevel";
public static final String BUNDLE_STARTLEVEL_PROP
= "felix.startlevel.bundle";
public static final String SERVICE_URLHANDLERS_PROP = "felix.service.urlhandlers";
@@ -66,4 +64,4 @@
// Miscellaneous properties values.
public static final String FAKE_URL_PROTOCOL_VALUE = "location:";
public static final String FELIX_EXTENSION_ACTIVATOR = "Felix-Activator";
-}
\ No newline at end of file
+}