Merged V4.1-BUG-FIX to HEAD

43944: Fixes: ALF-16090: fixes view mode for control param showTime. 43964: Fixes: ALF-14758. Adds distinct styling for menus nested 4 levels or deeper to prevent confusion if there's an overlap. 44029: MNT-180 - Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily 44040: Merged V3.4-BUF-GIX (3.4.12) to V4.1-BUG-FIX (4.1.3) 44039: Minor changes to TransformerDebug to make output more readable when there are exceptions. - NPE when there is no exception message 44046: MERGE DEV to V4.1-BUG-FIX ALF-16562 : CIFS: Excel document version history lost after saving content in Excel:mac 2011 on Mac Mountain Lion 44115: Changes to standalone file state cache access mode checks to bring them into line with the clustered file state cache. 44160: Fix for ALF-13129, checks to see if the child association already exists on the versioned node. If it exists it doesn't add it again. 44239: ALF-16977: InstallerBuilder 8.5.1 2012-11-29 with layout fix from Bitrock 44319: Latest installer translations from Gloria 44343: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3) 44339: ALF-17070: Merged to V4.1 (4.1.2) from V4.1-BUG-FIX (3.4.12) << Regression introduced into 4.0.2 on 12/4/12 r35201 >> 44337: Merged DEV to V3.4-BUG-FIX (3.4.12) 44297: ALF-16935: wcm/avm file picker fails to render selection from folders navigation only works with 127.0.0.1 url - Fix for regression from ALF-11956, connected with setting titles for file picker controls 44316: Merged DEV to V4.1 44094: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder Add WebDAV MOVE handling for case when backup is enabled in Mac 2011 Word 44285: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder Handle Mac 2011 Word backup in scope of RenameShuffle 44312: Part 3 for ALF-16895 SOLR: Cannot find files after restart and reindex solr - fix incremental cache state to cope with duplicate leaf/aux doc entries. 44283: Encoding fix by David Webster 44275: Part 2 for ALF-16895 SOLR: Cannot find files after restart and reindex solr - fix initial cache state to cope with duplicate leaf/aux doc entries. 44252: Russian fix from Gloria 44200: Probable fix for ALF-16895 SOLR: Cannot find files after restart and reindex solr - still difficult to reproduce 44149: Merged HEAD to V4.1 44037: ALF-16947: prevent dependency to web-framework-commons war to be transitive: this artifact is not generated in Ant build 44039: Version in parent-pom was not changed properly when deploying to Maven repo 44142: ITALIAN: Translation update based on EN r43623, fixes ALF-16609 44107: ALF-16016, ALF-15991, ALF-16180: Russian fixes by Gloria 44078: ALF-16620: Out of memory Error applying CopiedFromAspectPatch - CopiedFromAspectPatch.WorkProvider.getNextWork() was fetching discrete managable chunks - and then blowing up as it continually fetched into the same in-memory HashSet! 44404: Merged DEV to V4.1-BUG-FIX 44378: ALF-16791 : resource bundle deployement for localization does not work with the dynamic approach 1. Split out MessageService message lookup methods into new interface MessageLookup that lives in DataModel 2. Added a simple implementation for SOLR to use 3. Made M2Label look up model labels via a supplied MessageLookup argument 4. Make DictionaryService extend MessageLookup so that it's easy to find a MessageLookup if you've got a DictionaryService 5. Accounted for interface changes throughout. 44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3) 44419: ALF-17045 If GhostScript is not installed, deletion of content is not working - Not just Ghostscript but any thumbnail failure 44422: ALF-16123: "CheckOutCheckInService.checkout fails with DuplicateChildNodeNameException if no working copy label message found in current locale" 44424: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3) RECORD ONLY 44423: ALF-17114: Merged V4.1-BUG-FIX (4.1.3) to V4.1 (4.1.2) - got the wrong branch 44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3) 44419: ALF-17045 If GhostScript is not installed, deletion of content is not working - Not just Ghostscript but any thumbnail failure 44447: Merged V4.0.2 (4.0.0.22) to V4.1-BUG-FIX (4.1.3) RECORD ONLY << Recording this as RECORD ONLY as it turns out the DEV code came form V4.1-BUG-FIX r42431 >> 44435: Merged DEV to V4.0.2 (4.0.2.22) 44429: MNT-232: Upgrade from 3.4.9 to 4.0.2 - FAILED - Initialize rootRefs in the property definition to prevent NPE. 44468: Merged V3.4-PATCHES to V4.1-BUG-FIX MNT-211 (Still needs implementing on 4.1) 44470: Fixes: ALF-16878 - don't use IE8's native JSON stringify method. 44511: ALF-16791: Added missing class. 44519: ALF-16791: Fixed broken unit tests 44541: Fix for ALF-17151 SOLR - add support to disable permission checks 44542: MNT-211 Re-implement on 4.1 44548: ALF-16791: Fixed broken SOLR 44559: ALF-17075: "Exporting and importing null MLText values does not work." 44577: Final part for ALF-16558 SOLR tracking does not do incremental updates but one single chunk - fixed code so SolrSearchers are held for as little time as possible 44590: ALF-14523 (Share - Metadata constraint on workflow creation) 44594: ALF-16310: "Calling CancelCheckout() on the original document deletes the document." 44596: ALF-17075: "Exporting and importing null MLText values does not work." - change test name to something more meaningful 44599: ALF-16310: "Calling CancelCheckout() on the original document deletes the document." 44600: ALF-16791: Another omission not covered by unit tests 44603: ALF-14201: upgrade activiti to 5.7-20121211 44605: Added missing vti.server.url.path.prefix property required by commit 43471 Missing due to cherry picked commit, this is implemented as part of 39309 on HEAD. 44606: ALF-14201: upgrade activiti to 5.7-20121211 in Maven poms 44613: ALF-13690 (Share - It's possible to delete site groups via the UI) 44618: ALF-16939: "Error "importStatus.batchWeight is undefined" is thrown when Bulk Importer status webscript is run for XML format" 44621: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX 44620: MNT-247: Merged DEV to PATCHES/V4.1.1 with corrections 44526: ALF-16964: Share alfrescoCookie connector fails when alfresco.authentication.allowGuestLogin=false, use case proxy between share and alfresco Check if external authentication is active in BaseServlet 44628: Solution for ALF-3780 - Dashboard settings not deleted for deleted user. Initial implementation by Dmitry Velichkevich. Surf user config folder and user Surf dynamic component references are removed when user node is deleted via a Delete Node policy. 44632: addition of validation of NetworkFile isClosed property. 44648: Merge V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.3) 44566: ALF-17164: Add SVN revision in version.properties when building in continuous mode 44602: ALF-17164: adding the SCM revision in version.build so that it is displayed also, sneak in the SVN path, so that tracability is complete 44650: BDE-111: Stop creating installers in parallel, it fails on pbld02. Also, revert to zip compression to gain build time 44651: ALF-14348 (Unable to update external blog configuration details) 44654: Merged DEV to V4.1-BUG-FIX 44614: ALF-17119: Possible UI bug - "$$" chars added to permissions for IMAP Attachments folder Added a message bundles for FullControll access role. 44655: Merged DEV to V4.1-BUG-FIX 44593: ALF-14154: Encoding problem when open a file via webdav on Windows XP Ignore user credentials for the OPTIONS request. 44612: ALF-14154 : Encoding problem when open a file via webdav on Windows XP Ignore user credentials for the OPTIONS request. 44666: ALF-12001: Privacy: blog activities - activity is seen for draft blogs - Wrong node was being used for access checks - Fix by Andrey Chernov 44671: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 43939: ALF-17197 / ALF-16917: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX 43896: MNT-198: Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters - Now we can cope with a runAs where the username is in the wrong case 44296: ALF-17203 / ALF-17201 / MNT-216 : error saving versionable word documents git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-08-07 17:49:17 +00:00 · 2012-12-13 14:16:40 +00:00
parent d48fa4be2c
commit a794361ac2
73 changed files with 1866 additions and 264 deletions
--- a/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
+++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
@@ -277,6 +277,7 @@ public class ContentDiskDriverTest extends TestCase
        final NetworkFile file = driver.createFile(testSession, testConnection, params);
        assertNotNull("file is null", file);
        assertFalse("file is read only, should be read-write", file.isReadOnly());
+        assertFalse("file is not closed ", file.isClosed());
        
        RetryingTransactionCallback<Void> writeStuffCB = new RetryingTransactionCallback<Void>() {

@@ -643,6 +644,7 @@ public class ContentDiskDriverTest extends TestCase
        
        NetworkFile file = driver.openFile(testSession, testConnection, params);
        assertNotNull(file);
+        assertFalse("file is closed", file.isClosed());
        
        /**
         * Step 3: Open the root directory.
@@ -652,6 +654,7 @@ public class ContentDiskDriverTest extends TestCase
        FileOpenParams rootParams = new FileOpenParams("\\", FileAction.CreateNotExist, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
        NetworkFile file3 = driver.openFile(testSession, testConnection, rootParams);
        assertNotNull(file3);
+        assertFalse("file is closed", file3.isClosed());

                
    } // testOpenFile
@@ -3216,8 +3219,223 @@ public class ContentDiskDriverTest extends TestCase
        
    }

+    /**
+     * Excel 2003 CSV file with Versionable file 
+     * 
+     * CreateFile csv.csv and 5EE27101 
+     * Add versionable aspect 
+     * RenameFile oldPath:\Espaces Utilisateurs\System\csv.csv, newPath:\Espaces\Utilisateurs\System\5EE27101 
+     * CreateFile name=\Espaces Utilisateurs\System\csv.csv
+     * Add content
+     */
+    public void testCSVExcel2003SaveShuffle() throws Exception
+    {
+        logger.debug("testCSVExcel2003SaveShuffle");
+        final String FILE_NAME = "csv.csv";
+        final String FILE_TITLE = "csv";
+        final String FILE_DESCRIPTION = "This is a test document to test CIFS shuffle";
+        final String FILE_TEMP = "AAAA0000";

+        class TestContext
+        {
+            NetworkFile firstFileHandle;
+            NetworkFile newFileHandle;

+            NodeRef testNodeRef;
+
+            Serializable testCreatedDate;
+        }
+        ;
+
+        final TestContext testContext = new TestContext();
+
+        final String TEST_DIR = TEST_ROOT_DOS_PATH + "\\testMSExcel2003CSVShuffle";
+
+        ServerConfiguration scfg = new ServerConfiguration("testServer");
+        TestServer testServer = new TestServer("testServer", scfg);
+        final SrvSession testSession = new TestSrvSession(666, testServer, "test", "remoteName");
+        DiskSharedDevice share = getDiskSharedDevice();
+        final TreeConnection testConnection = testServer.getTreeConnection(share);
+        final RetryingTransactionHelper tran = transactionService.getRetryingTransactionHelper();
+
+        /**
+         * Clean up from a previous run
+         */
+        RetryingTransactionCallback<Void> deleteGarbageFileCB = new RetryingTransactionCallback<Void>()
+        {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                driver.deleteFile(testSession, testConnection, TEST_DIR + "\\" + FILE_NAME);
+                return null;
+            }
+        };
+
+        try
+        {
+            tran.doInTransaction(deleteGarbageFileCB);
+        }
+        catch (Exception e)
+        {
+            // expect to go here
+        }
+
+        /**
+         * Create a file in the test directory
+         */
+        RetryingTransactionCallback<Void> createTestFileFirstTime = new RetryingTransactionCallback<Void>()
+        {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+
+                /**
+                 * Create the test directory we are going to use
+                 */
+                FileOpenParams createRootDirParams = new FileOpenParams(TEST_ROOT_DOS_PATH, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                FileOpenParams createDirParams = new FileOpenParams(TEST_DIR, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                driver.createDirectory(testSession, testConnection, createRootDirParams);
+                driver.createDirectory(testSession, testConnection, createDirParams);
+
+                /**
+                 * Create the file we are going to use
+                 */
+                FileOpenParams createFileParams = new FileOpenParams(TEST_DIR + "\\" + FILE_NAME, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                testContext.firstFileHandle = driver.createFile(testSession, testConnection, createFileParams);
+                assertNotNull(testContext.firstFileHandle);
+
+                testContext.testNodeRef = getNodeForPath(testConnection, TEST_DIR + "\\" + FILE_NAME);
+
+                nodeService.setProperty(testContext.testNodeRef, ContentModel.PROP_TITLE, FILE_TITLE);
+                nodeService.setProperty(testContext.testNodeRef, ContentModel.PROP_DESCRIPTION, FILE_DESCRIPTION);
+
+                return null;
+            }
+        };
+        tran.doInTransaction(createTestFileFirstTime, false, true);
+
+        /**
+         * Write some content to the test file. Add versionable aspect
+         */
+        RetryingTransactionCallback<Void> writeToTestFileAndAddVersionableAspect = new RetryingTransactionCallback<Void>()
+        {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                String testContent = "MS Excel 2003 for CSV shuffle test";
+                byte[] testContentBytes = testContent.getBytes();
+                testContext.firstFileHandle.writeFile(testContentBytes, testContentBytes.length, 0, 0);
+                testContext.firstFileHandle.close();
+
+                testContext.testCreatedDate = nodeService.getProperty(testContext.testNodeRef, ContentModel.PROP_CREATED);
+
+                nodeService.addAspect(testContext.testNodeRef, ContentModel.ASPECT_VERSIONABLE, null);
+
+                return null;
+            }
+        };
+        tran.doInTransaction(writeToTestFileAndAddVersionableAspect, false, true);
+
+        /**
+         * rename the test file to the temp
+         */
+        RetryingTransactionCallback<Void> renameTestFileToTemp = new RetryingTransactionCallback<Void>()
+        {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                driver.renameFile(testSession, testConnection, TEST_DIR + "\\" + FILE_NAME, TEST_DIR + "\\" + FILE_TEMP);
+                return null;
+            }
+        };
+        tran.doInTransaction(renameTestFileToTemp, false, true);
+
+        /**
+         * create the test file one more
+         */
+        RetryingTransactionCallback<Void> createTestFileOneMore = new RetryingTransactionCallback<Void>()
+        {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+
+                FileOpenParams params = new FileOpenParams(TEST_DIR + "\\" + FILE_NAME, FileAction.TruncateExisting, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                NetworkFile file = driver.createFile(testSession, testConnection, params);
+                driver.closeFile(testSession, testConnection, file);
+
+                return null;
+            }
+        };
+        tran.doInTransaction(createTestFileOneMore, false, true);
+        
+      /**
+      * Write the new content
+      */
+     RetryingTransactionCallback<Void> writeUpdate = new RetryingTransactionCallback<Void>()
+     {
+
+         @Override
+         public Void execute() throws Throwable
+         {
+             FileOpenParams createFileParams = new FileOpenParams(TEST_DIR + "\\" + FILE_NAME, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+             testContext.newFileHandle = driver.openFile(testSession, testConnection, createFileParams);
+             assertNotNull(testContext.newFileHandle);
+             String testContent = "MS Word 2003 for CSV shuffle test This is new content";
+             byte[] testContentBytes = testContent.getBytes();
+             testContext.newFileHandle.writeFile(testContentBytes, testContentBytes.length, 0, 0);
+             testContext.newFileHandle.close();
+
+             return null;
+         }
+     };
+     tran.doInTransaction(writeUpdate, false, true);
+
+        // Check results
+        RetryingTransactionCallback<Void> validate = new RetryingTransactionCallback<Void>()
+        {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                NodeRef shuffledNodeRef = getNodeForPath(testConnection, TEST_DIR + "\\" + FILE_NAME);
+
+                // Check versionable aspect, version label and nodeRef
+                assertTrue("VERSIONABLE aspect not present", nodeService.hasAspect(shuffledNodeRef, ContentModel.ASPECT_VERSIONABLE));
+                assertEquals("nodeRef changed", testContext.testNodeRef, shuffledNodeRef);
+    
+                // Check the titled aspect is correct
+                assertEquals("name wrong", FILE_NAME, nodeService.getProperty(shuffledNodeRef, ContentModel.PROP_NAME));
+                assertEquals("title wrong", FILE_TITLE, nodeService.getProperty(shuffledNodeRef, ContentModel.PROP_TITLE));
+                assertEquals("description wrong", FILE_DESCRIPTION, nodeService.getProperty(shuffledNodeRef, ContentModel.PROP_DESCRIPTION));
+
+                return null;
+            }
+        };
+
+        tran.doInTransaction(validate, true, true);
+
+        /**
+         * Clean up just in case garbage is left from a previous run
+         */
+        RetryingTransactionCallback<Void> deleteTestFile = new RetryingTransactionCallback<Void>()
+        {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                driver.deleteFile(testSession, testConnection, TEST_DIR + "\\" + FILE_NAME);
+                return null;
+            }
+        };
+
+        tran.doInTransaction(deleteTestFile, false, true);
+
+    }

    /**
     * Simulates a SaveAs from Word2003
@@ -3468,9 +3686,12 @@ public class ContentDiskDriverTest extends TestCase
            {   
                logger.debug("create file and close it immediatly");
                FileOpenParams createFileParams = new FileOpenParams(FILE_PATH, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
-                NetworkFile dummy = driver.createFile(testSession, testConnection, createFileParams);    
+                NetworkFile dummy = driver.createFile(testSession, testConnection, createFileParams);  
+                assertFalse("file is closed after create", dummy.isClosed());
                driver.closeFile(testSession, testConnection, dummy);
                logger.debug("after create and close");
+// TODO Bug in JavaNetworkFile                
+//                assertTrue("file is not closed after close", dummy.isClosed());
                return null;
            }
        };
@@ -3487,6 +3708,7 @@ public class ContentDiskDriverTest extends TestCase
        logger.debug("open file1 read only");
        NetworkFile file1 = driver.openFile(testSession, testConnection, openRO);
        assertNotNull(file1);
+        assertFalse("file1 is closed", file1.isClosed());
        
        final String testString = "Yankee doodle went to town";
        byte[] stuff = testString.getBytes("UTF-8");
@@ -3507,6 +3729,7 @@ public class ContentDiskDriverTest extends TestCase
        logger.debug("open file 2 for read write");
        NetworkFile file2 = driver.openFile(testSession, testConnection, openRW);
        assertNotNull(file2);
+        assertFalse("file is closed", file2.isClosed());

        /**
         * Write Some Content 
@@ -3531,8 +3754,8 @@ public class ContentDiskDriverTest extends TestCase
        /**
         * Step 2: Negative test - Close the file again - should do nothing quietly!
         */
