[jboss-svn-commits] JBL Code SVN: r6462 - in labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb: actions listeners

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

Author: estebanschifman
Date: 2006-09-28 11:53:36 -0400 (Thu, 28 Sep 2006)
New Revision: 6462

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/FtpDownloader.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/RemoteDirectoryPoller.java
Log:
Temporary fix (kludge) to avoid replicating ftp parameters in ftp action classes

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/FtpDownloader.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/FtpDownloader.java	2006-09-28 15:52:26 UTC (rev 6461)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/FtpDownloader.java	2006-09-28 15:53:36 UTC (rev 6462)
@@ -65,6 +65,15 @@
 
         try 
 		{
+        	// Kludge to obtain ftp arguments from message - not quite nice...  (ES)
+        	if (null!=_workFile.getFtpProps())
+        		for (KeyValuePair kvp : _workFile.getFtpProps())
+        		{
+        			String sVal = kvp.getValue();
+        			_parms.setAttr(kvp.getKey(),(null==sVal)?"":sVal);
+        		}
+        	// end of kludge
+//        	System.out.println("Downloading "+_workFile);
 			_ftpClient = new FtpClientUtil(_parms,true);
 			_localDir = _parms.getAttr(FtpClientUtil.PARMS_LOCAL_DIR);
 			String sFrom = FtpClientUtil.fileToFtpString(_workFile);

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/RemoteDirectoryPoller.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/RemoteDirectoryPoller.java	2006-09-28 15:52:26 UTC (rev 6461)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/RemoteDirectoryPoller.java	2006-09-28 15:53:36 UTC (rev 6462)
@@ -28,7 +28,7 @@
 
 import org.jboss.soa.esb.actions.*;
 import org.jboss.soa.esb.helpers.*;
-import org.jboss.soa.esb.util.FtpClientUtil;
+import org.jboss.soa.esb.util.*;
 
 import org.apache.log4j.*;
 
@@ -59,6 +59,7 @@
     protected File 			m_oInpDir	,m_oErrorDir	,m_oPostDir;
     protected String 		m_sInpSfx	,m_sWrkSfx		,m_sErrSfx	,m_sPostSfx;
     protected boolean		m_bPostDel;
+    private List <KeyValuePair> m_ftpProps = new ArrayList<KeyValuePair>();
 
     /**
      * 
@@ -74,6 +75,7 @@
 		WorkingFile oCurr =  new WorkingFile(oF,m_sWrkSfx,m_bPostDel);		
 		oCurr.errorFile		= new File (m_oErrorDir	,oF.getName()+m_sErrSfx);
 		oCurr.outputFile	= new File (m_oPostDir	,oF.getName()+m_sPostSfx);
+		oCurr.setFtpProps(m_ftpProps);
 
 		try
 		{
@@ -172,6 +174,22 @@
       
       FtpClientUtil _ftpClient = new FtpClientUtil(_params,false);
       _ftpClient.quit();
+      
+      //  Copy FTP parameters to be passed to the action class (inside the WorkingFile class)
+      //  This is a kludge - we have to get back to this (ES)
+      String[] sa = new String[] 
+      {FtpClientUtil.PARMS_FTP_SERVER
+      ,FtpClientUtil.PARMS_USER
+      ,FtpClientUtil.PARMS_PASSWD
+      ,FtpClientUtil.PARMS_PASSIVE
+      ,FtpClientUtil.PARMS_PORT
+      };
+      for (String sProp : sa)
+      {
+    	  String sVal = _params.getAttr(sProp);
+    	  if (!Util.isNullString(sVal))
+    		  m_ftpProps.add(new KeyValuePair(sProp,sVal));
+      }
 
     } //________________________________
 	
@@ -217,6 +235,9 @@
 
         private boolean postDelete;
         private File inputFile, errorFile, outputFile;
+        private List <KeyValuePair> ftpProps;
+        public void setFtpProps(List <KeyValuePair>props) {ftpProps = props; }
+        public List <KeyValuePair >getFtpProps() {return ftpProps; }
 
         private WorkingFile(File pFile,String pWrkSfx, boolean pPostDelete) 
         {