Author: jbonofre
Date: Tue May 17 12:26:11 2011
New Revision: 1104190

URL: http://svn.apache.org/viewvc?rev=1104190&view=rev
Log:
Postpone the ACE configurator changes.

Modified:
    incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java
    incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Configurator.java

Modified: incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java?rev=1104190&r1=1104189&r2=1104190&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java (original)
+++ incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java Tue May 17 12:26:11 2011
@@ -31,7 +31,7 @@ public class Activator extends Dependenc
     public void init(BundleContext context, DependencyManager manager) throws Exception {
         manager.add(createComponent()
             .setImplementation(new Configurator(new File(
-                getProperty(context.getProperty(Activator.class.getPackage().getName() + ".CONFIG_DIR"), "etc/ace")),
+                getProperty(context.getProperty(Activator.class.getPackage().getName() + ".CONFIG_DIR"), "conf")),
                 getProperty(context.getProperty(Activator.class.getPackage().getName() + ".POLL_INTERVAL"), 2000),
                 getProperty(context.getProperty(Activator.class.getPackage().getName() + ".RECONFIG"), true)))
             .add(createServiceDependency()

Modified: incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Configurator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Configurator.java?rev=1104190&r1=1104189&r2=1104190&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Configurator.java (original)
+++ incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Configurator.java Tue May 17 12:26:11 2011
@@ -79,10 +79,6 @@ public class Configurator implements Run
      * values will not be overwritten, only new values (for a given pid) will be added.
      */
     public Configurator(File dir, long pollInterval, boolean reconfig) {
-        // create the config directory if it doesn't exist
-        if ((dir != null) && (!dir.exists())) {
-            dir.mkdirs();
-        }
         if ((dir == null) || !dir.isDirectory() || (pollInterval < 0)) {
             throw new IllegalArgumentException("Bad arguments; either not an existing directory or an invalid interval.");
         }