Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)

115466 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114587 amorarasu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114483 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114306 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114282 adragoi: Merged DEV to V4.2.5 (4.2.5)
                  114252: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - configured cmis tck timeout in tests property file


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

source/test-java/org/alfresco/opencmis/OpenCMISClientContext.java

@@ -23,10 +23,12 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 
 import org.apache.chemistry.opencmis.commons.SessionParameter;
 import org.apache.chemistry.opencmis.commons.enums.BindingType;
 import org.apache.chemistry.opencmis.tck.impl.JUnitHelper;
+import org.springframework.context.ApplicationContext;
 
 /**
  * Encapsulates Chemistry OpenCMIS client connection details and creates a parameters file for running the
@@ -39,7 +41,7 @@ public class OpenCMISClientContext
 {
 	private Map<String, String> cmisParameters;
 	
-	public OpenCMISClientContext(BindingType bindingType, String url, String username, String password, Map<String, String> parameters) throws IOException
+	public OpenCMISClientContext(BindingType bindingType, String url, String username, String password, Map<String, String> parameters, ApplicationContext ctx) throws IOException
 	{
     	cmisParameters = new HashMap<String, String>();
     	cmisParameters.putAll(parameters);
@@ -54,9 +56,21 @@ public class OpenCMISClientContext
     	}
     	cmisParameters.put(SessionParameter.USER, username);
     	cmisParameters.put(SessionParameter.PASSWORD, password);
+    	
+    	if (ctx != null)
+    	{
+    		Properties properties =  (Properties)ctx.getBean("global-properties");
+        	cmisParameters.put(SessionParameter.CONNECT_TIMEOUT, properties.getProperty("opencmis.tck.connecttimeout"));
+        	cmisParameters.put(SessionParameter.READ_TIMEOUT, properties.getProperty("opencmis.tck.readtimeout"));
+    	}
     	createCMISParametersFile();
 	}
 	
+	public OpenCMISClientContext(BindingType bindingType, String url, String username, String password, Map<String, String> parameters) throws IOException
+	{
+    	this(bindingType, url, username, password, parameters, null);
+	}
+
 	protected void createCMISParametersFile() throws IOException
 	{
     	File f = File.createTempFile("OpenCMISTCKContext", "" + System.currentTimeMillis(), new File(System.getProperty("java.io.tmpdir")));

source/test-java/org/alfresco/rest/api/tests/TestEnterpriseAtomPubTCK.java

@@ -124,7 +124,7 @@ public class TestEnterpriseAtomPubTCK extends AbstractEnterpriseOpenCMIS10TCKTes
     	cmisParameters.put(TestParameters.DEFAULT_RELATIONSHIP_TYPE, "R:cm:replaces");
     	cmisParameters.put(TestParameters.DEFAULT_TEST_FOLDER_PARENT, "/" + name);
     	clientContext = new OpenCMISClientContext(BindingType.ATOMPUB,
-    			MessageFormat.format(CMIS_URL, "localhost", String.valueOf(port), "alfresco"), "admin", "admin", cmisParameters);
+    			MessageFormat.format(CMIS_URL, "localhost", String.valueOf(port), "alfresco"), "admin", "admin", cmisParameters, jetty.getApplicationContext());
 
         overrideVersionableAspectProperties(jetty.getApplicationContext());
 	}

source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub10TCK.java

@@ -47,7 +47,7 @@ public class TestPublicApiAtomPub10TCK extends AbstractEnterpriseOpenCMIS10TCKTe
     	cmisParameters.put(TestParameters.DEFAULT_RELATIONSHIP_TYPE, "R:cm:replaces");
     	clientContext = new OpenCMISClientContext(BindingType.ATOMPUB,
     			MessageFormat.format(CMIS_URL, "localhost", String.valueOf(port), "alfresco", network.getId(), "public"),
-    			"admin@" + network.getId(), "admin", cmisParameters);
+    			"admin@" + network.getId(), "admin", cmisParameters, getTestFixture().getJettyComponent().getApplicationContext());
         overrideVersionableAspectProperties(getTestFixture().getJettyComponent().getApplicationContext());
 	}
 

source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub11TCK.java

@@ -35,7 +35,7 @@ public class TestPublicApiAtomPub11TCK extends AbstractEnterpriseOpenCMIS11TCKTe
         cmisParameters.put(TestParameters.DEFAULT_ITEM_TYPE, "I:cm:cmobject");
     	clientContext = new OpenCMISClientContext(BindingType.ATOMPUB,
     			MessageFormat.format(CMIS_URL, "localhost", String.valueOf(port), "alfresco", network.getId(), "public"),
-    			"admin@" + network.getId(), "admin", cmisParameters);
+    			"admin@" + network.getId(), "admin", cmisParameters, getTestFixture().getJettyComponent().getApplicationContext());
         overrideVersionableAspectProperties(getTestFixture().getJettyComponent().getApplicationContext());
 	}
 

source/test-java/org/alfresco/rest/api/tests/TestPublicApiBrowser11TCK.java

@@ -34,7 +34,7 @@ public class TestPublicApiBrowser11TCK extends AbstractEnterpriseOpenCMIS11TCKTe
         cmisParameters.put(TestParameters.DEFAULT_ITEM_TYPE, "I:cm:cmobject");
     	clientContext = new OpenCMISClientContext(BindingType.BROWSER,
     			MessageFormat.format(CMIS_URL, "localhost", String.valueOf(port), "alfresco", network.getId(), "public"),
-    			"admin@" + network.getId(), "admin", cmisParameters);
+    			"admin@" + network.getId(), "admin", cmisParameters, getTestFixture().getJettyComponent().getApplicationContext());
         overrideVersionableAspectProperties(getTestFixture().getJettyComponent().getApplicationContext());
 	}
 }

source/test-resources/alfresco-global.properties

@@ -0,0 +1,2 @@
+opencmis.tck.readtimeout=10000
+opencmis.tck.connecttimeout=10000