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

Merge branch 'master' of git.springsource.org:spring-integration/spring-integration

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-11-19 12:30:13 -05:00
parent ab034ee9bd 46b4d8a595
commit ebb9a0afb5
5 changed files with 3 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundSynchronizingMessageSourceFactoryBean.java
View File

@@ -132,7 +132,6 @@ class FtpInboundSynchronizingMessageSourceFactoryBean
synchronizer.setFilter(compositeFilter);
messageSource.setRemotePredicate(compositeFilter);
messageSource.setSynchronizer(synchronizer);
messageSource.setClientPool(queuedFtpClientPool);
messageSource.setLocalDirectory(this.localDirectoryResource);
messageSource.setBeanFactory(this.getBeanFactory());
messageSource.setAutoStartup(true);

11
spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizingMessageSource.java
View File

@@ -20,7 +20,6 @@ import org.apache.commons.net.ftp.FTPFile;
import org.springframework.integration.file.synchronizer.AbstractInboundFileSynchronizer;
import org.springframework.integration.file.synchronizer.AbstractInboundFileSynchronizingMessageSource;
import org.springframework.integration.ftp.client.FtpClientPool;
/**
* A {@link org.springframework.integration.core.MessageSource} implementation for FTP.
@@ -30,13 +29,6 @@ import org.springframework.integration.ftp.client.FtpClientPool;
*/
public class FtpInboundRemoteFileSystemSynchronizingMessageSource extends AbstractInboundFileSynchronizingMessageSource<FTPFile> {
private volatile FtpClientPool clientPool;
public void setClientPool(FtpClientPool clientPool) {
this.clientPool = clientPool;
}
public String getComponentType() {
return "ftp:inbound-channel-adapter";
}
@@ -49,9 +41,6 @@ public class FtpInboundRemoteFileSystemSynchronizingMessageSource extends Abstra
@Override
protected void onInit() {
super.onInit();
if (this.synchronizer instanceof FtpInboundRemoteFileSystemSynchronizer) {
((FtpInboundRemoteFileSystemSynchronizer) this.synchronizer).setClientPool(this.clientPool);
}
}
}

39
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundSynchronizer.java
View File

@@ -47,8 +47,6 @@ public class SftpInboundSynchronizer extends AbstractInboundFileSynchronizer<Cha
*/
private volatile String remotePath;
private volatile boolean autoCreateDirectories;
/**
* the pool of {@link org.springframework.integration.sftp.session.SftpSessionPool} SFTP sessions
*/
@@ -61,10 +59,6 @@ public class SftpInboundSynchronizer extends AbstractInboundFileSynchronizer<Cha
}
public void setAutoCreateDirectories(boolean autoCreateDirectories) {
this.autoCreateDirectories = autoCreateDirectories;
}
public void setRemotePath(String remotePath) {
this.remotePath = remotePath;
}
@@ -75,37 +69,6 @@ public class SftpInboundSynchronizer extends AbstractInboundFileSynchronizer<Cha
this.setEntryAcknowledgmentStrategy(new DeletionEntryAcknowledgmentStrategy());
}
}
/**
* This method will check to ensure that the remote directory exists. If the directory
* doesnt exist, and autoCreatePath is 'true,' then this method makes a few reasonably sane attempts
* to create it. Otherwise, it fails fast.
*
* @param remotePath the path on the remote SSH / SFTP server to create.
* @return whether or not the directory is there (regardless of whether we created it in this method or it already
* existed.)
*/
private boolean checkThatRemotePathExists(String remotePath, SftpSession session) {
try {
if (session.directoryExists(remotePath)) {
return true;
}
}
catch (Throwable th) {
if (this.autoCreateDirectories && (this.sessionFactory != null) && (session != null)) {
try {
return session.mkdir(remotePath);
}
catch (RuntimeException re) {
throw re;
}
catch (Exception e){
throw new MessagingException("Failed to auto-create remote directory", e);
}
}
}
return false;
}
@SuppressWarnings("unchecked")
public void synchronizeToLocalDirectory(Resource localDirectory) {
@@ -116,7 +79,7 @@ public class SftpInboundSynchronizer extends AbstractInboundFileSynchronizer<Cha
logger.trace("Pooled SftpSession " + session + " from the pool");
}
session.connect();
this.checkThatRemotePathExists(remotePath, session);
Assert.isTrue(session.directoryExists(remotePath), "remote path '" + remotePath + "' does not exist");
Collection<ChannelSftp.LsEntry> beforeFilter = session.ls(remotePath);
ChannelSftp.LsEntry[] entries = (beforeFilter == null) ? new ChannelSftp.LsEntry[0] :
beforeFilter.toArray(new ChannelSftp.LsEntry[beforeFilter.size()]);

3
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundSynchronizingMessageSource.java
View File

@@ -67,9 +67,6 @@ public class SftpInboundSynchronizingMessageSource extends AbstractInboundFileSy
if (this.filenamePattern != null) {
SftpPatternMatchingFileListFilter filter = new SftpPatternMatchingFileListFilter(this.filenamePattern);
this.synchronizer.setFilter(filter);
if (this.synchronizer instanceof SftpInboundSynchronizer) {
((SftpInboundSynchronizer) this.synchronizer).setAutoCreateDirectories(this.autoCreateDirectories);
}
}
}
catch (RuntimeException e) {

2
spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java
View File

@@ -27,6 +27,7 @@ import java.io.FileInputStream;
import java.io.InputStream;
import java.util.Vector;
import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
@@ -50,6 +51,7 @@ public class SftpInboundRemoteFileSystemSynchronizerTests {
@SuppressWarnings({ "rawtypes", "unchecked" })
@Test
@Ignore
public void testCopyFileToLocalDir() throws Exception {
File file = new File(System.getProperty("java.io.tmpdir") + "/foo.txt");
if (file.exists()){