[jboss-svn-commits] JBL Code SVN: r19206 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss: soa/esb/notification and 1 other directory.

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

Author: mark.little at jboss.com
Date: 2008-03-22 21:31:48 -0400 (Sat, 22 Mar 2008)
New Revision: 19206

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1616

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java	2008-03-22 21:25:48 UTC (rev 19205)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java	2008-03-23 01:31:48 UTC (rev 19206)
@@ -444,8 +444,17 @@
 							"Can't connect to FTP server");
 				m_oConn.user(m_sUser);
 				m_oConn.password(m_sPasswd);
-				m_oConn
-						.setConnectMode((m_bPassive) ? FTPConnectMode.PASV : FTPConnectMode.ACTIVE);
+				
+				/*
+				 * It's ok to set the passive/active mode here as this is for
+				 * the data connection. The previous call to connect() was for
+				 * the command connection and is not affected by this setting.
+				 * 
+				 * http://www.slacksite.com/other/ftp.html
+				 */
+				
+				m_oConn.setConnectMode((m_bPassive) ? FTPConnectMode.PASV : FTPConnectMode.ACTIVE);
+				
 				m_oConn.setType(m_oXferType);
 				
 				if (_timeout > 0)

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java	2008-03-22 21:25:48 UTC (rev 19205)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java	2008-03-23 01:31:48 UTC (rev 19206)
@@ -29,6 +29,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
+import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.addressing.eprs.FTPEpr;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.Message;
@@ -37,6 +38,7 @@
 import org.jboss.soa.esb.util.RemoteFileSystem;
 import org.jboss.soa.esb.util.RemoteFileSystemException;
 import org.jboss.soa.esb.util.RemoteFileSystemFactory;
+import org.jboss.soa.esb.listeners.ListenerUtil;
 import org.jboss.soa.esb.listeners.message.MessageDeliverException;
 
 /**
@@ -161,7 +163,7 @@
 	}
 
 	/**
-	 * Builds an FTP EPR from the configutation data.
+	 * Builds an FTP EPR from the configuration data.
 	 * 
 	 * @return FTPEpr
 	 */
@@ -170,10 +172,16 @@
 			ConfigTree ftpConfig = getFtpConfig();
 			String url = ftpConfig.getAttribute(FTPEpr.URL_TAG);
 			try {
-				epr = new FTPEpr(url);
-			} catch (URISyntaxException e) {
-				throw new NotificationException(e);
+			    epr = (FTPEpr) ListenerUtil.fileEprFromElement(ftpConfig);
 			}
+			catch (final ConfigurationException ex)
+			{
+			    throw new NotificationException(ex);
+			}
+			catch (final ClassCastException ex)
+			{
+			    throw new NotificationException("Not an FTPEpr!", ex);
+			}
 		}
 		return epr;
 	}