Author: davsclaus
Date: Fri Sep 23 07:45:42 2011
New Revision: 1174571
URL: http://svn.apache.org/viewvc?rev=1174571&view=rev
Log:
Merged revisions 1174565 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAutoCreateDirectoryTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 07:45:42 2011
@@ -1 +1 @@
-/camel/trunk:1173732,1173958,1174047,1174129,1174245
+/camel/trunk:1173732,1173958,1174047,1174129,1174245,1174565
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java?rev=1174571&r1=1174570&r2=1174571&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
Fri Sep 23 07:45:42 2011
@@ -51,14 +51,8 @@ public class FileEndpoint extends Generi
ObjectHelper.notNull(operations, "operations");
ObjectHelper.notNull(file, "file");
- // we assume its a file if the name has a dot in it (eg foo.txt)
- boolean isDirectory = file.isDirectory();
- if (!isDirectory && file.getName().contains(".")) {
- throw new IllegalArgumentException("Only directory is supported.
Endpoint must be configured with a valid starting directory: " + file);
- }
-
// auto create starting directory if needed
- if (!file.exists() && !isDirectory) {
+ if (!file.exists() && !file.isDirectory()) {
if (isAutoCreate()) {
log.debug("Creating non existing starting directory: {}",
file);
boolean absolute = FileUtil.isAbsolute(file);
Modified:
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAutoCreateDirectoryTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAutoCreateDirectoryTest.java?rev=1174571&r1=1174570&r2=1174571&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAutoCreateDirectoryTest.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAutoCreateDirectoryTest.java
Fri Sep 23 07:45:42 2011
@@ -88,6 +88,25 @@ public class FileConsumerAutoCreateDirec
assertFalse("Directory should NOT be created", dir.exists());
}
+ public void testAutoCreateDirectoryWithDot() throws Exception {
+ deleteDirectory("target/file/foo.bar");
+
+ Endpoint endpoint =
context.getEndpoint("file://target/file/foo.bar?autoCreate=true");
+ Consumer consumer = endpoint.createConsumer(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ // noop
+ }
+ });
+
+ consumer.start();
+ consumer.stop();
+
+ // the directory should exist
+ File dir = new File("target/file/foo.bar").getAbsoluteFile();
+ assertTrue("Directory should be created", dir.exists());
+ assertTrue("Directory should be a directory", dir.isDirectory());
+ }
+
public void testStartingDirectoryMustExistDirectory() throws Exception {
deleteDirectory("target/file/foo");
