[jboss-svn-commits] JBL Code SVN: r6328 - labs/jbossesb/branches/JBESB_4_0_Beta1_maint/product/core/listeners/src/org/jboss/soa/esb/actions

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

Author: estebanschifman
Date: 2006-09-20 14:11:39 -0400 (Wed, 20 Sep 2006)
New Revision: 6328

Modified:
   labs/jbossesb/branches/JBESB_4_0_Beta1_maint/product/core/listeners/src/org/jboss/soa/esb/actions/FtpClientUtil.java
Log:
new attribute ftpPassive="true" if you want passive ftp connection mode

Modified: labs/jbossesb/branches/JBESB_4_0_Beta1_maint/product/core/listeners/src/org/jboss/soa/esb/actions/FtpClientUtil.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_0_Beta1_maint/product/core/listeners/src/org/jboss/soa/esb/actions/FtpClientUtil.java	2006-09-20 18:03:00 UTC (rev 6327)
+++ labs/jbossesb/branches/JBESB_4_0_Beta1_maint/product/core/listeners/src/org/jboss/soa/esb/actions/FtpClientUtil.java	2006-09-20 18:11:39 UTC (rev 6328)
@@ -48,9 +48,9 @@
   public  static final String PARMS_REMOTE_DIR = "ftpRemoteDir";
   public  static final String PARMS_LOCAL_DIR  = "ftpLocalDir";
   public  static final String PARMS_ASCII      = "ftpAscii";
+  public  static final String PARMS_PASSIVE    = "ftpPassive";
   
   private static final String TMP_SUFFIX	= ".rosettaPart";
-  private static final String DONE_SUFFIX	= ".rosettaDone";
 
   public enum XFER_TYPE
   {ascii
@@ -61,6 +61,7 @@
   private String    	m_sFtpServer  ,m_sUser        ,m_sPasswd;
   private String    	m_sRemoteDir  ,m_sLocalDir;
   private int			m_iPort;
+  private boolean		m_bPassive;
   public  String getRemoteDir()  { return m_sRemoteDir; }
 
   private FTPClient  	m_oConn = new FTPClient();
@@ -95,7 +96,7 @@
 	    	 throw new Exception("Can't connect to FTP server");
 	     m_oConn.user	      	(m_sUser);
 	     m_oConn.password		(m_sPasswd);
-	     m_oConn.setConnectMode	(FTPConnectMode.ACTIVE);
+	     m_oConn.setConnectMode	((m_bPassive) ? FTPConnectMode.PASV : FTPConnectMode.ACTIVE);
      }
    } //_________________________________
 
@@ -264,6 +265,11 @@
      if (null!=sAux)
     	 bAscii = Boolean.parseBoolean(sAux);
      setXferType((bAscii)?XFER_TYPE.ascii:XFER_TYPE.binary);
+     
+     m_bPassive = false;
+     sAux = m_oParms.getAttr(PARMS_PASSIVE);
+     m_bPassive = (null!=sAux) && Boolean.parseBoolean(sAux);
+     
      return;
    } //__________________________________