Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

57478: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57288: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         57264: ALF-14221: Creation and Modification Date Tests Fail in Timezones Other than BST
            - Set default time zone to Europe/London in AbstractMetadataExtracterTest
         MNT-9566: Intermittent test failure OpenDocumentMetadataExtracterTest.testSupportedMimetypes
            - Changed OpenDocumentMetadataExtracterTest to run against date objects rather than strings


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

source/test-java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java

@@ -24,6 +24,7 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 
 import junit.framework.TestCase;
 
@@ -41,6 +42,7 @@ import org.alfresco.service.namespace.QName;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.PropertyMap;
 import org.alfresco.util.TempFileProvider;
+import org.joda.time.DateTimeZone;
 import org.springframework.context.ApplicationContext;
 
 /**
@@ -84,6 +86,11 @@ public abstract class AbstractMetadataExtracterTest extends TestCase
         // perform a little cleaning up
         long now = System.currentTimeMillis();
         TempFileProvider.TempFileCleanerJob.removeFiles(now);
+        
+        TimeZone tz = TimeZone.getTimeZone("Europe/London");
+        TimeZone.setDefault(tz);
+        // Joda time has already grabbed the JVM zone so re-set it here
+        DateTimeZone.setDefault(DateTimeZone.forTimeZone(tz));
     }
     
     /**