svn commit: r699233 - /servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java

[gn...@apache.org]

Author: gnodet
Date: Fri Sep 26 02:03:01 2008
New Revision: 699233

URL: http://svn.apache.org/viewvc?rev=699233&view=rev
Log:
SMX4KNL-102: The file monitor should use ${servicemix.base} for default polling locations

Modified:
    servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java

Modified: servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java?rev=699233&r1=699232&r2=699233&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java (original)
+++ servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java Fri Sep 26 02:03:01 2008
@@ -78,9 +78,9 @@
     private static final Log LOGGER = LogFactory.getLog(FileMonitor.class);
 
     private FileMonitorActivator activator;
-    private File configDir = new File("./etc");
-    private File deployDir = new File("./deploy");
-    private File generateDir = new File("./data/generated-bundles");
+    private File configDir;
+    private File deployDir;
+    private File generateDir;
     private Scanner scanner = new Scanner();
     private Project project = new Project();
     private long scanInterval = 500L;
@@ -95,10 +95,16 @@
     private Executor executor;
 
     public FileMonitor() {
+        String base = System.getProperty("servicemix.base", ".");
+        configDir = new File(base, "etc");
+        deployDir = new File(base, "deploy");
+        generateDir = new File(base, "data/generated-bundles");
     }
 
     @SuppressWarnings("unchecked")
     public FileMonitor(FileMonitorActivator activator, Dictionary properties) {
+        this();
+        
         this.activator = activator;
 
         File value = getFileValue(properties, CONFIG_DIR);