You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/08/08 07:10:24 UTC
svn commit: r683852 - in /activemq/camel/trunk/camel-core/src:
main/java/org/apache/camel/component/file/
main/java/org/apache/camel/component/file/strategy/
test/java/org/apache/camel/component/file/
Author: davsclaus
Date: Thu Aug 7 22:10:23 2008
New Revision: 683852
URL: http://svn.apache.org/viewvc?rev=683852&view=rev
Log:
Fixed file consumer skipping lock files. fixed spelling mistake in lockfilename.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategySupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java?rev=683852&r1=683851&r2=683852&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java Thu Aug 7 22:10:23 2008
@@ -300,6 +300,10 @@
if (name.startsWith(".")) {
return false;
}
+ // lock files should be skipped
+ if (name.endsWith(FileEndpoint.DEFAULT_LOCK_FILE_POSTFIX)) {
+ return false;
+ }
if (regexPattern != null && regexPattern.length() > 0) {
if (!name.matches(regexPattern)) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java?rev=683852&r1=683851&r2=683852&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java Thu Aug 7 22:10:23 2008
@@ -26,7 +26,6 @@
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.component.file.strategy.FileProcessStrategySupport;
import org.apache.camel.impl.ScheduledPollEndpoint;
import org.apache.camel.util.FactoryFinder;
import org.apache.camel.util.ObjectHelper;
@@ -42,8 +41,9 @@
*/
public class FileEndpoint extends ScheduledPollEndpoint<FileExchange> {
private static final transient Log LOG = LogFactory.getLog(FileEndpoint.class);
- private static final String DEFAULT_STRATEGYFACTORY_CLASS =
+ private static final transient String DEFAULT_STRATEGYFACTORY_CLASS =
"org.apache.camel.component.file.strategy.FileProcessStrategyFactory";
+ public static final transient String DEFAULT_LOCK_FILE_POSTFIX = ".camelLock";
private File file;
private FileProcessStrategy fileProcessStrategy;
@@ -231,7 +231,7 @@
}
/**
- * Sets the excluded file name postfixes, such as {@link FileProcessStrategySupport#DEFAULT_LOCK_FILE_POSTFIX}
+ * Sets the excluded file name postfixes, such as {@link FileEndpoint#DEFAULT_LOCK_FILE_POSTFIX}
* to ignore lock files by default.
*
* @deprecated use ExcludedNamePostfix. Will be removed in Camel 2.0.
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategySupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategySupport.java?rev=683852&r1=683851&r2=683852&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategySupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategySupport.java Thu Aug 7 22:10:23 2008
@@ -35,8 +35,6 @@
* @version $Revision$
*/
public abstract class FileProcessStrategySupport implements FileProcessStrategy {
- public static final String DEFAULT_LOCK_FILE_POSTFIX = ".cameLock";
-
private static final transient Log LOG = LogFactory.getLog(FileProcessStrategySupport.class);
private boolean lockFile;
private FileRenamer lockFileRenamer;
@@ -46,7 +44,7 @@
}
protected FileProcessStrategySupport(boolean lockFile) {
- this(lockFile, new DefaultFileRenamer(null, DEFAULT_LOCK_FILE_POSTFIX));
+ this(lockFile, new DefaultFileRenamer(null, FileEndpoint.DEFAULT_LOCK_FILE_POSTFIX));
}
protected FileProcessStrategySupport(boolean lockFile, FileRenamer lockFileRenamer) {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java?rev=683852&r1=683851&r2=683852&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java Thu Aug 7 22:10:23 2008
@@ -24,7 +24,6 @@
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.ValidationException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.strategy.FileProcessStrategySupport;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -92,7 +91,7 @@
assertEquals("File " + filename + " should be deleted", false, file.exists());
// and no lock files
- file = new File("target/messages/input/" + filename + FileProcessStrategySupport.DEFAULT_LOCK_FILE_POSTFIX);
+ file = new File("target/messages/input/" + filename + FileEndpoint.DEFAULT_LOCK_FILE_POSTFIX);
assertEquals("File " + filename + " lock should be deleted", false, file.exists());
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java?rev=683852&r1=683851&r2=683852&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java Thu Aug 7 22:10:23 2008
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.strategy.FileProcessStrategySupport;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -75,7 +74,7 @@
private static void checkLockFile(boolean expected) {
String filename = "target/reports/";
filename += expected ? "locked/" : "notlocked/";
- filename += "report.txt" + FileProcessStrategySupport.DEFAULT_LOCK_FILE_POSTFIX;
+ filename += "report.txt" + FileEndpoint.DEFAULT_LOCK_FILE_POSTFIX;
File file = new File(filename);
assertEquals("Lock file should " + (expected ? "exists" : "not exists"), expected, file.exists());