[jboss-svn-commits] JBL Code SVN: r18510 - in labs/jbossesb/workspace: chharris/product/rosetta/src/org/jboss/internal/soa/esb/util and 1 other directories.

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

Author: kevin.conner at jboss.com
Date: 2008-02-19 10:42:04 -0500 (Tue, 19 Feb 2008)
New Revision: 18510

Added:
   labs/jbossesb/workspace/chharris/
Modified:
   labs/jbossesb/workspace/chharris/product/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpImpl.java
   labs/jbossesb/workspace/chharris/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java
Log:
Chris Harris workspace

Copied: labs/jbossesb/workspace/chharris (from rev 18509, labs/jbossesb/tags/JBESB_4_2_1_SOA_4_2_BETA2)

Modified: labs/jbossesb/workspace/chharris/product/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpImpl.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_SOA_4_2_BETA2/product/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpImpl.java	2008-02-19 14:29:36 UTC (rev 18509)
+++ labs/jbossesb/workspace/chharris/product/rosetta/src/org/jboss/internal/soa/esb/util/SecureFtpImpl.java	2008-02-19 15:42:04 UTC (rev 18510)
@@ -363,6 +363,7 @@
 	{
 		try
 		{
+		
 			String sSuffix = (null == p_sSuffix) ? "*" : "*" + p_sSuffix;
 			List<String> lFileList = new ArrayList<String>();
 			Vector vFileList = m_oSftpChannel.ls(sSuffix);
@@ -379,6 +380,8 @@
 						if (!oSftAttr.isDir()) 
 						{
 							lFileList.add(((LsEntry) obj).getFilename());
+							
+							
 						}
 					}
 				}
@@ -523,8 +526,10 @@
 		try
 		{
 			m_oSftpChannel.get(p_sFile, FtpUtils.fileToFtpString(oLclFile));
-	
-			File oNew = new File(oLocalDir, p_sFinalName);
+
+			final File to = new File(p_sFinalName) ;
+			final File oNew = (to.isAbsolute() ? to : new File(oLocalDir, p_sFinalName)) ;
+			//File oNew = new File(p_sFinalName);
 			if (oNew.exists())
 				oNew.delete();
 			FileUtil.renameTo(oLclFile, oNew);

Modified: labs/jbossesb/workspace/chharris/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_2_1_SOA_4_2_BETA2/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java	2008-02-19 14:29:36 UTC (rev 18509)
+++ labs/jbossesb/workspace/chharris/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java	2008-02-19 15:42:04 UTC (rev 18510)
@@ -24,6 +24,7 @@
 
 import java.io.File;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Properties;
@@ -40,10 +41,12 @@
 import org.jboss.soa.esb.addressing.eprs.FileEpr;
 import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
 import org.jboss.soa.esb.addressing.eprs.JMSEpr;
+import org.jboss.soa.esb.addressing.eprs.SFTPEpr;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.listeners.message.MessageDeliverException;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.services.registry.RegistryException;
+
 import org.jboss.soa.esb.util.Util;
 
 public class ListenerUtil
@@ -89,6 +92,9 @@
 				return fileEprFromElement(tree);
 			if ("ftp".equals(protocol))
 				return fileEprFromElement(tree);
+			if ("sftp".equals(protocol))
+				return fileEprFromElement(tree);
+			
 			if ("jdbc".equals(protocol))
 				return jdbcEprFromElement(tree);
 		}
@@ -153,12 +159,18 @@
 		}
 	} // ________________________________
 
+	
+
+	
 	public static FileEpr fileEprFromElement(ConfigTree tree) throws ConfigurationException
 	{
 		try
 		{
-            String urlString = tree.getRequiredAttribute(ListenerTagNames.URL_TAG);
+			String urlString = tree.getRequiredAttribute(ListenerTagNames.URL_TAG);
+			
+			
 			URL url = new URL(urlString);
+			
 			String protocol = url.getProtocol();
 	
 			if ("file".equals(protocol))
@@ -168,9 +180,24 @@
 							+ ListenerTagNames.URL_TAG
 							+ " must reference a directory");
 			}
-	
-			FileEpr epr = ("file".equals(protocol)) ? new FileEpr(url) : ("ftp"
-					.equals(protocol)) ? new FTPEpr(url) : null;
+	        
+			FileEpr epr = null;
+			if("file".equals(protocol)){
+				epr = new FileEpr(url);
+			}
+			else if("ftp".equals(protocol)){
+				epr = new FTPEpr(url);
+			}
+			else if("sftp".equals(protocol)){
+				String cert = tree.getAttribute(SFTPEpr.CERTIFICATE_TAG);
+				if(cert == null){
+				  epr = new SFTPEpr(url);				  
+				}else {
+					epr = new SFTPEpr(url,new URL(cert));	
+				}
+			}
+			
+			
 			if (null == epr)
 				throw new ConfigurationException("Unsupported file protocol : "
 						+ protocol);