You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2007/12/18 09:17:33 UTC
svn commit: r605128 - 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: gnodet
Date: Tue Dec 18 00:17:32 2007
New Revision: 605128
URL: http://svn.apache.org/viewvc?rev=605128&view=rev
Log:
Fix broken file strategies :-( Thx Aaron Crickenberger
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProcessStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/DeleteFileProcessStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategySupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/RenameFileProcessStrategy.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteTest.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProcessStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProcessStrategy.java?rev=605128&r1=605127&r2=605128&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProcessStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProcessStrategy.java Tue Dec 18 00:17:32 2007
@@ -32,10 +32,10 @@
*
* @return true if the file can be processed (such as if a file lock could be obtained)
*/
- boolean begin(Endpoint endpoint, FileExchange exchange, File file) throws Exception;
+ boolean begin(FileEndpoint endpoint, FileExchange exchange, File file) throws Exception;
/**
* Releases any file locks and possibly deletes or moves the file
*/
- void commit(Endpoint endpoint, FileExchange exchange, File file) throws Exception;
+ void commit(FileEndpoint endpoint, FileExchange exchange, File file) throws Exception;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/DeleteFileProcessStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/DeleteFileProcessStrategy.java?rev=605128&r1=605127&r2=605128&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/DeleteFileProcessStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/DeleteFileProcessStrategy.java Tue Dec 18 00:17:32 2007
@@ -38,6 +38,7 @@
super(lockFile);
}
+ @Override
public void commit(FileEndpoint endpoint, FileExchange exchange, File file) throws Exception {
if (LOG.isDebugEnabled()) {
LOG.debug("Deleting file: " + file);
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=605128&r1=605127&r2=605128&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 Tue Dec 18 00:17:32 2007
@@ -23,6 +23,7 @@
import java.nio.channels.FileLock;
import org.apache.camel.Endpoint;
+import org.apache.camel.component.file.FileEndpoint;
import org.apache.camel.component.file.FileExchange;
import org.apache.camel.component.file.FileProcessStrategy;
import org.apache.camel.util.ExchangeHelper;
@@ -52,7 +53,7 @@
this.lockFileRenamer = lockFileRenamer;
}
- public boolean begin(Endpoint endpoint, FileExchange exchange, File file) throws Exception {
+ public boolean begin(FileEndpoint endpoint, FileExchange exchange, File file) throws Exception {
if (isLockFile()) {
File newFile = lockFileRenamer.renameFile(file);
String lockFileName = newFile.getAbsolutePath();
@@ -73,7 +74,7 @@
return true;
}
- public void commit(Endpoint endpoint, FileExchange exchange, File file) throws Exception {
+ public void commit(FileEndpoint endpoint, FileExchange exchange, File file) throws Exception {
if (isLockFile()) {
Channel channel = ExchangeHelper.getMandatoryProperty(exchange, "org.apache.camel.fileChannel", Channel.class);
String lockfile = ExchangeHelper.getMandatoryProperty(exchange, "org.apache.camel.file.lock.name", String.class);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/RenameFileProcessStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/RenameFileProcessStrategy.java?rev=605128&r1=605127&r2=605128&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/RenameFileProcessStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/RenameFileProcessStrategy.java Tue Dec 18 00:17:32 2007
@@ -50,6 +50,7 @@
this.renamer = renamer;
}
+ @Override
public void commit(FileEndpoint endpoint, FileExchange exchange, File file) throws Exception {
File newName = renamer.renameFile(file);
newName.getParentFile().mkdirs();
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=605128&r1=605127&r2=605128&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 Tue Dec 18 00:17:32 2007
@@ -16,14 +16,30 @@
*/
package org.apache.camel.component.file;
+import org.apache.camel.component.mock.MockEndpoint;
+
/**
* @version $Revision: 1.1 $
*/
public class FileDeleteRouteTest extends FileRouteTest {
@Override
protected void setUp() throws Exception {
- uri = "file:target/test-delete-inbox?delete=true";
+ uri = "file:target/test-delete-inbox?consumer.delay=1000&delete=true";
deleteDirectory("target/test-delete-inbox");
super.setUp();
}
+
+ @Override
+ public void testFileRoute() throws Exception {
+ MockEndpoint result = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
+ result.expectedBodiesReceived(expectedBody);
+ result.setDefaulResultWaitMillis(5000);
+
+ template.sendBodyAndHeader(uri, expectedBody, "cheese", 123);
+
+ Thread.sleep(4000);
+
+ result.assertIsSatisfied();
+ }
+
}