Merge branch 'master' into dev

Author: rjrudin

src/main/java/com/marklogic/mgmt/clusters/ClusterManager.java

@@ -4,6 +4,7 @@
 import com.marklogic.mgmt.ManageClient;
 import com.marklogic.mgmt.admin.ActionRequiringRestart;
 import com.marklogic.mgmt.admin.AdminManager;
+import com.marklogic.rest.util.Fragment;
 
 public class ClusterManager extends AbstractManager {
 
@@ -29,4 +30,9 @@ public boolean execute() {
             }
         });
     }
+
+    public String getVersion() {
+    	Fragment f = manageClient.getXml("/manage/v2");
+	    return f.getElementValue("/c:local-cluster-default/c:version");
+    }
 }

src/main/java/com/marklogic/rest/util/Fragment.java

@@ -29,6 +29,7 @@ public Fragment(String xml, Namespace... namespaces) {
         try {
             internalDoc = new SAXBuilder().build(new StringReader(xml));
             List<Namespace> list = new ArrayList<Namespace>();
+            list.add(Namespace.getNamespace("c", "http://marklogic.com/manage/clusters"));
             list.add(Namespace.getNamespace("db", "http://marklogic.com/manage/databases"));
             list.add(Namespace.getNamespace("f", "http://marklogic.com/manage/forests"));
             list.add(Namespace.getNamespace("h", "http://marklogic.com/manage/hosts"));

src/test/java/com/marklogic/appdeployer/command/viewschemas/ManageViewSchemasTest.java

@@ -1,5 +1,6 @@
 package com.marklogic.appdeployer.command.viewschemas;
 
+import com.marklogic.mgmt.clusters.ClusterManager;
 import org.jdom2.Namespace;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
@@ -67,9 +68,13 @@ protected void afterResourcesCreated() {
         String body = response.getBody();
         body = body.substring(body.indexOf("<json:array"));
 
+        String version = new ClusterManager(manageClient).getVersion();
+        // This changed between ML8 and ML9
+        String expectedAmount = version != null && version.startsWith("8") ? "amount": "main.ordertable.amount";
+
         Fragment xml = new Fragment("<results>" + body + "</results>",
                 Namespace.getNamespace("json", "http://marklogic.com/xdmp/json"));
-        xml.assertElementValue("/results/json:array[1]/json:value", "amount");
+        xml.assertElementValue("/results/json:array[1]/json:value", expectedAmount);
         xml.assertElementValue("/results/json:array[2]/json:value", "111");
         xml.assertElementValue("/results/json:array[3]/json:value", "222");
     }