svn commit: r751479 - in /camel/trunk/camel-core/src/main/java/org/apache/camel: component/file/FileConsumer.java component/file/GenericFileConfiguration.java component/file/strategy/FileProcessStrategyFactory.java util/FileUtil.java

[da...@apache.org]

Author: davsclaus
Date: Sun Mar  8 17:33:21 2009
New Revision: 751479

URL: http://svn.apache.org/viewvc?rev=751479&view=rev
Log:
CAMEL-1428: Polished code.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java?rev=751479&r1=751478&r2=751479&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java Sun Mar  8 17:33:21 2009
@@ -98,8 +98,9 @@
     public static GenericFile<File> asGenericFile(String endpointPath, File file) {
         GenericFile<File> answer = new GenericFile<File>();
         // use file specific binding
-        answer.setEndpointPath(endpointPath);
         answer.setBinding(new FileBinding());
+
+        answer.setEndpointPath(endpointPath);
         answer.setFile(file);
         answer.setFileName(file.getName());
         answer.setFileNameOnly(file.getName());

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java?rev=751479&r1=751478&r2=751479&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java Sun Mar  8 17:33:21 2009
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.component.file;
 
+import java.io.File;
 import java.net.URI;
+
 import org.apache.camel.util.FileUtil;
 
 public class GenericFileConfiguration {
@@ -46,6 +48,9 @@
         if (this.directory == null) {
             this.directory = "";
         }
+        
+        // strip tailing slash
+        this.directory = FileUtil.stripTrailingSeparator(this.directory);
     }
 
     public String toString() {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java?rev=751479&r1=751478&r2=751479&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java Sun Mar  8 17:33:21 2009
@@ -61,10 +61,10 @@
             }
             return strategy;
         } else {
-            // default strategy will move files in a .camel/ subfolder
+            // default strategy will move files in a .camel/ subfolder where the file was consumed
             GenericFileRenameProcessStrategy<File> strategy = new GenericFileRenameProcessStrategy<File>();
             strategy.setExclusiveReadLockStrategy(getExclusiveReadLockStrategy(params));
-            Expression exp = FileLanguage.file(".camel/${file:name}");
+            Expression exp = FileLanguage.file("${file:parent}/.camel/${file:onlyname}");
             strategy.setCommitRenamer(new GenericFileExpressionRenamer<File>(exp));
             return strategy;
         }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java?rev=751479&r1=751478&r2=751479&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java Sun Mar  8 17:33:21 2009
@@ -324,6 +324,19 @@
     }
 
     /**
+     * Strip any trailing separators
+     */
+    public static String stripTrailingSeparator(String name) {
+        if (name == null) {
+            return null;
+        }
+        if (name.endsWith("/") || name.endsWith(File.separator)) {
+            return name.substring(0, name.length() - 1);
+        }
+        return name;
+    }
+
+    /**
      * Strips any leading paths
      */
     public static String stripPath(String name) {