From 6b6782e16b9aebbfcd6edb62569df26d091f151b Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 22 Jun 2017 20:11:49 -0400 Subject: [PATCH] (S)FTP Doc Polishing --- spring-integration-ftp/src/test/resources/log4j.properties | 2 ++ src/reference/asciidoc/ftp.adoc | 4 ++-- src/reference/asciidoc/sftp.adoc | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-integration-ftp/src/test/resources/log4j.properties b/spring-integration-ftp/src/test/resources/log4j.properties index 5405a7cfd3..133d68eed2 100644 --- a/spring-integration-ftp/src/test/resources/log4j.properties +++ b/spring-integration-ftp/src/test/resources/log4j.properties @@ -7,3 +7,5 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L - %m log4j.category.org.springframework=WARN log4j.category.org.springframework.integration=WARN log4j.category.org.springframework.integration.file=WARN + +log4j.category.org.apache=DEBUG diff --git a/src/reference/asciidoc/ftp.adoc b/src/reference/asciidoc/ftp.adoc index 37e7bf3456..74b94b6b4f 100644 --- a/src/reference/asciidoc/ftp.adoc +++ b/src/reference/asciidoc/ftp.adoc @@ -900,12 +900,12 @@ The expression used to determine the remote path should produce a result that en Starting with _version 5.0_, a recursive `MGET`, combined with the new `FileExistsMode.REPLACE_IF_MODIFIED` mode, can be used to periodically synchronize an entire remote directory tree locally. -[NOTE] .Notes for when using recursion (`-R`) +[IMPORTANT] ===== The pattern is ignored, and `*` is assumed. By default, the entire remote tree is retrieved. -However, files in the tree can be filtered, by providing a`FileListFilter`; directories in the tree can also be filtered this way. +However, files in the tree can be filtered, by providing a `FileListFilter`; directories in the tree can also be filtered this way. A `FileListFilter` can be provided by reference or by `filename-pattern` or `filename-regex` attributes. For example, `filename-regex="(subDir|.*1.txt)"` will retrieve all files ending with `1.txt` in the remote directory and the subdirectory `subDir`. However, see below for an alternative available in _version 5.0_. diff --git a/src/reference/asciidoc/sftp.adoc b/src/reference/asciidoc/sftp.adoc index 1bc9a23ff5..a4841ab342 100644 --- a/src/reference/asciidoc/sftp.adoc +++ b/src/reference/asciidoc/sftp.adoc @@ -922,13 +922,13 @@ The expression used to determine the remote path should produce a result that en Starting with _version 5.0_, a recursive `MGET`, combined with the new `FileExistsMode.REPLACE_IF_MODIFIED` mode, can be used to periodically synchronize an entire remote directory tree locally. -[NOTE] .Notes for when using recursion (`-R`) +[IMPORTANT] ===== The pattern is ignored, and `*` is assumed. By default, the entire remote tree is retrieved. -However, files in the tree can be filtered, by providing a`FileListFilter`; directories in the tree can also be filtered this way. +However, files in the tree can be filtered, by providing a `FileListFilter`; directories in the tree can also be filtered this way. A `FileListFilter` can be provided by reference or by `filename-pattern` or `filename-regex` attributes. For example, `filename-regex="(subDir|.*1.txt)"` will retrieve all files ending with `1.txt` in the remote directory and the subdirectory `subDir`. However, see below for an alternative available in _version 5.0_.