[jboss-svn-commits] JBL Code SVN: r29526 - labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util.

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

Author: beve
Date: 2009-10-01 15:45:22 -0400 (Thu, 01 Oct 2009)
New Revision: 29526

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/FtpClientUtil.java
Log:
Work for https://jira.jboss.org/jira/browse/JBESB-2647 "Remove parameter declaration duplication in FtpClientUtil and RemoteFileSystem"


Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/FtpClientUtil.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/FtpClientUtil.java	2009-10-01 17:01:12 UTC (rev 29525)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/FtpClientUtil.java	2009-10-01 19:45:22 UTC (rev 29526)
@@ -55,22 +55,6 @@
 
 public class FtpClientUtil
 {
-        public static final String PARMS_FTP_SERVER = "ftpServer";
-
-        public static final String PARMS_USER = "ftpUser";
-
-        public static final String PARMS_PASSWD = "ftpPassword";
-
-        public static final String PARMS_PORT = "ftpPort";
-
-        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";
                 
         public enum XFER_TYPE
@@ -474,31 +458,31 @@
 
         private void checkParms () throws ConfigurationException
         {
-                m_sFtpServer = m_oParms.getAttribute(PARMS_FTP_SERVER);
+                m_sFtpServer = m_oParms.getAttribute(RemoteFileSystem.PARMS_FTP_SERVER);
                 if (null == m_sFtpServer)
                         throw new ConfigurationException("No FTP server specified");
 
-                m_sUser = m_oParms.getAttribute(PARMS_USER);
+                m_sUser = m_oParms.getAttribute(RemoteFileSystem.PARMS_USER);
                 if (null == m_sUser)
                         throw new ConfigurationException("No username specified for FTP");
 
-                m_sPasswd = m_oParms.getAttribute(PARMS_PASSWD);
+                m_sPasswd = m_oParms.getAttribute(RemoteFileSystem.PARMS_PASSWD);
                 if (null == m_sPasswd)
                         throw new ConfigurationException("No password specified for FTP");
 
-                m_sRemoteDir = m_oParms.getAttribute(PARMS_REMOTE_DIR);
+                m_sRemoteDir = m_oParms.getAttribute(RemoteFileSystem.PARMS_REMOTE_DIR);
                 if (null == m_sRemoteDir) 
                         m_sRemoteDir = "";
 
-                m_sLocalDir = m_oParms.getAttribute(PARMS_LOCAL_DIR);
+                m_sLocalDir = m_oParms.getAttribute(RemoteFileSystem.PARMS_LOCAL_DIR);
                 if (null == m_sLocalDir) 
                         m_sLocalDir = ".";
 
-                String sAux = m_oParms.getAttribute(PARMS_PORT);
+                String sAux = m_oParms.getAttribute(RemoteFileSystem.PARMS_PORT);
                 m_iPort = (null == sAux) ? 21 : Integer.parseInt(sAux);
 
                 boolean bAscii = false;
-                sAux = m_oParms.getAttribute(PARMS_ASCII);
+                sAux = m_oParms.getAttribute(RemoteFileSystem.PARMS_ASCII);
                 
                 if (null != sAux) 
                         bAscii = Boolean.parseBoolean(sAux);
@@ -506,7 +490,7 @@
                 m_bAsciiTransferType = bAscii;
 
                 m_bPassive = false;
-                sAux = m_oParms.getAttribute(PARMS_PASSIVE);
+                sAux = m_oParms.getAttribute(RemoteFileSystem.PARMS_PASSIVE);
                 m_bPassive = (null != sAux) && Boolean.parseBoolean(sAux);
                 
                 String renameRetryString = ModulePropertyManager.getPropertyManager(