Author: cziegeler
Date: Mon Dec 17 02:32:36 2007
New Revision: 604817
URL: http://svn.apache.org/viewvc?rev=604817&view=rev
Log:
Temporary fix to get the module compilable again: copy the constant definition
from the felix main project.
Modified:
incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java
Modified:
incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java?rev=604817&r1=604816&r2=604817&view=diff
==============================================================================
---
incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java
(original)
+++
incubator/sling/trunk/launcher/app/src/main/java/org/apache/sling/launcher/app/Sling.java
Mon Dec 17 02:32:36 2007
@@ -39,7 +39,6 @@
import java.util.Map.Entry;
import org.apache.felix.framework.Felix;
-import org.apache.felix.framework.util.FelixConstants;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
@@ -182,6 +181,12 @@
public static final String CONFIG_PROPERTIES = "sling.properties";
/**
+ * The property name prefix for the launcher's auto-start property.
+ * FIXME - This is just a temporary solution to get this module compilable.
+ **/
+ public static final String AUTO_START_PROP = "felix.auto.start";
+
+ /**
* The simple logger to log messages during startup and shutdown to
*/
protected final Logger logger;
@@ -563,7 +568,7 @@
private void setAutoStartBundles(Map<String, String> props) {
- String propName = FelixConstants.AUTO_START_PROP + ".1";
+ String propName = AUTO_START_PROP + ".1";
StringBuffer buf = new StringBuffer();
// take over the current value
