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/07 19:52:58 UTC
svn commit: r683664 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/component/file/
camel-core/src/test/java/org/apache/camel/component/file/
components/camel-hl7/src/main/java/org/apache/camel/dataformat/hl7/
Author: davsclaus
Date: Thu Aug 7 10:52:57 2008
New Revision: 683664
URL: http://svn.apache.org/viewvc?rev=683664&view=rev
Log:
CAMEL-788: FileConsumer recursive option is now default false. Polished javadoc on the hl7 stuff
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRenameRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java
activemq/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/dataformat/hl7/HL7DataFormat.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=683664&r1=683663&r2=683664&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 10:52:57 2008
@@ -49,7 +49,7 @@
private boolean unchangedSize;
private boolean generateEmptyExchangeWhenIdle;
- private boolean recursive = true;
+ private boolean recursive;
private String regexPattern = "";
private boolean exclusiveReadLock = true;
@@ -59,7 +59,8 @@
}
protected synchronized void poll() throws Exception {
- int rc = pollFileOrDirectory(endpoint.getFile(), isRecursive());
+ // should be true the first time as its the top directory
+ int rc = pollFileOrDirectory(endpoint.getFile(), true);
// if no files consumes and using generateEmptyExchangeWhenIdle option then process an empty exchange
if (rc == 0 && generateEmptyExchangeWhenIdle) {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java?rev=683664&r1=683663&r2=683664&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAsyncRouteTest.java Thu Aug 7 10:52:57 2008
@@ -32,7 +32,7 @@
*/
public class FileAsyncRouteTest extends ContextTestSupport {
protected Object expectedBody = "Hello there!";
- protected String uri = "file:target/test-async-inbox?delete=true&consumer.delay=10000";
+ protected String uri = "file:target/test-async-inbox?delete=true&consumer.delay=10000&consumer.recurive=true";
CountDownLatch receivedLatch = new CountDownLatch(1);
CountDownLatch processingLatch = new CountDownLatch(1);
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java?rev=683664&r1=683663&r2=683664&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java Thu Aug 7 10:52:57 2008
@@ -24,7 +24,7 @@
public class FileDeleteRouteTest extends FileRouteTest {
@Override
protected void setUp() throws Exception {
- uri = "file:target/test-delete-inbox?consumer.delay=1000&delete=true";
+ uri = "file:target/test-delete-inbox?consumer.delay=1000&delete=true&consumer.recursive=true";
deleteDirectory("target/test-delete-inbox");
super.setUp();
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpRouteTest.java?rev=683664&r1=683663&r2=683664&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpRouteTest.java Thu Aug 7 10:52:57 2008
@@ -22,7 +22,7 @@
public class FileNoOpRouteTest extends FileRouteTest {
@Override
protected void setUp() throws Exception {
- uri = "file:target/test-noop-inbox?noop=true";
+ uri = "file:target/test-noop-inbox?noop=true&consumer.recursive=true";
deleteDirectory("target/test-noop-inbox");
super.setUp();
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRenameRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRenameRouteTest.java?rev=683664&r1=683663&r2=683664&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRenameRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRenameRouteTest.java Thu Aug 7 10:52:57 2008
@@ -23,7 +23,7 @@
@Override
protected void setUp() throws Exception {
deleteDirectory("target/test-rename-inbox");
- uri = "file:target/test-rename-inbox?moveNamePrefix=foo/";
+ uri = "file:target/test-rename-inbox?moveNamePrefix=foo/?consumer.recursive=true";
super.setUp();
}
}
\ No newline at end of file
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java?rev=683664&r1=683663&r2=683664&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteGenerateEmptyExchangeWhenIdleTest.java Thu Aug 7 10:52:57 2008
@@ -26,7 +26,7 @@
*/
public class FileRouteGenerateEmptyExchangeWhenIdleTest extends ContextTestSupport {
protected Object expectedBody = "Hello there!";
- protected String uri = "file:target/test-inbox2?consumer.generateEmptyExchangeWhenIdle=true";
+ protected String uri = "file:target/test-inbox2?consumer.generateEmptyExchangeWhenIdle=true&consumer.recursive=true";
public void testFileRoute() throws Exception {
MockEndpoint result = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java?rev=683664&r1=683663&r2=683664&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java Thu Aug 7 10:52:57 2008
@@ -25,7 +25,7 @@
*/
public class FileRouteTest extends ContextTestSupport {
protected Object expectedBody = "Hello there!";
- protected String uri = "file:target/test-default-inbox";
+ protected String uri = "file:target/test-default-inbox?consumer.recursive=true";
public void testFileRoute() throws Exception {
MockEndpoint result = getMockEndpoint("mock:result");
Modified: activemq/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/dataformat/hl7/HL7DataFormat.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/dataformat/hl7/HL7DataFormat.java?rev=683664&r1=683663&r2=683664&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/dataformat/hl7/HL7DataFormat.java (original)
+++ activemq/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/dataformat/hl7/HL7DataFormat.java Thu Aug 7 10:52:57 2008
@@ -30,8 +30,8 @@
* <p/>
* This data format supports two operations:
* <ul>
- * <li>marshal = from Message to String (used when returning as response using the HL7 MLLP codec).</li>
- * <li>unmarshal = from String to Message (used when recieving streamed data from the HL7 MLLP codec)</li>
+ * <li>marshal = from Message to String (can be used when returning as response using the HL7 MLLP codec)</li>
+ * <li>unmarshal = from String to Message (can be used when receiving streamed data from the HL7 MLLP codec)</li>
* </ul>
* <p/>
* Uses the <a href="http://hl7api.sourceforge.net/index.html">HAPI (HL7 API)</a> for HL7 parsing.