svn commit: r828016 - in /felix/trunk/fileinstall/src: main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java

[gnodet]

Author: gnodet
Date: Wed Oct 21 13:57:42 2009
New Revision: 828016

URL: http://svn.apache.org/viewvc?rev=828016&view=rev
Log:
FELIX-1788: Set felix.fileinstall.tmpdir to ${java.io.tmpdir} by default

Modified:
    
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
    
felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java

Modified: 
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java?rev=828016&r1=828015&r2=828016&view=diff
==============================================================================
--- 
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
 (original)
+++ 
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
 Wed Oct 21 13:57:42 2009
@@ -120,7 +120,7 @@
         originatingFileName = (String) properties.get(FILENAME);
         watchedDirectory = getFile(properties, DIR, new File("./load"));
         prepareDir(watchedDirectory);
-        tmpDir = getFile(properties, TMPDIR, new File("./tmp"));
+        tmpDir = getFile(properties, TMPDIR, new 
File(System.getProperty("java.io.tmpdir"), "fileinstall"));
         startBundles = getBoolean(properties, START_NEW_BUNDLES, true);  // by 
default, we start bundles.
         filter = (String) properties.get(FILTER);
         noInitialDelay = getBoolean(properties, NO_INITIAL_DELAY, false);

Modified: 
felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java?rev=828016&r1=828015&r2=828016&view=diff
==============================================================================
--- 
felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java
 (original)
+++ 
felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java
 Wed Oct 21 13:57:42 2009
@@ -183,8 +183,8 @@
             "src" + File.separatorChar + "test" + File.separatorChar + 
"resources" ) );
         assertEquals( "Default POLL parameter correctly read", 2000l, dw.poll 
);
         assertEquals( "Default DEBUG parameter correctly read", -1l, dw.debug 
);
-        assertTrue( "Default TMPDIR parameter correctly read", 
dw.tmpDir.getAbsolutePath().endsWith(
-            File.separatorChar + "tmp" ) );
+        assertTrue( "Default TMPDIR parameter correctly read", 
dw.tmpDir.getAbsolutePath().equals(
+                new File(System.getProperty("java.io.tmpdir"), 
"fileinstall").getAbsolutePath()) );
         assertEquals( "Default START_NEW_BUNDLES parameter correctly read", 
true, dw.startBundles );
         assertEquals( "Default FILTER parameter correctly read", null, 
dw.filter );
     }