| commit | 46e283818535f52b393ff6d95e22073b2d309579 | [log] [tgz] |
|---|---|---|
| author | Guillaume Nodet <gnodet@apache.org> | Thu Oct 15 09:48:49 2009 +0000 |
| committer | Guillaume Nodet <gnodet@apache.org> | Thu Oct 15 09:48:49 2009 +0000 |
| tree | 49602dc6800b4e8803d404054a97122e1fcfb43e | |
| parent | e12a8cb1b175af778b9f5ec0bd5116e5e7819e68 [diff] |
FELIX-1626: fix some remaining bits git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@825451 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 2472ed4..5cc8009 100644 --- a/karaf/assembly/src/main/filtered-resources/etc/config.properties +++ b/karaf/assembly/src/main/filtered-resources/etc/config.properties
@@ -60,13 +60,6 @@ felix.fileinstall.noInitialDelay = true # -# Hack for FELIX-1628 -# As fileinstall does not load the properties into CM soon enough, -# the Main class does this job asap -# -karaf.cm.dir=${karaf.base}/etc - -# # Java platform package export 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 8f864bb..048d7b2 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
@@ -114,11 +114,6 @@ public static final String PROPERTY_CONVERT_TO_MAVEN_URL = "karaf.maven.convert"; /** - * ConfigAdmin properties directory - */ - public static final String PROPERTY_CM_DIRECTORY = "karaf.cm.dir"; - - /** * If a lock should be used before starting the runtime */ public static final String PROPERTY_USE_LOCK = "karaf.lock";