Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1562 restructured packages: inbound, outbound, session

Browse Source
This commit is contained in:
Mark Fisher
2010-11-10 16:24:41 -05:00
parent 1b5be152b2
commit e14bbbe21d
12 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpMessageSendingConsumerFactoryBean.java
View File

@@ -17,9 +17,9 @@
package org.springframework.integration.sftp.config;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.integration.sftp.QueuedSftpSessionPool;
import org.springframework.integration.sftp.SftpSendingMessageHandler;
import org.springframework.integration.sftp.SftpSessionFactory;
import org.springframework.integration.sftp.outbound.SftpSendingMessageHandler;
import org.springframework.integration.sftp.session.QueuedSftpSessionPool;
import org.springframework.integration.sftp.session.SftpSessionFactory;
/**
* Supports the construction of a MessagHandler that knows how to take inbound File objects

10
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java
View File

@@ -27,11 +27,11 @@ import org.springframework.core.io.ResourceEditor;
import org.springframework.core.io.ResourceLoader;
import org.springframework.integration.file.filters.CompositeFileListFilter;
import org.springframework.integration.file.filters.FileListFilter;
import org.springframework.integration.sftp.QueuedSftpSessionPool;
import org.springframework.integration.sftp.SftpPatternMatchingFileListFilter;
import org.springframework.integration.sftp.SftpSessionFactory;
import org.springframework.integration.sftp.impl.SftpInboundRemoteFileSystemSynchronizer;
import org.springframework.integration.sftp.impl.SftpInboundRemoteFileSystemSynchronizingMessageSource;
import org.springframework.integration.sftp.filters.SftpPatternMatchingFileListFilter;
import org.springframework.integration.sftp.inbound.SftpInboundRemoteFileSystemSynchronizer;
import org.springframework.integration.sftp.inbound.SftpInboundRemoteFileSystemSynchronizingMessageSource;
import org.springframework.integration.sftp.session.QueuedSftpSessionPool;
import org.springframework.integration.sftp.session.SftpSessionFactory;
import org.springframework.util.StringUtils;
import com.jcraft.jsch.ChannelSftp;

2
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpSessionUtils.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.sftp.config;
import org.springframework.integration.sftp.SftpSessionFactory;
import org.springframework.integration.sftp.session.SftpSessionFactory;
/**
* Utility methods for SFTP Session management.

2
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpPatternMatchingFileListFilter.java → spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/SftpPatternMatchingFileListFilter.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.sftp;
package org.springframework.integration.sftp.filters;
import java.util.regex.Pattern;

8
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizer.java → spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizer.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.sftp.impl;
package org.springframework.integration.sftp.inbound;
import com.jcraft.jsch.ChannelSftp;
import org.apache.commons.io.IOUtils;
@@ -23,8 +23,8 @@ import org.springframework.core.io.Resource;
import org.springframework.integration.MessagingException;
import org.springframework.integration.file.synchronization.AbstractInboundRemoteFileSystemSychronizer;
import org.springframework.integration.file.synchronization.AbstractInboundRemoteFileSystemSynchronizingMessageSource;
import org.springframework.integration.sftp.SftpSession;
import org.springframework.integration.sftp.SftpSessionPool;
import org.springframework.integration.sftp.session.SftpSession;
import org.springframework.integration.sftp.session.SftpSessionPool;
import org.springframework.scheduling.Trigger;
import org.springframework.scheduling.support.PeriodicTrigger;
import org.springframework.util.Assert;
@@ -48,7 +48,7 @@ public class SftpInboundRemoteFileSystemSynchronizer extends AbstractInboundRemo
private volatile String remotePath;
/**
* the pool of {@link org.springframework.integration.sftp.SftpSessionPool} SFTP sessions
* the pool of {@link org.springframework.integration.sftp.session.SftpSessionPool} SFTP sessions
*/
private volatile SftpSessionPool clientPool;

6
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizingMessageSource.java → spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizingMessageSource.java
View File

@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.sftp.impl;
package org.springframework.integration.sftp.inbound;
import com.jcraft.jsch.ChannelSftp;
import com.jcraft.jsch.SftpATTRS;
import org.springframework.integration.file.synchronization.AbstractInboundRemoteFileSystemSynchronizingMessageSource;
import org.springframework.integration.sftp.SftpSession;
import org.springframework.integration.sftp.SftpSessionPool;
import org.springframework.integration.sftp.session.SftpSession;
import org.springframework.integration.sftp.session.SftpSessionPool;
import org.springframework.util.Assert;

5
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSendingMessageHandler.java → spring-integration-sftp/src/main/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandler.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.sftp;
package org.springframework.integration.sftp.outbound;
import java.io.File;
import java.io.FileInputStream;
@@ -38,6 +38,9 @@ import org.springframework.integration.MessagingException;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.file.DefaultFileNameGenerator;
import org.springframework.integration.file.FileNameGenerator;
import org.springframework.integration.sftp.SftpHeaders;
import org.springframework.integration.sftp.session.SftpSession;
import org.springframework.integration.sftp.session.SftpSessionPool;
import org.springframework.util.Assert;
import org.springframework.util.FileCopyUtils;

2
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/QueuedSftpSessionPool.java → spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/QueuedSftpSessionPool.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.sftp;
package org.springframework.integration.sftp.session;
import java.util.Queue;
import java.util.concurrent.ArrayBlockingQueue;

2
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSession.java → spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSession.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.sftp;
package org.springframework.integration.sftp.session;
import com.jcraft.jsch.ChannelSftp;
import com.jcraft.jsch.JSch;

2
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSessionFactory.java → spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSessionFactory.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.sftp;
package org.springframework.integration.sftp.session;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;

2
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpSessionPool.java → spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSessionPool.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.sftp;
package org.springframework.integration.sftp.session;
/**
* Holds instances of {@link SftpSession} since they are stateful

3
spring-integration-sftp/src/test/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizerTests.java
View File

@@ -26,7 +26,8 @@ import org.junit.Test;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.integration.file.synchronization.AbstractInboundRemoteFileSystemSychronizer.EntryAcknowledgmentStrategy;
import org.springframework.integration.sftp.SftpSession;
import org.springframework.integration.sftp.inbound.SftpInboundRemoteFileSystemSynchronizer;
import org.springframework.integration.sftp.session.SftpSession;
import org.springframework.util.ReflectionUtils;
import com.jcraft.jsch.ChannelSftp;