Merged DEV/SWIFT to HEAD (FTP Tests, Tika and Poi)

26059: ALF-5900 - IMAP creates winmail.dat in attachment folder (Add support for Microsoft Transport Neutral Encapsulation Format.)
          - added attachment extraction for TNEF documents - goodbye winmail.dat !
   26063: javadoc for imap.
   26088: ALF-7408 - addition of commons-net for ftp client library.
          First test of end to end ftp.   Just a simple test of connection now, will be followed by more detailed tests.
   26176: ALF-7408 - FTP tests + disabled failing test case for ALF-7618
   26180: ALF-7618 - correction of unit test error.
   26188: ALF-7618 - added a test of paths
   26229: Added back simple '\~.*' pattern
   26288: ALF-7676 - Test to stress different user rights.
          - FTPServerTest.testTwoUserUpdate added for the FTP server.
   26304: Corrected spelling name in private class.
   26408: addming minimal package infos.
   26416: ALF-5082 / ALF-2183 / ALF-4448 - When guessing the mimetype for a file, add the option to supply a ContentReader to enhance the accuracy.
          Enable this for a few key places that do mimetype guessing,
          which should avoid issues for files with the wrong extension (either renamed accidently, or for .TMP)
   26433: Re-order the mimetype guess step to ensure that the Content Reader is always valid
   26440: Added another test for word 2003 save as.
   26441: Test resource for ContentDiskDriver
   26446: ALF-5082 - Back out a FileFolderService change to mimetype guessing, which had broken things, pending a better way to do it with ContentWriter
   26490: Small change for ContentDiskDriverTes.fileExists.  Leaky transaction causing problems in automated build.
   26497: ContentDiskDriver - commented out two of the problematic leaky transaction tests.
   26503: Add new interface methods + documentation for asking a ContentWriter to guess the mimetype and encoding for you.
          (Code will be migrated from places that currently do this themselves later)
   26504: Add an extension interface in the DataModel project for some of the extra ContentReader methods that FileContentReader provides
   26505: When ContentWriter.putContent(String) is called with no encoding specified, record what the system default encoding was that was used.
          (Prevents issues if the system default is ever changed)
   26509: When calling Tika to do file detection, if we have a file based reader then give Tika the File rather than an InputStream
   26522: More debug logging while debugging ALF-5260
   26546: Have one copy of the Tika Config in spring, rather than several places fetching their own copy of the default one (either explicitly or implicitly).
   26522: More debug logging while diagnosing ALF-5260
   26548: Add another mimetype check - ensures that truncated/corrup container files which can't be fully processed can still get the container type without failure
   26549: Implement the mimetype and encoding guessers on ContentWriter (either immediately or as a listener, as required), and update FileFolderServer to make use of this (+test this)
   26553: Replace explicit mimetype and encoding guess calls with ContentWriter requests to have the work done
   26554: Replace explicit mimetype and encoding guess calls with ContentWriter requests to have the work done
   26579: Switch the transformer to use Tika

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java

@@ -360,7 +360,7 @@ public class FileFolderServiceImpl implements FileFolderService
         {
             logger.debug("Deep search for files: \n" +
                     "   context: " + contextNodeRef + "\n" +
-                    "   results: " + results);
+                    "   results: " + results.size());
         }
         return results;
         
@@ -600,12 +600,7 @@ public class FileFolderServiceImpl implements FileFolderService
     /**
      * A deep version of listSimple.   Which recursively walks down the tree from a given starting point, returning 
      * the node refs of files or folders found along the way.
-     * 
-     * MER: I've added this rather than changing listSimple to minimise the risk of breaking 
-     * the existing code.   This is a quick performance improvement between using 
-     * XPath which is awful or adding new methods to the NodeService/DB   This is also a dangerous method in that it can return a 
-     * lot of data and take a long time. 
-     * 
+     * <p>
      * The folder filter is called for each sub-folder to determine whether to search in that sub-folder, should a subfolder be excluded 
      * then all its chidren are excluded as well.
      * 
@@ -615,8 +610,19 @@ public class FileFolderServiceImpl implements FileFolderService
      * @param subfolder filter controls which folders to search.  If null then all subfolders are searched.
      * @return list of node references
      */
+   /* <p>
+    * MER: I've added this rather than changing listSimple to minimise the risk of breaking 
+    * the existing code.   This is a quick performance improvement between using 
+    * XPath which is awful or adding new methods to the NodeService/DB   This is also a dangerous method in that it can return a 
+    * lot of data and take a long time.
+    */  
     private List<NodeRef> listSimpleDeep(NodeRef contextNodeRef, boolean folders, boolean files, SubFolderFilter folderFilter)
     {
+        if(logger.isDebugEnabled())
+        {
+            logger.debug("searchSimpleDeep contextNodeRef:" + contextNodeRef);
+        }
+        
         Set<QName> folderTypeQNames = new HashSet<QName>(10);
         Set<QName> fileTypeQNames = new HashSet<QName>(10);
         
@@ -701,7 +707,10 @@ public class FileFolderServiceImpl implements FileFolderService
             }
         }
         
-        logger.debug("search deep finished size:" + result.size());
+        if(logger.isDebugEnabled())
+        {
+            logger.debug("searchSimpleDeep finished size:" + result.size());
+        }
  
         // Done
         return result;
@@ -1214,7 +1223,7 @@ public class FileFolderServiceImpl implements FileFolderService
         if (writer.getMimetype() == null)
         {
             final String name = fileInfo.getName();
-            writer.setMimetype(mimetypeService.guessMimetype(name));
+            writer.guessMimetype(name);
         }
         // Done
         return writer;