svn commit: r825451 - in /felix/trunk/karaf: assembly/src/main/filtered-resources/etc/config.properties main/src/main/java/org/apache/felix/karaf/main/Main.java

[gnodet]

Author: gnodet
Date: Thu Oct 15 09:48:49 2009
New Revision: 825451

URL: http://svn.apache.org/viewvc?rev=825451&view=rev
Log:
FELIX-1626: fix some remaining bits

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=825451&r1=825450&r2=825451&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 
Thu Oct 15 09:48:49 2009
@@ -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.
 #
 

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=825451&r1=825450&r2=825451&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 
Thu Oct 15 09:48:49 2009
@@ -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";