[jboss-svn-commits] JBL Code SVN: r8118 - in labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers: . helpers

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

Author: estebanschifman
Date: 2006-12-07 08:55:39 -0500 (Thu, 07 Dec 2006)
New Revision: 8118

Modified:
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FileHandlerFactory.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FileHandlerInterface.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java
Log:
Changes to FileCourier and courier.helpers package

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java	2006-12-07 13:53:33 UTC (rev 8117)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java	2006-12-07 13:55:39 UTC (rev 8118)
@@ -27,6 +27,8 @@
 import java.net.URISyntaxException;
 
 import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.couriers.helpers.FileHandlerFactory;
+import org.jboss.internal.soa.esb.couriers.helpers.FileHandlerInterface;
 import org.jboss.soa.esb.addressing.eprs.FileEpr;
 import org.jboss.soa.esb.couriers.CourierException;
 import org.jboss.soa.esb.message.Message;
@@ -81,7 +83,8 @@
 				// need to write even if it's readOnly - file will be renamed during xfer
 				if (! directory.canWrite())
 					throw new CourierException("Can't write in directory "+directory.toString());
-				
+
+				_handler = FileHandlerFactory.getInstance().getFileHandler(_epr);
 			}
 		}
 		catch (MalformedURLException e) {throw new CourierException(e); }
@@ -114,6 +117,7 @@
 
 	protected boolean			_receiverOnly;	  
     protected FileEpr			_epr;
+    protected FileHandlerInterface _handler;
     protected Logger			_logger = Logger.getLogger(FileCourier.class);
 
 } //____________________________________________________________________________

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FileHandlerFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FileHandlerFactory.java	2006-12-07 13:53:33 UTC (rev 8117)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FileHandlerFactory.java	2006-12-07 13:55:39 UTC (rev 8118)
@@ -9,7 +9,9 @@
 public class FileHandlerFactory 
 {
 	private static final FileHandlerFactory _instance = new FileHandlerFactory();
-	public FileHandlerFactory getInstance() { return _instance; }
+
+	public static FileHandlerFactory getInstance() { return _instance; }
+
 	public FileHandlerInterface getFileHandler(FileEpr epr) throws CourierException
 	{
 		try

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FileHandlerInterface.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FileHandlerInterface.java	2006-12-07 13:53:33 UTC (rev 8117)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FileHandlerInterface.java	2006-12-07 13:55:39 UTC (rev 8118)
@@ -31,6 +31,4 @@
 	abstract byte[]	 getFileContents(File file)		throws CourierException;
 	abstract boolean renameFile(File from, File to) throws CourierException;
 	abstract boolean deleteFile(File file)			throws CourierException;    	
-    abstract void    seeIfOkToWorkOnDir (File p_oDir) throws CourierException;
-
 }

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java	2006-12-07 13:53:33 UTC (rev 8117)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java	2006-12-07 13:55:39 UTC (rev 8118)
@@ -33,9 +33,5 @@
 		return false;
 	}
 
-	public void seeIfOkToWorkOnDir(File p_oDir) throws CourierException 
-	{
-	}
-
 	FileEpr _epr;
 }

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java	2006-12-07 13:53:33 UTC (rev 8117)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java	2006-12-07 13:55:39 UTC (rev 8118)
@@ -69,16 +69,6 @@
 		catch (Exception e)				{throw new CourierException(e);}
 	}
 
-	public void seeIfOkToWorkOnDir(File dir) throws CourierException 
-	{
-		if (! dir.isDirectory())
-			throw new CourierException(dir.toString()+" is not a directory");
-		if (! dir.canRead())
-			throw new CourierException("Unable to read from directory "+dir.toString());
-		if (! dir.canWrite())
-			throw new CourierException("Unable to write on directory "+dir.toString());			
-	}
-
 	private class FileEndsWith implements FileFilter
     {
       String m_sSuffix;