-//        logger.debug("this is a negative test - should do nothing");
-//        driver.closeFile(testSession, testConnection, file1);
+        logger.debug("this is a negative test - should do nothing");
+        driver.closeFile(testSession, testConnection, file1);
        
        logger.debug("now validate");
         
@@ -5080,6 +5303,197 @@ public class ContentDiskDriverTest extends TestCase
        
    } // testScenarioMSPowerpoint2011MacSaveShuffle

+    /**
+     * Simulates a Save from Excel 2011 Mac
+     * 0. FileA.xlsx already exists.
+     * 1. Create new document ._A8A09200
+     * 2. Delete FileA.xlsx
+     * 3. Rename ._A8A09200 to FileA.xlsx 
+     */
+    public void testScenarioMSExcel2011MacSaveShuffle() throws Exception
+    {
+        logger.debug("testScenarioMSExcel2011MacSaveShuffle(");
+        
+        final String FILE_NAME = "FileA.xlsx";
+        final String FILE_NEW_TEMP = "._A8A09200";
+        
+        class TestContext
+        {
+            NetworkFile firstFileHandle;
+        };
+        
+        final TestContext testContext = new TestContext();
+        
+        final String TEST_DIR = TEST_ROOT_DOS_PATH + "\\testScenarioMSExcel2011MacSaveShuffle";
+        
+        ServerConfiguration scfg = new ServerConfiguration("testServer");
+        TestServer testServer = new TestServer("testServer", scfg);
+        final SrvSession testSession = new TestSrvSession(666, testServer, "cifs", "remoteName");
+        DiskSharedDevice share = getDiskSharedDevice();
+        final TreeConnection testConnection = testServer.getTreeConnection(share);
+        final RetryingTransactionHelper tran = transactionService.getRetryingTransactionHelper();        
+
+        /**
+         * Clean up just in case garbage is left from a previous run
+         */
+        RetryingTransactionCallback<Void> deleteGarbageFileCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                driver.deleteFile(testSession, testConnection, TEST_DIR + "\\" + FILE_NAME);
+                return null;
+            }
+        };
+     
+        /**
+         * Create a file in the test directory
+         */    
+        
+        try
+        {
+            logger.debug("expect to get exception - cleaning garbage");
+            tran.doInTransaction(deleteGarbageFileCB);
+        }
+        catch (Exception e)
+        {
+            // expect to go here
+        }
+        
+        logger.debug("0) create new file");
+        RetryingTransactionCallback<Void> createFileCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+  
+                /**
+                 * Create the test directory we are going to use 
+                 */
+                FileOpenParams createRootDirParams = new FileOpenParams(TEST_ROOT_DOS_PATH, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                FileOpenParams createDirParams = new FileOpenParams(TEST_DIR, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                driver.createDirectory(testSession, testConnection, createRootDirParams);
+                driver.createDirectory(testSession, testConnection, createDirParams);
+                
+                /**
+                 * Create the file we are going to use (FileA.xlsx)
+                 */
+                FileOpenParams createFileParams = new FileOpenParams(TEST_DIR + "\\" + FILE_NAME, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                testContext.firstFileHandle = driver.createFile(testSession, testConnection, createFileParams);
+                assertNotNull(testContext.firstFileHandle);
+                
+                driver.closeFile(testSession, testConnection, testContext.firstFileHandle); 
+                
+                NodeRef file1NodeRef = getNodeForPath(testConnection, TEST_DIR + "\\" + FILE_NAME);
+                nodeService.addAspect(file1NodeRef, ContentModel.ASPECT_VERSIONABLE, null);
+
+                return null;
+            }
+        };
+        tran.doInTransaction(createFileCB, false, true);
+             
+        /**
+         * b) Save the new file
+         * Write ContentDiskDriverTest3.doc to the test file,
+         */
+        logger.debug("b) write some content");
+        RetryingTransactionCallback<Void> writeFileCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                FileOpenParams createFileParams = new FileOpenParams(TEST_DIR + "\\" + FILE_NEW_TEMP, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0);
+                testContext.firstFileHandle = driver.createFile(testSession, testConnection, createFileParams);    
+         
+                ClassPathResource fileResource = new ClassPathResource("filesys/ContentDiskDriverTest3.doc");
+                assertNotNull("unable to find test resource filesys/ContentDiskDriverTest3.doc", fileResource);
+
+                byte[] buffer= new byte[1000];
+                InputStream is = fileResource.getInputStream();
+                try
+                {
+                    long offset = 0;
+                    int i = is.read(buffer, 0, buffer.length);
+                    while(i > 0)
+                    {
+                        testContext.firstFileHandle.writeFile(buffer, i, 0, offset);
+                        offset += i;
+                        i = is.read(buffer, 0, buffer.length);
+                    }                 
+                }
+                finally
+                {
+                    is.close();
+                }
+            
+                driver.closeFile(testSession, testConnection, testContext.firstFileHandle);   
+                    
+                return null;
+            }
+        };
+        tran.doInTransaction(writeFileCB, false, true);
+        
+        /**
+         * c) delete the old file
+         */
+        logger.debug("c) delete old file");
+        RetryingTransactionCallback<Void> renameOldFileCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                driver.deleteFile(testSession, testConnection, TEST_DIR + "\\" + FILE_NAME);
+                return null;
+            }
+        };
+        tran.doInTransaction(renameOldFileCB, false, true);
+           
+        /**
+         * d) Move the new file into place, stuff should get shuffled
+         */
+        logger.debug("d) rename new file into place");
+        RetryingTransactionCallback<Void> moveNewFileCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                driver.renameFile(testSession, testConnection, TEST_DIR + "\\" + FILE_NEW_TEMP, TEST_DIR + "\\" + FILE_NAME); 
+                return null;
+            }
+        };
+        
+        tran.doInTransaction(moveNewFileCB, false, true);
+        
+        logger.debug("e) validate results");
+        /**
+         * Now validate everything is correct
+         */
+        RetryingTransactionCallback<Void> validateCB = new RetryingTransactionCallback<Void>() {
+
+            @Override
+            public Void execute() throws Throwable
+            {
+               NodeRef shuffledNodeRef = getNodeForPath(testConnection, TEST_DIR + "\\" + FILE_NAME);
+               
+               Map<QName, Serializable> props = nodeService.getProperties(shuffledNodeRef);
+               
+               ContentData data = (ContentData)props.get(ContentModel.PROP_CONTENT);
+               assertNotNull("data is null", data);
+               assertEquals("size is wrong", 26112, data.getSize());
+               assertEquals("mimeType is wrong", "application/msword",data.getMimetype());
+               
+               assertTrue("versionable aspect missing", nodeService.hasAspect(shuffledNodeRef, ContentModel.ASPECT_VERSIONABLE));
+               assertTrue("hidden aspect still applied", !nodeService.hasAspect(shuffledNodeRef, ContentModel.ASPECT_HIDDEN));
+               assertTrue("temporary aspect still applied", !nodeService.hasAspect(shuffledNodeRef, ContentModel.ASPECT_TEMPORARY));
+           
+               return null;
+            }
+        };
+        
+        tran.doInTransaction(validateCB, true, true);
+        
+    } // testScenarioMSExcel2011MacSaveShuffle
+
    /**
     * This test tries to simulate the cifs shuffling that is done to
     * support MS Word 2011 on Mac with backup turned on.