Author: davsclaus
Date: Tue Sep 16 09:28:28 2008
New Revision: 695967
URL: http://svn.apache.org/viewvc?rev=695967&view=rev
Log:
CAMEL-909: added option consumer.timestamp to have same option as camel-ftp.
Marked code for @deprecation. Removed unused import.
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/processor/Logger.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=695967&r1=695966&r2=695967&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
Tue Sep 16 09:28:28 2008
@@ -44,15 +44,16 @@
private ConcurrentHashMap<File, Long> fileSizes = new
ConcurrentHashMap<File, Long>();
private ConcurrentHashMap<File, Long> noopMap = new
ConcurrentHashMap<File, Long>();
+ // the options below is @deprecated and will be removed in Camel 2.0
private long lastPollTime;
private int unchangedDelay;
private boolean unchangedSize;
-
private boolean generateEmptyExchangeWhenIdle;
+ private boolean alwaysConsume;
+
private boolean recursive;
private String regexPattern = "";
private boolean exclusiveReadLock = true;
- private boolean alwaysConsume;
public FileConsumer(final FileEndpoint endpoint, Processor processor) {
super(endpoint, processor);
@@ -270,6 +271,10 @@
// Allow recursive polling to descend into this directory
return true;
} else {
+ // @deprecated will be removed on Camel 2.0
+ // the code below is kinda hard to maintain. We should strive to
remove
+ // this stuff in Camel 2.0 to keep this component simple and no
surprises for end-users
+ // this stuff is not persistent so restarting Camel will reset the
state
boolean lastModifiedCheck = false;
long modifiedDuration = 0;
if (getUnchangedDelay() > 0) {
@@ -383,6 +388,9 @@
return generateEmptyExchangeWhenIdle;
}
+ /**
+ * @deprecated will be removed in Camel 2.0
+ */
public void setGenerateEmptyExchangeWhenIdle(boolean
generateEmptyExchangeWhenIdle) {
this.generateEmptyExchangeWhenIdle = generateEmptyExchangeWhenIdle;
}
@@ -421,7 +429,21 @@
return alwaysConsume;
}
+ /**
+ * @deprecated will be removed in Camel 2.0 (not needed when we get rid of
last polltimestamp)
+ */
public void setAlwaysConsume(boolean alwaysConsume) {
this.alwaysConsume = alwaysConsume;
}
+
+ public boolean isTimestamp() {
+ return !alwaysConsume;
+ }
+
+ /**
+ * @deprecated will be removed in Camel 2.0 (not needed when we get rid of
last polltimestamp)
+ */
+ public void setTimestamp(boolean timestamp) {
+ this.alwaysConsume = !timestamp;
+ }
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java?rev=695967&r1=695966&r2=695967&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java
Tue Sep 16 09:28:28 2008
@@ -20,7 +20,6 @@
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultExchangeFormatter;
import org.apache.camel.processor.interceptor.ExchangeFormatter;
-import org.apache.camel.processor.interceptor.TraceInterceptor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
