[jboss-svn-commits] JBL Code SVN: r8486 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/listeners/gateway qa/junit/src/org/jboss/soa/esb/listeners/gateway

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2006-12-21 06:08:12 -0500 (Thu, 21 Dec 2006)
New Revision: 8486

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListener.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/FtpGatewayListenerIntegrationTest.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/SftpGatewayListenerIntegrationTest.java
Log:
Make configuration consistent

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListener.java	2006-12-21 11:08:11 UTC (rev 8485)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListener.java	2006-12-21 11:08:12 UTC (rev 8486)
@@ -25,6 +25,7 @@
 import java.io.File;
 
 import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
 import org.jboss.soa.esb.util.FtpClientUtil;
 import org.jboss.soa.esb.util.RemoteFileSystem;
 import org.jboss.soa.esb.util.RemoteFileSystemFactory;
@@ -47,6 +48,8 @@
 		File temp = File.createTempFile("FTPdown", ".tmp");
 		temp.delete();
 		_config.setAttribute(RemoteFileSystem.PARMS_LOCAL_DIR, temp.getParent());
+		final String remoteDir = _config.getAttribute(ListenerTagNames.FILE_INPUT_DIR_TAG) ;
+		_config.setAttribute(RemoteFileSystem.PARMS_REMOTE_DIR, remoteDir);
 		RemoteFileSystem rfs = RemoteFileSystemFactory.getRemoteFileSystem(
 				_config, true);
 		rfs.quit();

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/FtpGatewayListenerIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/FtpGatewayListenerIntegrationTest.java	2006-12-21 11:08:11 UTC (rev 8485)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/FtpGatewayListenerIntegrationTest.java	2006-12-21 11:08:12 UTC (rev 8486)
@@ -151,7 +151,6 @@
 			child.setAttribute(RemoteFileSystem.PARMS_FTP_SERVER, mFtpHostname) ;
 			child.setAttribute(RemoteFileSystem.PARMS_USER, mFtpUser) ;
 			child.setAttribute(RemoteFileSystem.PARMS_PASSWD, mFtpPwd) ;
-			child.setAttribute(RemoteFileSystem.PARMS_REMOTE_DIR, mFtpDir) ;
 			child.setAttribute(ListenerTagNames.FILE_INPUT_DIR_TAG, mFtpDir) ;
 			return tree ;
 		}
@@ -208,6 +207,7 @@
 		stringToFile(_initialFile, text) ;
 		
 		final ConfigTree tree = getGatewayConfig().getAllChildren()[0] ;
+		tree.setAttribute(RemoteFileSystem.PARMS_REMOTE_DIR, mFtpDir) ;
 		final RemoteFileSystem fileSystem = RemoteFileSystemFactory.getRemoteFileSystem(tree, true) ;
 		final String remoteName = System.currentTimeMillis() + tree.getAttribute(ListenerTagNames.FILE_INPUT_SFX_TAG) ;
 		fileSystem.uploadFile(_initialFile, remoteName) ;

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/SftpGatewayListenerIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/SftpGatewayListenerIntegrationTest.java	2006-12-21 11:08:11 UTC (rev 8485)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/gateway/SftpGatewayListenerIntegrationTest.java	2006-12-21 11:08:12 UTC (rev 8486)
@@ -151,7 +151,6 @@
 			child.setAttribute(RemoteFileSystem.PARMS_FTP_SERVER, mFtpHostname) ;
 			child.setAttribute(RemoteFileSystem.PARMS_USER, mFtpUser) ;
 			child.setAttribute(RemoteFileSystem.PARMS_PASSWD, mFtpPwd) ;
-			child.setAttribute(RemoteFileSystem.PARMS_REMOTE_DIR, mFtpDir) ;
 			child.setAttribute(ListenerTagNames.FILE_INPUT_DIR_TAG, mFtpDir) ;
 			return tree ;
 		}
@@ -208,6 +207,7 @@
 		stringToFile(_initialFile, text) ;
 		
 		final ConfigTree tree = getGatewayConfig().getAllChildren()[0] ;
+		tree.setAttribute(RemoteFileSystem.PARMS_REMOTE_DIR, mFtpDir) ;
 		final RemoteFileSystem fileSystem = RemoteFileSystemFactory.getRemoteFileSystem(tree, true) ;
 		final String remoteName = System.currentTimeMillis() + tree.getAttribute(ListenerTagNames.FILE_INPUT_SFX_TAG) ;
 		fileSystem.uploadFile(_initialFile, remoteName) ;