svn commit: r761921 - in /synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs: VFSClient.java VFSFileChannel.java

[veithen]

Author: veithen
Date: Sat Apr  4 12:46:54 2009
New Revision: 761921

URL: http://svn.apache.org/viewvc?rev=761921&view=rev
Log:
Added some more logging to the VFS tests.

Modified:
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java?rev=761921&r1=761920&r2=761921&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java
 Sat Apr  4 12:46:54 2009
@@ -31,9 +31,13 @@
 import org.apache.axis2.transport.testkit.name.Name;
 import org.apache.axis2.transport.testkit.tests.Setup;
 import org.apache.axis2.transport.testkit.tests.Transient;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 @Name("java.io")
 public class VFSClient implements TestClient {
+    private static final Log log = LogFactory.getLog(VFSClient.class);
+    
     private @Transient File requestFile;
     
     @Setup @SuppressWarnings("unused")
@@ -49,11 +53,14 @@
         // Create the file atomically (using move/rename) to avoid problems 
with the
         // listener starting to read the file too early.
         File tmpFile = new File(requestFile.getParent(), "." + 
requestFile.getName() + ".tmp");
+        log.debug("Writing message to temporary file " + tmpFile);
         OutputStream out = new FileOutputStream(tmpFile);
         out.write(message);
         out.close();
+        log.debug("Moving " + tmpFile + " to " + requestFile);
         if (!tmpFile.renameTo(requestFile)) {
             throw new IOException("Unable to rename " + tmpFile + " to " + 
requestFile);
         }
+        log.debug("Done.");
     }
 }
\ No newline at end of file

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java?rev=761921&r1=761920&r2=761921&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
 Sat Apr  4 12:46:54 2009
@@ -26,8 +26,12 @@
 import org.apache.axis2.transport.testkit.axis2.AxisServiceConfigurator;
 import org.apache.axis2.transport.testkit.tests.Setup;
 import org.apache.axis2.transport.testkit.tests.Transient;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public class VFSFileChannel implements AxisServiceConfigurator {
+    private static final Log log = LogFactory.getLog(VFSFileChannel.class);
+    
     private final String path;
     private @Transient File requestFile;
     
@@ -51,8 +55,14 @@
     
     protected static File preparePath(VFSTestEnvironment env, String path) {
         File file = new File(env.getRootDir(), path);
-        file.getParentFile().mkdirs();
-        file.delete();
+        File dir = file.getParentFile();
+        if (dir.exists()) {
+            log.debug("Deleting leftover file " + file);
+            file.delete();
+        } else {
+            log.debug("Creating directory " + dir);
+            dir.mkdirs();
+        }
         return file;
     }