distribute-timestamps of cluster and move property to common #994

Author: ehennum

marklogic-client-api/src/test/java/com/marklogic/client/test/Common.java

@@ -69,6 +69,8 @@ public class Common {
   final public static DatabaseClient.ConnectionPolicy CONNECT_POLICY =
       DatabaseClient.ConnectionPolicy.valueOf(System.getProperty("TEST_CONNECT_POLICY", "FOREST_HOSTS"));
 
+  final public static boolean BALANCED = Boolean.parseBoolean(System.getProperty("TEST_BALANCED", "false"));
+
   public static DatabaseClient client;
   public static DatabaseClient adminClient;
   public static DatabaseClient serverAdminClient;

marklogic-client-api/src/test/java/com/marklogic/client/test/util/TestServerBootstrapper.java

@@ -49,8 +49,6 @@ public class TestServerBootstrapper {
   private String host = Common.HOST;
   private int port = Common.PORT;
 
-  final public static boolean BALANCED = Boolean.parseBoolean(System.getProperty("TEST_BALANCED", "false"));
-
   private void bootstrapRestServer() throws ClientProtocolException, IOException {
 
     Bootstrapper.main(new String[] {"-configuser", username, "-configpassword", password, "-confighost", host, "-restserver", "java-unittest", "-restport", ""+port, "-restdb", "java-unittest"});
@@ -76,7 +74,7 @@ private void deleteRestServer() throws ClientProtocolException, IOException {
   }
 
   private void invokeBootstrapExtension() throws ClientProtocolException, IOException {
-    final String params = BALANCED ? "?rs%3Abalanced=true" : "";
+    final String params = Common.BALANCED ? "?rs%3Abalanced=true" : "";
 
     DefaultHttpClient client = new DefaultHttpClient();
 

marklogic-client-api/src/test/resources/bootstrap.xqy

@@ -1307,7 +1307,7 @@ declare function bootstrap:appserver-config()
     let $groupid  := admin:group-get-id($config, "Default")
     let $serverid := admin:appserver-get-id($config, $groupid, "java-unittest")
     return $config
-        => admin:appserver-set-distribute-timestamps($serverid,"strict")
+        => admin:appserver-set-distribute-timestamps($serverid,"cluster")
         => admin:save-configuration-without-restart()
 };