[jboss-svn-commits] JBL Code SVN: r7452 - in labs/jbossesb/workspace/b_georges/product/core/listeners/src/org/jboss/soa/esb: actions listeners/old

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

Author: b_georges
Date: 2006-11-07 17:18:05 -0500 (Tue, 07 Nov 2006)
New Revision: 7452

Modified:
   labs/jbossesb/workspace/b_georges/product/core/listeners/src/org/jboss/soa/esb/actions/FtpDownloader.java
   labs/jbossesb/workspace/b_georges/product/core/listeners/src/org/jboss/soa/esb/actions/FtpUploader.java
   labs/jbossesb/workspace/b_georges/product/core/listeners/src/org/jboss/soa/esb/listeners/old/RemoteDirectoryPoller.java
Log:
Refactoring work. In progress

Modified: labs/jbossesb/workspace/b_georges/product/core/listeners/src/org/jboss/soa/esb/actions/FtpDownloader.java
===================================================================
--- labs/jbossesb/workspace/b_georges/product/core/listeners/src/org/jboss/soa/esb/actions/FtpDownloader.java	2006-11-07 21:00:32 UTC (rev 7451)
+++ labs/jbossesb/workspace/b_georges/product/core/listeners/src/org/jboss/soa/esb/actions/FtpDownloader.java	2006-11-07 22:18:05 UTC (rev 7452)
@@ -34,11 +34,14 @@
 import org.jboss.soa.esb.listeners.old.RemoteDirectoryPoller;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.util.FtpClientUtil;
+import org.jboss.soa.esb.util.RemoteFileSystem;
+import org.jboss.soa.esb.util.RemoteFileSystemFactory;
 
 public class FtpDownloader extends AbstractFileAction 
 {
 	ConfigTree		_parms;
 	FtpClientUtil 	_ftpClient;
+	RemoteFileSystem _remoteFS;
 	String			_localDir;
 	RemoteDirectoryPoller.WorkingFile _workFile;
 	Logger			_logger = Logger.getLogger(this.getClass());
@@ -75,14 +78,19 @@
         			_parms.setAttribute(kvp.getKey(),(null==sVal)?"":sVal);
         		}
         	// end of kludge
-//        	System.out.println("Downloading "+_workFile);
-			_ftpClient = new FtpClientUtil(_parms,true);
-			_localDir = _parms.getAttribute(FtpClientUtil.PARMS_LOCAL_DIR);
+        	// System.out.println("Downloading "+_workFile);
+        	_remoteFS = RemoteFileSystemFactory.getRemoteFileSystem(_parms, true);
+			//_ftpClient = new FtpClientUtil(_parms,true);
+			_localDir = _parms.getAttribute(RemoteFileSystem.PARMS_LOCAL_DIR);
+			
+			// TODO: if we replace the FtpClientUtil, we have to move this static method
 			String sFrom = FtpClientUtil.fileToFtpString(_workFile);
-			_ftpClient.downloadFile(sFrom,_workFile.getInputFile().getName());
+			_remoteFS.downloadFile(sFrom,_workFile.getInputFile().getName());
 
+			// TODO: What is going to happen with old.listeners.RemoteDirectoryPoller ? 
+			// There is a reference to inner class WorkFile
 			if (_workFile.isPostDelete())
-				_ftpClient.remoteDelete(_workFile);
+				_remoteFS.remoteDelete(_workFile);
 			else
 				_workFile.remoteRenameToOutput(_ftpClient);
 			
@@ -98,9 +106,9 @@
 		}
 		finally 
 		{	
-			if (null!=_ftpClient)
-				_ftpClient.quit();
-			_ftpClient = null;
+			if (null!=_remoteFS)
+				_remoteFS.quit();
+			_remoteFS = null;
 		}
 	} //________________________________
 

