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/imap/AlfrescoImapFolder.java

@@ -1065,100 +1065,11 @@ public class AlfrescoImapFolder extends AbstractImapFolder implements Serializab
         
         if (extractAttachmentsEnabled)
         {
-            extractAttachments(folderFileInfo, messageFile, message);
+            imapService.extractAttachments(folderFileInfo.getNodeRef(), messageFile.getNodeRef(), message);
         }
         return new IncomingImapMessage(messageFile, serviceRegistry, message);
     }
-    
-    private void extractAttachments(
-            FileInfo parentFolder,
-            FileInfo messageFile,
-            MimeMessage originalMessage)
-            throws IOException, MessagingException
-    {
-        NodeService nodeService = serviceRegistry.getNodeService();
-        FileFolderService fileFolderService = serviceRegistry.getFileFolderService();
-
-        String messageName = (String)nodeService.getProperty(messageFile.getNodeRef(), ContentModel.PROP_NAME);
-        String attachmentsFolderName = messageName + "-attachments";
-        FileInfo attachmentsFolderFileInfo = null;
-        Object content = originalMessage.getContent();
-        if (content instanceof Multipart)
-        {
-            Multipart multipart = (Multipart) content;
-
-            for (int i = 0, n = multipart.getCount(); i < n; i++)
-            {
-                Part part = multipart.getBodyPart(i);
-                if ("attachment".equalsIgnoreCase(part.getDisposition()))
-                {
-                    if (attachmentsFolderFileInfo == null)
-                    {
-                        attachmentsFolderFileInfo = fileFolderService.create(
-                                parentFolder.getNodeRef(),
-                                attachmentsFolderName,
-                                ContentModel.TYPE_FOLDER);
-                        serviceRegistry.getNodeService().createAssociation(
-                                messageFile.getNodeRef(),
-                                attachmentsFolderFileInfo.getNodeRef(),
-                                ImapModel.ASSOC_IMAP_ATTACHMENTS_FOLDER);
-                    }
-                    createAttachment(messageFile, attachmentsFolderFileInfo, part);
-                }
-            }
-        }
-
-    }
-    
-    private void createAttachment(FileInfo messageFile, FileInfo attachmentsFolderFileInfo, Part part) throws MessagingException, IOException
-    {
-        String fileName = part.getFileName();
-        try
-        {
-            fileName = MimeUtility.decodeText(fileName);
-        }
-        catch (UnsupportedEncodingException e)
-        {
-            if (logger.isWarnEnabled())
-            {
-                logger.warn("Cannot decode file name '" + fileName + "'", e);
-            }
-        }
-
-        ContentType contentType = new ContentType(part.getContentType());
-        FileFolderService fileFolderService = serviceRegistry.getFileFolderService();
-        List<FileInfo> result = fileFolderService.search(attachmentsFolderFileInfo.getNodeRef(), fileName, false);
-        // The one possible behaviour
-        /*
-        if (result.size() > 0)
-        {
-            for (FileInfo fi : result)
-            {
-                fileFolderService.delete(fi.getNodeRef());
-            }
-        }
-        */
-        // And another one behaviour which will overwrite the content of the existing file. It is performance preferable.
-        FileInfo attachmentFile = null;
-        if (result.size() == 0)
-        {
-            FileInfo createdFile = fileFolderService.create(
-                    attachmentsFolderFileInfo.getNodeRef(),
-                    fileName,
-                    ContentModel.TYPE_CONTENT);
-            serviceRegistry.getNodeService().createAssociation(
-                    messageFile.getNodeRef(),
-                    createdFile.getNodeRef(),
-                    ImapModel.ASSOC_IMAP_ATTACHMENT);
-            result.add(createdFile);
-        }
-        attachmentFile = result.get(0);
-        ContentWriter writer = fileFolderService.getWriter(attachmentFile.getNodeRef());
-        writer.setMimetype(contentType.getBaseType());
-        OutputStream os = writer.getContentOutputStream();
-        FileCopyUtils.copy(part.getInputStream(), os);
-    }
-    
+        
     private void removeMessageFromCache(long uid)
     {
         messages.remove(uid);