Modified: labs/jbossesb/workspace/b_georges/product/core/listeners/src/org/jboss/soa/esb/actions/FtpUploader.java
===================================================================
--- labs/jbossesb/workspace/b_georges/product/core/listeners/src/org/jboss/soa/esb/actions/FtpUploader.java	2006-11-07 21:00:32 UTC (rev 7451)
+++ labs/jbossesb/workspace/b_georges/product/core/listeners/src/org/jboss/soa/esb/actions/FtpUploader.java	2006-11-07 22:18:05 UTC (rev 7452)
@@ -33,15 +33,16 @@
 import org.jboss.soa.esb.listeners.old.DirectoryPoller;
 import org.jboss.soa.esb.listeners.old.GpListener;
 import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.util.FtpClientUtil;
+import org.jboss.soa.esb.util.RemoteFileSystem;
+import org.jboss.soa.esb.util.RemoteFileSystemFactory;
 
 public class FtpUploader extends AbstractFileAction 
 {
-	ConfigTree		_parms;
-	FtpClientUtil 	_ftpClient;
-	String			_remoteDir;
+	ConfigTree			_parms;
+	RemoteFileSystem 	_remoteFS;
+	String				_remoteDir;
 	DirectoryPoller.WorkingFile _workFile;
-	Logger			_logger = Logger.getLogger(this.getClass());
+	Logger				_logger = Logger.getLogger(this.getClass());
 
 	/**
      * Public constructor.
@@ -68,9 +69,9 @@
         try 
 		{
         	System.out.println("FTP uploading "+obj);
-			_ftpClient = new FtpClientUtil(_parms,true);
-			_remoteDir = _parms.getAttribute(FtpClientUtil.PARMS_REMOTE_DIR);
-			_ftpClient.uploadFile(_workFile,_workFile.getInputFile().getName());
+        	_remoteFS = RemoteFileSystemFactory.getRemoteFileSystem(_parms, true);
+			_remoteDir = _parms.getAttribute(RemoteFileSystem.PARMS_REMOTE_DIR);
+			_remoteFS.uploadFile(_workFile,_workFile.getInputFile().getName());
 
 			if (_workFile.isPostDelete())
 				_workFile.delete();
@@ -88,9 +89,9 @@
 		}
 		finally 
 		{	
-			if (null!=_ftpClient)
-				_ftpClient.quit();
-			_ftpClient = null;
+			if (null!=_remoteFS)
+				_remoteFS.quit();
+			_remoteFS = null;
 		}
 	} //________________________________
 
@@ -99,7 +100,7 @@
 		return new StringBuilder()
 		.append(_workFile.getInputFile().toString())
 		.append("successfully uploaded to ").append(_remoteDir)
-		.append(" on ").append(_parms.getAttribute(FtpClientUtil.PARMS_FTP_SERVER))
+		.append(" on ").append(_parms.getAttribute(RemoteFileSystem.PARMS_FTP_SERVER))
 		.toString();
 	} //________________________________
 	
@@ -108,7 +109,7 @@
 		return new StringBuilder()
 		.append("Failed to upload ").append(_workFile.getInputFile().toString())
 		.append(" to ").append(_remoteDir)
-		.append(" on ").append(_parms.getAttribute(FtpClientUtil.PARMS_FTP_SERVER))
+		.append(" on ").append(_parms.getAttribute(RemoteFileSystem.PARMS_FTP_SERVER))
 		.toString();
 	} //________________________________
 	

Modified: labs/jbossesb/workspace/b_georges/product/core/listeners/src/org/jboss/soa/esb/listeners/old/RemoteDirectoryPoller.java
===================================================================
--- labs/jbossesb/workspace/b_georges/product/core/listeners/src/org/jboss/soa/esb/listeners/old/RemoteDirectoryPoller.java	2006-11-07 21:00:32 UTC (rev 7451)
+++ labs/jbossesb/workspace/b_georges/product/core/listeners/src/org/jboss/soa/esb/listeners/old/RemoteDirectoryPoller.java	2006-11-07 22:18:05 UTC (rev 7452)
@@ -232,7 +232,7 @@
      * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
      * @since Version 4.0
      */
-    public static class WorkingFile extends File 
+    public static class 	 extends File 
     {
         private static final long serialVersionUID = 1L;