From ac14dcf8f58e8bfc0bc59e8fd76ee0a1c6adc80e Mon Sep 17 00:00:00 2001
From: Geert Josten <geert.josten@marklogic.com>
Date: Thu, 11 Jan 2018 06:43:18 +0100
Subject: [PATCH] Fixed #819: allow skipping of indexes, fragment roots,
 lexicons, fields, etc. Also some code cleanup.

---
 deploy/lib/MLClient.rb                    |   2 +-
 deploy/lib/xquery/setup.xqy               | 823 +++++++++------------
 deploy/test/data/ml9-config-changed.xml   |  18 +
 deploy/test/data/ml9-config-unchanged.xml | 849 ++++++++++++++++++++++
 deploy/test/test_server_config.rb         |  27 +-
 5 files changed, 1250 insertions(+), 469 deletions(-)
 create mode 100644 deploy/test/data/ml9-config-unchanged.xml

diff --git a/deploy/lib/MLClient.rb b/deploy/lib/MLClient.rb
index 736c8443..ab403334 100644
--- a/deploy/lib/MLClient.rb
+++ b/deploy/lib/MLClient.rb
@@ -110,7 +110,7 @@ def go(url, verb, headers = nil, params = nil, body = nil, xcc = false)
     end
 
     request_params[:request].use_xcc(xcc)
-    logger.debug(params)
+    #logger.debug(params)
     response = get_http.request request_params
     response.value
     response
diff --git a/deploy/lib/xquery/setup.xqy b/deploy/lib/xquery/setup.xqy
index 32691e33..5f955d5e 100644
--- a/deploy/lib/xquery/setup.xqy
+++ b/deploy/lib/xquery/setup.xqy
@@ -2129,11 +2129,11 @@ declare function setup:configure-indexes($import-config as element(configuration
   let $database := xdmp:database($database-name)
   let $admin-config := admin:get-configuration()
 
-  let $admin-config := setup:remove-existing-range-path-indexes($admin-config, $database)
-  let $admin-config := setup:remove-existing-geospatial-path-indexes($admin-config, $database)
-  let $admin-config := setup:remove-existing-geospatial-region-path-indexes($admin-config, $database)
-  let $admin-config := setup:remove-existing-fields($admin-config, $database)
-  let $admin-config := setup:remove-existing-path-namespaces($admin-config, $database)
+  let $admin-config := setup:remove-existing-range-path-indexes($admin-config, $database, $db-config)
+  let $admin-config := setup:remove-existing-geospatial-path-indexes($admin-config, $database, $db-config)
+  let $admin-config := setup:remove-existing-geospatial-region-path-indexes($admin-config, $database, $db-config)
+  let $admin-config := setup:remove-existing-fields($admin-config, $database, $db-config)
+  let $admin-config := setup:remove-existing-path-namespaces($admin-config, $database, $db-config)
   let $admin-config := setup:add-range-element-indexes($admin-config, $database, $db-config)
   let $admin-config := setup:add-range-element-attribute-indexes($admin-config, $database, $db-config)
   let $admin-config := setup:add-path-namespaces($admin-config, $database, $db-config)
@@ -2200,10 +2200,14 @@ declare function setup:validate-databases-indexes($import-config as element(conf
 
 declare function setup:remove-existing-fields(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-field($admin-config, $database,
-    admin:database-get-fields($admin-config, $database)/db:field-name[fn:not(. = "")])
+  if (exists($db-config/db:fields) and not($db-config/db:fields/@append = "true")) then
+    admin:database-delete-field($admin-config, $database,
+      admin:database-get-fields($admin-config, $database)/db:field-name[fn:not(. = "")])
+  else
+    $admin-config
 };
 
 declare function setup:add-fields(
@@ -2414,10 +2418,14 @@ declare function setup:add-field-word-lexicons-R(
 
 declare function setup:remove-existing-range-element-indexes(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-range-element-index($admin-config, $database,
-    admin:database-get-range-element-indexes($admin-config, $database))
+  if (exists($db-config/db:range-element-indexes) and not($db-config/db:range-element-indexes/@append = "true")) then
+    admin:database-delete-range-element-index($admin-config, $database,
+      admin:database-get-range-element-indexes($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-range-element-indexes(
@@ -2426,43 +2434,21 @@ declare function setup:add-range-element-indexes(
   $db-config as element(db:database)) as element(configuration)
 {
   admin:database-add-range-element-index(
-    setup:remove-existing-range-element-indexes($admin-config, $database),
+    setup:remove-existing-range-element-indexes($admin-config, $database, $db-config),
     $database,
-    setup:validated-range-element-indexes(
-      $db-config/db:range-element-indexes/db:range-element-index
-    )
+    for $index-config in $db-config/db:range-element-indexes/db:range-element-index
+    return
+      admin:database-range-element-index(
+        $index-config/db:scalar-type,
+        $index-config/db:namespace-uri,
+        $index-config/db:localname/fn:string(.),
+        fn:string($index-config/db:collation[../db:scalar-type = 'string']),
+        ($index-config/db:range-value-positions/xs:boolean(.), false())[1],
+        ($index-config/db:invalid-values, $default-invalid-values)[1]
+      )
   )
 };
 
-declare function setup:validated-range-element-indexes(
-  $index-configs as element(db:range-element-index)*) as element(db:range-element-index)*
-{
-  let $function := xdmp:function(xs:QName("admin:database-range-element-index"))
-  let $validated-index-configs :=
-    for $index-config in $index-configs
-      return
-        if (setup:at-least-version("6.0-1")) then
-          xdmp:apply(
-            $function,
-            $index-config/db:scalar-type,
-            $index-config/db:namespace-uri,
-            $index-config/db:localname/fn:string(.),
-            fn:string($index-config/db:collation[../db:scalar-type = 'string']),
-            ($index-config/db:range-value-positions/xs:boolean(.), false())[1],
-            ($index-config/db:invalid-values, $default-invalid-values)[1]
-          )
-        else
-          xdmp:apply(
-            $function,
-            $index-config/db:scalar-type,
-            $index-config/db:namespace-uri,
-            $index-config/db:localname/fn:string(.),
-            fn:string($index-config/db:collation[../db:scalar-type = 'string']),
-            ($index-config/db:range-value-positions/xs:boolean(.), false())[1]
-          )
-  return $validated-index-configs
-};
-
 declare function setup:validate-range-element-indexes(
   $admin-config as element(configuration),
   $database as xs:unsignedLong,
@@ -2478,10 +2464,14 @@ declare function setup:validate-range-element-indexes(
 
 declare function setup:remove-existing-range-element-attribute-indexes(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-range-element-attribute-index($admin-config, $database,
-    admin:database-get-range-element-attribute-indexes($admin-config, $database))
+  if (exists($db-config/db:range-element-attribute-indexes) and not($db-config/db:range-element-attribute-indexes/@append = "true")) then
+    admin:database-delete-range-element-attribute-index($admin-config, $database,
+      admin:database-get-range-element-attribute-indexes($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-range-element-attribute-indexes(
@@ -2489,42 +2479,22 @@ declare function setup:add-range-element-attribute-indexes(
   $database as xs:unsignedLong,
   $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-add-range-element-attribute-index(setup:remove-existing-range-element-attribute-indexes($admin-config, $database),
+  admin:database-add-range-element-attribute-index(
+    setup:remove-existing-range-element-attribute-indexes($admin-config, $database, $db-config),
     $database,
-    setup:validated-range-element-attribute-indexes($db-config/db:range-element-attribute-indexes/db:range-element-attribute-index))
-};
-
-declare function setup:validated-range-element-attribute-indexes(
-  $index-configs as element(db:range-element-attribute-index)*) as element(db:range-element-attribute-index)*
-{
-  let $function := xdmp:function(xs:QName("admin:database-range-element-attribute-index"))
-  let $validated-index-configs :=
-    for $index-config in $index-configs
-      return
-        if (setup:at-least-version("6.0-1")) then
-          xdmp:apply(
-            $function,
-            $index-config/db:scalar-type,
-            $index-config/db:parent-namespace-uri,
-            $index-config/db:parent-localname/fn:string(.),
-            $index-config/db:namespace-uri,
-            $index-config/db:localname/fn:string(.),
-            fn:string($index-config/db:collation[../db:scalar-type = 'string']),
-            ($index-config/db:range-value-positions/xs:boolean(.), false())[1],
-            ($index-config/db:invalid-values, $default-invalid-values)[1]
-          )
-        else
-          xdmp:apply(
-            $function,
-            $index-config/db:scalar-type,
-            $index-config/db:parent-namespace-uri,
-            $index-config/db:parent-localname/fn:string(.),
-            $index-config/db:namespace-uri,
-            $index-config/db:localname/fn:string(.),
-            fn:string($index-config/db:collation[../db:scalar-type = 'string']),
-            ($index-config/db:range-value-positions/xs:boolean(.), false())[1]
-          )
-  return $validated-index-configs
+    for $index-config in $db-config/db:range-element-attribute-indexes/db:range-element-attribute-index
+    return
+      admin:database-range-element-attribute-index(
+        $index-config/db:scalar-type,
+        $index-config/db:parent-namespace-uri,
+        $index-config/db:parent-localname/fn:string(.),
+        $index-config/db:namespace-uri,
+        $index-config/db:localname/fn:string(.),
+        fn:string($index-config/db:collation[../db:scalar-type = 'string']),
+        ($index-config/db:range-value-positions/xs:boolean(.), false())[1],
+        ($index-config/db:invalid-values, $default-invalid-values)[1]
+      )
+  )
 };
 
 declare function setup:validate-range-element-attribute-indexes(
@@ -2542,17 +2512,13 @@ declare function setup:validate-range-element-attribute-indexes(
 
 declare function setup:remove-existing-path-namespaces(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  (: wrap in xdmp:value because this function is new to 6.0 and will fail in older version of ML :)
-  if (setup:at-least-version("6.0-2")) then
-    xdmp:value(
-      "admin:database-delete-path-namespace($admin-config, $database,
-        admin:database-get-path-namespaces($admin-config, $database))"
-    )
+  if (exists($db-config/db:path-namespaces) and not($db-config/db:path-namespaces/@append = "true")) then
+    admin:database-delete-path-namespace($admin-config, $database,
+      admin:database-get-path-namespaces($admin-config, $database))
   else
-    (: We don't need to complain if ML is too old to run this function; in
-     : that case, the path-namespaces won't have been built. :)
     $admin-config
 };
 
@@ -2562,21 +2528,13 @@ declare function setup:add-path-namespaces(
   $db-config as element(db:database)) as element(configuration)
 {
   if ($db-config/db:path-namespaces/db:path-namespace) then
-    if (setup:at-least-version("6.0-2")) then
-      xdmp:value(
-        "admin:database-add-path-namespace(
-           $admin-config,
-           $database,
-           for $path-ns in $db-config/db:path-namespaces/db:path-namespace
-           return
-             admin:database-path-namespace($path-ns/db:prefix, $path-ns/db:namespace-uri)
-         )"
-      )
-    else
-      fn:error(
-        xs:QName("VERSION_NOT_SUPPORTED"),
-        "Roxy does not support path namespaces for this version of MarkLogic. Use 6.0-2 or later."
-      )
+    admin:database-add-path-namespace(
+      $admin-config,
+      $database,
+      for $path-ns in $db-config/db:path-namespaces/db:path-namespace
+      return
+        admin:database-path-namespace($path-ns/db:prefix, $path-ns/db:namespace-uri)
+    )
   else
     $admin-config
 };
@@ -2586,10 +2544,7 @@ declare function setup:validate-path-namespaces(
   $database as xs:unsignedLong,
   $db-config as element(db:database))
 {
-  let $existing :=
-    if (setup:at-least-version("6.0-2")) then
-      xdmp:value("admin:database-get-path-namespaces($admin-config, $database)")
-    else ()
+  let $existing := admin:database-get-path-namespaces($admin-config, $database)
   for $expected in $db-config/db:path-namespaces/db:path-namespace
   return
     if ($existing[fn:deep-equal(., $expected)]) then ()
@@ -2599,26 +2554,14 @@ declare function setup:validate-path-namespaces(
 
 declare function setup:remove-existing-range-path-indexes(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  (: wrap in try catch because this function is new to 6.0 and will fail in older version of ML :)
-  try
-  {
-    xdmp:eval('
-        import module namespace admin = "http://marklogic.com/xdmp/admin" at "/MarkLogic/admin.xqy";
-        declare variable $database external;
-        declare variable $admin-config external;
-        admin:database-delete-range-path-index($admin-config, $database,
-            admin:database-get-range-path-indexes($admin-config, $database))',
-        (xs:QName("database"), $database,
-         xs:QName("admin-config"), $admin-config))
-  }
-  catch($ex)
-  {
-    if ($ex/error:code = "XDMP-UNDFUN") then $admin-config
-    else
-      xdmp:rethrow()
-  }
+  if (exists($db-config/db:range-path-indexes) and not($db-config/db:range-path-indexes/@append = "true")) then
+    admin:database-delete-range-path-index($admin-config, $database,
+      admin:database-get-range-path-indexes($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-range-path-indexes(
@@ -2627,28 +2570,20 @@ declare function setup:add-range-path-indexes(
   $db-config as element(db:database)) as element(configuration)
 {
   if ($db-config/db:range-path-indexes/db:range-path-index) then
-    if (setup:at-least-version("6.0-1")) then
-      xdmp:value(
-        "admin:database-add-range-path-index(
-           $admin-config,
-           $database,
-           for $index in $db-config/db:range-path-indexes/db:range-path-index
-           return
-             admin:database-range-path-index(
-               $database,
-               $index/db:scalar-type,
-               $index/db:path-expression,
-               $index/db:collation,
-               $index/db:range-value-positions,
-               ($index/db:invalid-values, $default-invalid-values)[1]
-             )
-         )"
-      )
-    else
-      fn:error(
-        xs:QName("VERSION_NOT_SUPPORTED"),
-        "Roxy does not support path namespaces for this version of MarkLogic. Use 6.0-2 or later."
-      )
+    admin:database-add-range-path-index(
+      $admin-config,
+      $database,
+      for $index in $db-config/db:range-path-indexes/db:range-path-index
+      return
+        admin:database-range-path-index(
+          $database,
+          $index/db:scalar-type,
+          $index/db:path-expression,
+          $index/db:collation,
+          $index/db:range-value-positions,
+          ($index/db:invalid-values, $default-invalid-values)[1]
+        )
+    )
   else
     $admin-config
 };
@@ -2658,29 +2593,17 @@ declare function setup:validate-range-path-indexes(
   $database as xs:unsignedLong,
   $db-config as element(db:database))
 {
-  let $existing :=
-    if (setup:at-least-version("6.0-1")) then
-      xdmp:value("admin:database-get-range-path-indexes($admin-config, $database)")
-    else ()
+  let $existing := admin:database-get-range-path-indexes($admin-config, $database)
   for $expected in $db-config/db:range-path-indexes/db:range-path-index
   let $expected :=
-    xdmp:eval('
-      import module namespace admin = "http://marklogic.com/xdmp/admin" at "/MarkLogic/admin.xqy";
-      declare namespace db="http://marklogic.com/xdmp/database";
-      declare variable $database external;
-      declare variable $x external;
-      declare variable $default-invalid-values external;
-
-      admin:database-range-path-index(
-       $database,
-       $x/db:scalar-type,
-       $x/db:path-expression,
-       fn:string($x/db:collation[../db:scalar-type = "string"]),
-       $x/db:range-value-positions,
-       ($x/db:invalid-values, $default-invalid-values)[1])',
-      (xs:QName("database"), $database,
-       xs:QName("x"), $expected,
-       xs:QName("default-invalid-values"), $default-invalid-values))
+    admin:database-range-path-index(
+      $database,
+      $expected/db:scalar-type,
+      $expected/db:path-expression,
+      fn:string($expected/db:collation[../db:scalar-type = "string"]),
+      $expected/db:range-value-positions,
+      ($expected/db:invalid-values, $default-invalid-values)[1]
+    )
   return
     if ($existing[fn:deep-equal(., $expected)]) then ()
     else
@@ -2689,10 +2612,14 @@ declare function setup:validate-range-path-indexes(
 
 declare function setup:remove-existing-element-word-lexicons(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-element-word-lexicon($admin-config, $database,
-    admin:database-get-element-word-lexicons($admin-config, $database))
+  if (exists($db-config/db:element-word-lexicons) and not($db-config/db:element-word-lexicons/@append = "true")) then
+    admin:database-delete-element-word-lexicon($admin-config, $database,
+      admin:database-get-element-word-lexicons($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-element-word-lexicons(
@@ -2701,7 +2628,7 @@ declare function setup:add-element-word-lexicons(
   $db-config as element(db:database)) as element(configuration)
 {
   admin:database-add-element-word-lexicon(
-    setup:remove-existing-element-word-lexicons($admin-config, $database),
+    setup:remove-existing-element-word-lexicons($admin-config, $database, $db-config),
     $database,
     for $lex in $db-config/db:element-word-lexicons/db:element-word-lexicon
     return
@@ -2725,10 +2652,14 @@ declare function setup:validate-element-word-lexicons($admin-config, $database,
 
 declare function setup:remove-existing-element-attribute-word-lexicons(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-element-attribute-word-lexicon($admin-config, $database,
-    admin:database-get-element-attribute-word-lexicons($admin-config, $database))
+  if (exists($db-config/db:element-attribute-word-lexicons) and not($db-config/db:element-attribute-word-lexicons/@append = "true")) then
+    admin:database-delete-element-attribute-word-lexicon($admin-config, $database,
+      admin:database-get-element-attribute-word-lexicons($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-element-attribute-word-lexicons(
@@ -2736,7 +2667,8 @@ declare function setup:add-element-attribute-word-lexicons(
   $database as xs:unsignedLong,
   $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-add-element-attribute-word-lexicon(setup:remove-existing-element-attribute-word-lexicons($admin-config, $database),
+  admin:database-add-element-attribute-word-lexicon(
+    setup:remove-existing-element-attribute-word-lexicons($admin-config, $database, $db-config),
     $database, $db-config/db:element-attribute-word-lexicons/db:element-attribute-word-lexicon)
 };
 
@@ -2752,10 +2684,14 @@ declare function setup:validate-element-attribute-word-lexicons($admin-config, $
 
 declare function setup:remove-existing-element-word-query-throughs(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-element-word-query-through($admin-config, $database,
-    admin:database-get-element-word-query-throughs($admin-config, $database))
+  if (exists($db-config/db:element-word-query-throughs) and not($db-config/db:element-word-query-throughs/@append = "true")) then
+    admin:database-delete-element-word-query-through($admin-config, $database,
+      admin:database-get-element-word-query-throughs($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-element-word-query-throughs(
@@ -2763,7 +2699,8 @@ declare function setup:add-element-word-query-throughs(
   $database as xs:unsignedLong,
   $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-add-element-word-query-through(setup:remove-existing-element-word-query-throughs($admin-config, $database),
+  admin:database-add-element-word-query-through(
+    setup:remove-existing-element-word-query-throughs($admin-config, $database, $db-config),
     $database, $db-config/db:element-word-query-throughs/db:element-word-query-through)
 };
 
@@ -2779,10 +2716,14 @@ declare function setup:validate-element-word-query-throughs($admin-config, $data
 
 declare function setup:remove-existing-phrase-throughs(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-phrase-through($admin-config, $database,
-    admin:database-get-phrase-throughs($admin-config, $database))
+  if (exists($db-config/db:phrase-throughs) and not($db-config/db:phrase-throughs/@append = "true")) then
+    admin:database-delete-phrase-through($admin-config, $database,
+      admin:database-get-phrase-throughs($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-phrase-throughs(
@@ -2791,7 +2732,7 @@ declare function setup:add-phrase-throughs(
   $db-config as element(db:database)) as element(configuration)
 {
   admin:database-add-phrase-through(
-    setup:remove-existing-phrase-throughs($admin-config, $database),
+    setup:remove-existing-phrase-throughs($admin-config, $database, $db-config),
     $database,
     for $pt in $db-config/db:phrase-throughs/db:phrase-through
     return
@@ -2814,10 +2755,14 @@ declare function setup:validate-phrase-throughs($admin-config, $database, $db-co
 
 declare function setup:remove-existing-phrase-arounds(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-phrase-around($admin-config, $database,
-    admin:database-get-phrase-arounds($admin-config, $database))
+  if (exists($db-config/db:phrase-arounds) and not($db-config/db:phrase-arounds/@append = "true")) then
+    admin:database-delete-phrase-around($admin-config, $database,
+      admin:database-get-phrase-arounds($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-phrase-arounds(
@@ -2826,7 +2771,7 @@ declare function setup:add-phrase-arounds(
   $db-config as element(db:database)) as element(configuration)
 {
   admin:database-add-phrase-around(
-    setup:remove-existing-phrase-arounds($admin-config, $database),
+    setup:remove-existing-phrase-arounds($admin-config, $database, $db-config),
     $database,
     for $pa in $db-config/db:phrase-arounds/db:phrase-around
     return
@@ -2848,52 +2793,35 @@ declare function setup:validate-phrase-arounds($admin-config, $database, $db-con
 };
 
 declare function setup:remove-existing-range-field-indexes(
-  $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
-{
-  admin:database-delete-range-field-index($admin-config, $database,
-    admin:database-get-range-field-indexes($admin-config, $database))
-};
-
-declare function setup:add-range-field-indexes(
   $admin-config as element(configuration),
   $database as xs:unsignedLong,
   $db-config as element(db:database)) as element(configuration)
 {
-  setup:add-range-field-indexes-helper(setup:remove-existing-range-field-indexes($admin-config, $database),
-    $database,
-    $db-config)
+  if (exists($db-config/db:range-field-indexes) and not($db-config/db:range-field-indexes/@append = "true")) then
+    admin:database-delete-range-field-index($admin-config, $database,
+      admin:database-get-range-field-indexes($admin-config, $database))
+  else
+    $admin-config
 };
 
-declare function setup:add-range-field-indexes-helper(
+declare function setup:add-range-field-indexes(
   $admin-config as element(configuration),
   $database as xs:unsignedLong,
   $db-config as element(db:database)) as element(configuration)
 {
-  if ($db-config/db:range-field-indexes/db:range-field-index) then
-    admin:database-add-range-field-index(
-      $admin-config,
-      $database,
-      for $index in $db-config/db:range-field-indexes/db:range-field-index
-      return
-        if (setup:at-least-version("6.0-0")) then
-          admin:database-range-field-index(
-            $index/db:scalar-type,
-            $index/db:field-name,
-            ($index/db:collation/fn:string(), "")[1], (: ML6 requires xs:string; later requires xs:string? :)
-            $index/db:range-value-positions,
-            ($index/db:invalid-values, $default-invalid-values)[1]
-          )
-        else
-          admin:database-range-field-index(
-            $index/db:scalar-type,
-            $index/db:field-name,
-            $index/db:collation,
-            $index/db:range-value-positions
-          )
-    )
-  else
-    $admin-config
+  admin:database-add-range-field-index(
+    setup:remove-existing-range-field-indexes($admin-config, $database, $db-config),
+    $database,
+    for $index in $db-config/db:range-field-indexes/db:range-field-index
+    return
+      admin:database-range-field-index(
+        $index/db:scalar-type,
+        $index/db:field-name,
+        fn:string($index/db:collation), (: ML6 requires xs:string; later requires xs:string? :)
+        $index/db:range-value-positions,
+        ($index/db:invalid-values, $default-invalid-values)[1]
+      )
+  )
 };
 
 declare function setup:validate-range-field-indexes($admin-config, $database, $db-config)
@@ -2908,10 +2836,14 @@ declare function setup:validate-range-field-indexes($admin-config, $database, $d
 
 declare function setup:remove-existing-geospatial-element-indexes(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-geospatial-element-index($admin-config, $database,
-    admin:database-get-geospatial-element-indexes($admin-config, $database))
+  if (exists($db-config/db:geospatial-element-indexes) and not($db-config/db:geospatial-element-indexes/@append = "true")) then
+    admin:database-delete-geospatial-element-index($admin-config, $database,
+      admin:database-get-geospatial-element-indexes($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-geospatial-element-indexes(
@@ -2920,27 +2852,18 @@ declare function setup:add-geospatial-element-indexes(
   $db-config as element(db:database)) as element(configuration)
 {
   admin:database-add-geospatial-element-index(
-    setup:remove-existing-geospatial-element-indexes($admin-config, $database),
+    setup:remove-existing-geospatial-element-indexes($admin-config, $database, $db-config),
     $database,
     for $index in $db-config/db:geospatial-element-indexes/db:geospatial-element-index
     return
-      if (setup:at-least-version("6.0-0")) then
-        admin:database-geospatial-element-index(
-          $index/db:namespace-uri,
-          $index/db:localname,
-          $index/db:coordinate-system,
-          $index/db:range-value-positions,
-          ($index/db:point-format, "point")[1],
-          ($index/db:invalid-values, $default-invalid-values)[1]
-        )
-      else
-        admin:database-geospatial-element-index(
-          $index/db:namespace-uri,
-          $index/db:localname,
-          $index/db:coordinate-system,
-          $index/db:range-value-positions,
-          ($index/db:point-format, "point")[1]
-        )
+      admin:database-geospatial-element-index(
+        $index/db:namespace-uri,
+        $index/db:localname,
+        $index/db:coordinate-system,
+        $index/db:range-value-positions,
+        ($index/db:point-format, "point")[1],
+        ($index/db:invalid-values, $default-invalid-values)[1]
+      )
   )
 };
 
@@ -2959,10 +2882,14 @@ declare function setup:validate-geospatial-element-indexes(
 
 declare function setup:remove-existing-geospatial-element-attribute-pair-indexes(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-geospatial-element-attribute-pair-index($admin-config, $database,
-    admin:database-get-geospatial-element-attribute-pair-indexes($admin-config, $database))
+  if (exists($db-config/db:geospatial-element-attribute-pair-indexes) and not($db-config/db:geospatial-element-attribute-pair-indexes/@append = "true")) then
+    admin:database-delete-geospatial-element-attribute-pair-index($admin-config, $database,
+      admin:database-get-geospatial-element-attribute-pair-indexes($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-geospatial-element-attribute-pair-indexes(
@@ -2971,33 +2898,21 @@ declare function setup:add-geospatial-element-attribute-pair-indexes(
   $db-config as element(db:database)) as element(configuration)
 {
   admin:database-add-geospatial-element-attribute-pair-index(
-    setup:remove-existing-geospatial-element-attribute-pair-indexes($admin-config, $database),
+    setup:remove-existing-geospatial-element-attribute-pair-indexes($admin-config, $database, $db-config),
     $database,
     for $index in $db-config/db:geospatial-element-attribute-pair-indexes/db:geospatial-element-attribute-pair-index
     return
-      if (setup:at-least-version("6.0-0")) then
-        admin:database-geospatial-element-attribute-pair-index(
-          $index/db:parent-namespace-uri,
-          $index/db:parent-localname,
-          $index/db:latitude-namespace-uri,
-          $index/db:latitude-localname,
-          $index/db:longitude-namespace-uri,
-          $index/db:longitude-localname,
-          $index/db:coordinate-system,
-          $index/db:range-value-positions,
-          ($index/db:invalid-values, $default-invalid-values)[1]
-        )
-      else
-        admin:database-geospatial-element-attribute-pair-index(
-          $index/db:parent-namespace-uri,
-          $index/db:parent-localname,
-          $index/db:latitude-namespace-uri,
-          $index/db:latitude-localname,
-          $index/db:longitude-namespace-uri,
-          $index/db:longitude-localname,
-          $index/db:coordinate-system,
-          $index/db:range-value-positions
-        )
+      admin:database-geospatial-element-attribute-pair-index(
+        $index/db:parent-namespace-uri,
+        $index/db:parent-localname,
+        $index/db:latitude-namespace-uri,
+        $index/db:latitude-localname,
+        $index/db:longitude-namespace-uri,
+        $index/db:longitude-localname,
+        $index/db:coordinate-system,
+        $index/db:range-value-positions,
+        ($index/db:invalid-values, $default-invalid-values)[1]
+      )
   )
 };
 
@@ -3016,10 +2931,14 @@ declare function setup:validate-geospatial-element-attribute-pair-indexes(
 
 declare function setup:remove-existing-geospatial-element-pair-indexes(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-geospatial-element-pair-index($admin-config, $database,
-    admin:database-get-geospatial-element-pair-indexes($admin-config, $database))
+  if (exists($db-config/db:geospatial-element-pair-indexes) and not($db-config/db:geospatial-element-pair-indexes/@append = "true")) then
+    admin:database-delete-geospatial-element-pair-index($admin-config, $database,
+      admin:database-get-geospatial-element-pair-indexes($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-geospatial-element-pair-indexes(
@@ -3028,33 +2947,21 @@ declare function setup:add-geospatial-element-pair-indexes(
   $db-config as element(db:database)) as element(configuration)
 {
   admin:database-add-geospatial-element-pair-index(
-    setup:remove-existing-geospatial-element-pair-indexes($admin-config, $database),
+    setup:remove-existing-geospatial-element-pair-indexes($admin-config, $database, $db-config),
     $database,
     for $index in $db-config/db:geospatial-element-pair-indexes/db:geospatial-element-pair-index
     return
-      if (setup:at-least-version("6.0-0")) then
-        admin:database-geospatial-element-pair-index(
-          $index/db:parent-namespace-uri,
-          $index/db:parent-localname,
-          $index/db:latitude-namespace-uri,
-          $index/db:latitude-localname,
-          $index/db:longitude-namespace-uri,
-          $index/db:longitude-localname,
-          $index/db:coordinate-system,
-          $index/db:range-value-positions,
-          ($index/db:invalid-values, $default-invalid-values)[1]
-        )
-      else
-        admin:database-geospatial-element-pair-index(
-          $index/db:parent-namespace-uri,
-          $index/db:parent-localname,
-          $index/db:latitude-namespace-uri,
-          $index/db:latitude-localname,
-          $index/db:longitude-namespace-uri,
-          $index/db:longitude-localname,
-          $index/db:coordinate-system,
-          $index/db:range-value-positions
-        )
+      admin:database-geospatial-element-pair-index(
+        $index/db:parent-namespace-uri,
+        $index/db:parent-localname,
+        $index/db:latitude-namespace-uri,
+        $index/db:latitude-localname,
+        $index/db:longitude-namespace-uri,
+        $index/db:longitude-localname,
+        $index/db:coordinate-system,
+        $index/db:range-value-positions,
+        ($index/db:invalid-values, $default-invalid-values)[1]
+      )
   )
 };
 
@@ -3073,10 +2980,14 @@ declare function setup:validate-geospatial-element-pair-indexes(
 
 declare function setup:remove-existing-geospatial-element-child-indexes(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-geospatial-element-child-index($admin-config, $database,
-    admin:database-get-geospatial-element-child-indexes($admin-config, $database))
+  if (exists($db-config/db:geospatial-element-child-indexes) and not($db-config/db:geospatial-element-child-indexes/@append = "true")) then
+    admin:database-delete-geospatial-element-child-index($admin-config, $database,
+      admin:database-get-geospatial-element-child-indexes($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-geospatial-element-child-indexes(
@@ -3085,31 +2996,20 @@ declare function setup:add-geospatial-element-child-indexes(
   $db-config as element(db:database)) as element(configuration)
 {
   admin:database-add-geospatial-element-child-index(
-    setup:remove-existing-geospatial-element-child-indexes($admin-config, $database),
+    setup:remove-existing-geospatial-element-child-indexes($admin-config, $database, $db-config),
     $database,
     for $index in $db-config/db:geospatial-element-child-indexes/db:geospatial-element-child-index
     return
-      if (setup:at-least-version("6.0-0")) then
-        admin:database-geospatial-element-child-index(
-          $index/db:parent-namespace-uri,
-          $index/db:parent-localname,
-          $index/db:namespace-uri,
-          $index/db:localname,
-          $index/db:coordinate-system,
-          $index/db:range-value-positions,
-          ($index/db:point-format, "point")[1],
-          ($index/db:invalid-values, $default-invalid-values)[1]
-        )
-      else
-        admin:database-geospatial-element-child-index(
-          $index/db:parent-namespace-uri,
-          $index/db:parent-localname,
-          $index/db:namespace-uri,
-          $index/db:localname,
-          $index/db:coordinate-system,
-          $index/db:range-value-positions,
-          ($index/db:point-format, "point")[1]
-        )
+      admin:database-geospatial-element-child-index(
+        $index/db:parent-namespace-uri,
+        $index/db:parent-localname,
+        $index/db:namespace-uri,
+        $index/db:localname,
+        $index/db:coordinate-system,
+        $index/db:range-value-positions,
+        ($index/db:point-format, "point")[1],
+        ($index/db:invalid-values, $default-invalid-values)[1]
+      )
   )
 };
 
@@ -3128,10 +3028,19 @@ declare function setup:validate-geospatial-element-child-indexes(
 
 declare function setup:remove-existing-geospatial-path-indexes(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-geospatial-path-index($admin-config, $database,
-    admin:database-get-geospatial-path-indexes($admin-config, $database))
+  if (exists($db-config/db:geospatial-path-indexes) and not($db-config/db:geospatial-path-indexes/@append = "true")) then
+    if (setup:at-least-version("8.0-0")) then
+      xdmp:value("
+        admin:database-delete-geospatial-path-index($admin-config, $database,
+          admin:database-get-geospatial-path-indexes($admin-config, $database))
+      ")
+    else
+      $admin-config
+  else
+    $admin-config
 };
 
 declare function setup:add-geospatial-path-indexes(
@@ -3145,15 +3054,20 @@ declare function setup:add-geospatial-path-indexes(
     for $index in $db-config/db:geospatial-path-indexes/db:geospatial-path-index
     return
       if (setup:at-least-version("8.0-0")) then
-        admin:database-geospatial-path-index(
-          $index/db:path-expression,
-          $index/db:coordinate-system,
-          $index/db:range-value-positions,
-          ($index/db:point-format, "point")[1],
-          ($index/db:invalid-values, $default-invalid-values)[1]
-        )
+        xdmp:value("
+          admin:database-geospatial-path-index(
+            $index/db:path-expression,
+            $index/db:coordinate-system,
+            $index/db:range-value-positions,
+            ($index/db:point-format, ""point"")[1],
+            ($index/db:invalid-values, $default-invalid-values)[1]
+          )
+        ")
       else
-        ()
+        fn:error(
+          xs:QName("VERSION_NOT_SUPPORTED"),
+          "Roxy does not support geospatial path indexes for this version of MarkLogic. Use 8.0-0 or later."
+        )
   )
 };
 
@@ -3162,7 +3076,10 @@ declare function setup:validate-geospatial-path-indexes(
   $database as xs:unsignedLong,
   $db-config as element(db:database))
 {
-  let $existing := admin:database-get-geospatial-path-indexes($admin-config, $database)
+  let $existing :=
+    if (setup:at-least-version("8.0-0")) then
+      xdmp:value("admin:database-get-geospatial-path-indexes($admin-config, $database)")
+    else ()
   for $expected in $db-config/db:geospatial-path-indexes/db:geospatial-path-index
   return
     if ($existing[fn:deep-equal(., $expected)]) then ()
@@ -3172,10 +3089,19 @@ declare function setup:validate-geospatial-path-indexes(
 
 declare function setup:remove-existing-geospatial-region-path-indexes(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-geospatial-region-path-index($admin-config, $database,
-    admin:database-get-geospatial-region-path-indexes($admin-config, $database))
+  if (exists($db-config/db:geospatial-region-path-indexes) and not($db-config/db:geospatial-region-path-indexes/@append = "true")) then
+    if (setup:at-least-version("9.0-0")) then
+      xdmp:value("
+        admin:database-delete-geospatial-region-path-index($admin-config, $database,
+          admin:database-get-geospatial-region-path-indexes($admin-config, $database))
+      ")
+    else
+      $admin-config
+  else
+    $admin-config
 };
 
 declare function setup:add-geospatial-region-path-indexes(
@@ -3189,15 +3115,20 @@ declare function setup:add-geospatial-region-path-indexes(
     for $index in $db-config/db:geospatial-region-path-indexes/db:geospatial-region-path-index
     return
       if (setup:at-least-version("9.0-0")) then
-        admin:database-geospatial-region-path-index(
-          $index/db:path-expression,
-          $index/db:coordinate-system,
-          $index/db:geohash-precision,
-          ($index/db:invalid-values, $default-invalid-values)[1],
-          ($index/db:units, "miles")[1]
-        )
+        xdmp:value("
+          admin:database-geospatial-region-path-index(
+            $index/db:path-expression,
+            $index/db:coordinate-system,
+            $index/db:geohash-precision,
+            ($index/db:invalid-values, $default-invalid-values)[1],
+            ($index/db:units, ""miles"")[1]
+          )
+        ")
       else
-        ()
+        fn:error(
+          xs:QName("VERSION_NOT_SUPPORTED"),
+          "Roxy does not support geospatial region path indexes for this version of MarkLogic. Use 9.0-0 or later."
+        )
   )
 };
 
@@ -3206,7 +3137,10 @@ declare function setup:validate-geospatial-region-path-indexes(
   $database as xs:unsignedLong,
   $db-config as element(db:database))
 {
-  let $existing := admin:database-get-geospatial-region-path-indexes($admin-config, $database)
+  let $existing :=
+    if (setup:at-least-version("9.0-0")) then
+      xdmp:value("admin:database-get-geospatial-region-path-indexes($admin-config, $database)")
+    else ()
   for $expected in $db-config/db:geospatial-region-path-indexes/db:geospatial-region-path-index
   return
     if ($existing[fn:deep-equal(., $expected)]) then ()
@@ -3216,10 +3150,14 @@ declare function setup:validate-geospatial-region-path-indexes(
 
 declare function setup:remove-existing-word-lexicons(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-word-lexicon($admin-config, $database,
-    admin:database-get-word-lexicons($admin-config, $database))
+  if (exists($db-config/db:word-lexicons) and not($db-config/db:word-lexicons/@append = "true")) then
+    admin:database-delete-word-lexicon($admin-config, $database,
+      admin:database-get-word-lexicons($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-word-lexicons(
@@ -3228,7 +3166,7 @@ declare function setup:add-word-lexicons(
   $db-config as element(db:database)) as element(configuration)
 {
   admin:database-add-word-lexicon(
-    setup:remove-existing-word-lexicons($admin-config, $database),
+    setup:remove-existing-word-lexicons($admin-config, $database, $db-config),
     $database,
     for $lex in $db-config/db:word-lexicons/db:word-lexicon
     return admin:database-word-lexicon($lex/fn:string())
@@ -3250,10 +3188,14 @@ declare function setup:validate-word-lexicons(
 
 declare function setup:remove-existing-fragment-roots(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-fragment-root($admin-config, $database,
-    admin:database-get-fragment-roots($admin-config, $database))
+  if (exists($db-config/db:fragment-roots) and not($db-config/db:fragment-roots/@append = "true")) then
+    admin:database-delete-fragment-root($admin-config, $database,
+      admin:database-get-fragment-roots($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-fragment-roots(
@@ -3262,7 +3204,7 @@ declare function setup:add-fragment-roots(
   $db-config as element(db:database)) as element(configuration)
 {
   admin:database-add-fragment-root(
-    setup:remove-existing-fragment-roots($admin-config, $database),
+    setup:remove-existing-fragment-roots($admin-config, $database, $db-config),
     $database,
     for $root in $db-config/db:fragment-roots/db:fragment-root
     return
@@ -3288,10 +3230,14 @@ declare function setup:validate-fragment-roots(
 
 declare function setup:remove-existing-fragment-parents(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  admin:database-delete-fragment-parent($admin-config, $database,
-    admin:database-get-fragment-parents($admin-config, $database))
+  if (exists($db-config/db:fragment-parents) and not($db-config/db:fragment-parents/@append = "true")) then
+    admin:database-delete-fragment-parent($admin-config, $database,
+      admin:database-get-fragment-parents($admin-config, $database))
+  else
+    $admin-config
 };
 
 declare function setup:add-fragment-parents(
@@ -3300,7 +3246,7 @@ declare function setup:add-fragment-parents(
   $db-config as element(db:database)) as element(configuration)
 {
   admin:database-add-fragment-parent(
-    setup:remove-existing-fragment-parents($admin-config, $database),
+    setup:remove-existing-fragment-parents($admin-config, $database, $db-config),
     $database,
     for $parent in $db-config/db:fragment-parents/db:fragment-parent
     return
@@ -3326,32 +3272,30 @@ declare function setup:validate-fragment-parents(
 
 declare function setup:remove-existing-word-query-included-elements(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  for $element in admin:database-get-word-query-included-elements($admin-config, $database)
+  let $empty-field := $db-config/db:fields/db:field[fn:empty(db:field-name) or db:field-name = ""]
   return
-    xdmp:set(
-      $admin-config,
-      admin:database-delete-word-query-included-element(
-        $admin-config,
-        $database,
-        $element)),
-  $admin-config
+    if (exists($empty-field/db:included-elements) and not($empty-field/db:included-elements/@append = "true")) then
+      admin:database-delete-word-query-included-element($admin-config, $database,
+        admin:database-get-word-query-included-elements($admin-config, $database))
+    else
+      $admin-config
 };
 
 declare function setup:remove-existing-word-query-excluded-elements(
   $admin-config as element(configuration),
-  $database as xs:unsignedLong) as element(configuration)
+  $database as xs:unsignedLong,
+  $db-config as element(db:database)) as element(configuration)
 {
-  for $element in admin:database-get-word-query-excluded-elements($admin-config, $database)
+  let $empty-field := $db-config/db:fields/db:field[fn:empty(db:field-name) or db:field-name = ""]
   return
-    xdmp:set(
-      $admin-config,
-      admin:database-delete-word-query-excluded-element(
-        $admin-config,
-        $database,
-        $element)),
-  $admin-config
+    if (exists($empty-field/db:excluded-elements) and not($empty-field/db:excluded-elements/@append = "true")) then
+      admin:database-delete-word-query-excluded-element($admin-config, $database,
+        admin:database-get-word-query-excluded-elements($admin-config, $database))
+    else
+      $admin-config
 };
 
 declare function setup:config-word-query(
@@ -3362,25 +3306,19 @@ declare function setup:config-word-query(
   let $empty-field := $db-config/db:fields/db:field[fn:empty(db:field-name) or db:field-name = ""]
   return
   (
-    xdmp:set($admin-config, setup:remove-existing-word-query-included-elements($admin-config, $database)),
-    for $element in $empty-field/db:included-elements/db:included-element
-    return
-      xdmp:set(
-        $admin-config,
-        admin:database-add-word-query-included-element(
-          $admin-config,
-          $database,
-          $element)),
+    xdmp:set(
+      $admin-config,
+      admin:database-add-word-query-included-element(
+        setup:remove-existing-word-query-included-elements($admin-config, $database, $db-config),
+        $database,
+        $empty-field/db:included-elements/db:included-element)),
 
-    xdmp:set($admin-config, setup:remove-existing-word-query-excluded-elements($admin-config, $database)),
-    for $element in $empty-field/db:excluded-elements/db:excluded-element
-    return
-      xdmp:set(
-        $admin-config,
-        admin:database-add-word-query-excluded-element(
-          $admin-config,
-          $database,
-          $element)),
+    xdmp:set(
+      $admin-config,
+      admin:database-add-word-query-excluded-element(
+        setup:remove-existing-word-query-excluded-elements($admin-config, $database, $db-config),
+        $database,
+        $empty-field/db:excluded-elements/db:excluded-element)),
 
     let $fast-case-sensitive-searches := $empty-field/db:fast-case-sensitive-searches
     where $fast-case-sensitive-searches
@@ -4155,43 +4093,16 @@ declare function setup:create-odbcserver(
     if (setup:get-server($server-name, $group-id)) then
       fn:concat("ODBC Server ", $server-name, " already exists, not recreated..")
     else
-      (: wrap in try catch because this function is new to 6.0 and will fail in older version of ML :)
-      let $admin-config := admin:get-configuration()
       let $admin-config :=
-        try
-        {
-          xdmp:eval('
-            import module namespace admin = "http://marklogic.com/xdmp/admin" at "/MarkLogic/admin.xqy";
-            declare variable $admin-config external;
-            declare variable $root external;
-            declare variable $port external;
-            declare variable $content-db external;
-            declare variable $group-id external;
-            declare variable $server-name external;
-            declare variable $modules-db external;
-            admin:odbc-server-create(
-              admin:get-configuration(),
-              $group-id,
-              $server-name,
-              $root,
-              $port,
-              $modules-db,
-              $content-db)',
-            (xs:QName("admin-config"), $admin-config,
-             xs:QName("root"), ($server-config/gr:root[fn:string-length(fn:string(.)) > 0], "/")[1],
-             xs:QName("port"), xs:unsignedLong($server-config/gr:port),
-             xs:QName("content-db"), setup:get-appserver-content-database($server-config),
-             xs:QName("group-id"), $group-id,
-             xs:QName("server-name"), $server-name,
-             xs:QName("modules-db"), setup:get-appserver-modules-database($server-config)))
-        }
-        catch($ex)
-        {
-          if ($ex/error:code = "XDMP-UNDFUN" and fn:not(setup:at-least-version("6.0-2"))) then
-            fn:error(xs:QName("VERSION_NOT_SUPPORTED"), "Roxy does not support ODBC application servers for this version of MarkLogic. Use 6.0-2 or later.")
-          else
-            xdmp:rethrow()
-        }
+        admin:odbc-server-create(
+          admin:get-configuration(),
+          $group-id,
+          $server-name,
+          ($server-config/gr:root[fn:string-length(fn:string(.)) > 0], "/")[1],
+          xs:unsignedLong($server-config/gr:port),
+          setup:get-appserver-modules-database($server-config),
+          setup:get-appserver-content-database($server-config)
+        )
       return
       (
         if (admin:save-configuration-without-restart($admin-config)) then
@@ -6281,38 +6192,16 @@ declare function setup:strip-default-properties-from-odbc-server(
   {
     $node/@*,
 
-    (: Wrapping this in xdmp:eval because it didn't exist until ML6 :)
     let $default-properties :=
-      try
-      {
-        xdmp:eval('
-          xquery version "1.0-ml";
-          import module namespace admin = "http://marklogic.com/xdmp/admin" at "/MarkLogic/admin.xqy";
-          declare namespace gr="http://marklogic.com/xdmp/group";
-          declare variable $group external;
-          declare variable $default-modules external;
-          declare variable $default-database external;
-          admin:odbc-server-create(
-            admin:get-configuration(),
-            $group,
-            "default",
-            "/",
-            19999,
-            $default-modules,
-            $default-database)//gr:odbc-servers/gr:odbc-server[gr:odbc-server-name eq "default"]/*
-          ',
-          (xs:QName("group"), $group,
-           xs:QName("default-modules"), $default-modules,
-           xs:QName("default-database"), $default-database))
-      }
-      catch($ex)
-      {
-        if ($ex/error:code = "XDMP-UNDFUN" and fn:not(setup:at-least-version("6.0-2"))) then
-          (: If we're not using a recent enough version of ML, then the properties are irrelevant. :)
-          ()
-        else
-          xdmp:rethrow()
-      }
+      admin:odbc-server-create(
+        admin:get-configuration(),
+        $group,
+        "default",
+        "/",
+        19999,
+        $default-modules,
+        $default-database
+      )//gr:odbc-servers/gr:odbc-server[gr:odbc-server-name eq "default"]/*
     for $property in $node/*
     where fn:not($default-properties[fn:deep-equal(., $property)]) and
           fn:not($property/self::gr:odbc-server-id)
diff --git a/deploy/test/data/ml9-config-changed.xml b/deploy/test/data/ml9-config-changed.xml
index 90fdf941..f6bbf442 100644
--- a/deploy/test/data/ml9-config-changed.xml
+++ b/deploy/test/data/ml9-config-changed.xml
@@ -1016,6 +1016,24 @@
           <invalid-values>reject</invalid-values>
         </geospatial-element-child-index>
       </geospatial-element-child-indexes>
+      <geospatial-path-indexes>
+        <geospatial-path-index>
+          <path-expression>//sample2:some/sample:geo</path-expression>
+          <coordinate-system>wgs84</coordinate-system>
+          <point-format>point</point-format>
+          <range-value-positions>false</range-value-positions>
+          <invalid-values>reject</invalid-values>
+        </geospatial-path-index>
+      </geospatial-path-indexes>
+      <geospatial-region-path-indexes>
+        <geospatial-region-path-index>
+          <path-expression>//sample2:some/sample:geo</path-expression>
+          <coordinate-system>wgs84</coordinate-system>
+          <units>miles</units>
+          <geohash-precision>3</geohash-precision>
+          <invalid-values>reject</invalid-values>
+        </geospatial-region-path-index>
+      </geospatial-region-path-indexes>
       <element-word-lexicons>
         <element-word-lexicon>
           <namespace-uri>http://www.marklogic.com/ns/sample</namespace-uri>
diff --git a/deploy/test/data/ml9-config-unchanged.xml b/deploy/test/data/ml9-config-unchanged.xml
new file mode 100644
index 00000000..8bd09fa6
--- /dev/null
+++ b/deploy/test/data/ml9-config-unchanged.xml
@@ -0,0 +1,849 @@
+<configuration default-group="roxy-self-test">
+  <task-server xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://marklogic.com/xdmp/group" xsi:schemaLocation="http://marklogic.com/xdmp/group group.xsd">
+    <threads>16</threads>
+    <debug-threads>16</debug-threads>
+    <max-time-limit>3600</max-time-limit>
+    <default-time-limit>600</default-time-limit>
+    <queue-size>100000</queue-size>
+    <pre-commit-trigger-depth>1000</pre-commit-trigger-depth>
+    <post-commit-trigger-depth>1000</post-commit-trigger-depth>
+    <pre-commit-trigger-limit>10000</pre-commit-trigger-limit>
+    <log-errors>true</log-errors>
+    <debug-allow>true</debug-allow>
+    <profile-allow>true</profile-allow>
+    <scheduled-tasks>
+      <scheduled-task>
+        <task-path>/some/daily-task.xqy</task-path>
+        <task-root>/</task-root>
+        <task-type>daily</task-type>
+        <task-period>2</task-period>
+        <task-start-time>13:00:00-05:00</task-start-time>
+        <task-database name="@ml.content-db"/>
+        <task-modules name="@ml.modules-db"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
+      </scheduled-task>
+      <scheduled-task>
+        <task-path>/some/hourly-task.xqy</task-path>
+        <task-root>/</task-root>
+        <task-type>hourly</task-type>
+        <task-period>2</task-period>
+        <task-minute>15</task-minute>
+        <task-database name="@ml.content-db"/>
+        <task-modules name="@ml.modules-db"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
+      </scheduled-task>
+      <scheduled-task>
+        <task-path>/some/minutely-task.xqy</task-path>
+        <task-root>/</task-root>
+        <task-type>minutely</task-type>
+        <task-period>3</task-period>
+        <task-database name="@ml.content-db"/>
+        <task-modules name="@ml.modules-db"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
+      </scheduled-task>
+      <scheduled-task>
+        <task-path>/some/monthly-task.xqy</task-path>
+        <task-root>/</task-root>
+        <task-type>monthly</task-type>
+        <task-period>1</task-period>
+        <task-month-day>15</task-month-day>
+        <task-start-time>13:00:00-05:00</task-start-time>
+        <task-database name="@ml.content-db"/>
+        <task-modules name="@ml.modules-db"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
+      </scheduled-task>
+      <scheduled-task>
+        <task-path>/some/once-task.xqy</task-path>
+        <task-root>/</task-root>
+        <task-type>once</task-type>
+        <task-start>2019-01-01T13:00:00-05:00</task-start>
+        <task-database name="@ml.content-db"/>
+        <task-modules name="@ml.modules-db"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
+      </scheduled-task>
+      <scheduled-task>
+        <task-path>/some/weekly-task.xqy</task-path>
+        <task-root>/</task-root>
+        <task-type>weekly</task-type>
+        <task-period>1</task-period>
+        <task-days>
+          <task-day>monday</task-day>
+          <task-day>wednesday</task-day>
+          <task-day>friday</task-day>
+        </task-days>
+        <task-start-time>13:00:00-05:00</task-start-time>
+        <task-database name="@ml.content-db"/>
+        <task-modules name="@ml.modules-db"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
+      </scheduled-task>
+    </scheduled-tasks>
+  </task-server>
+  <http-servers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://marklogic.com/xdmp/group" xsi:schemaLocation="http://marklogic.com/xdmp/group group.xsd">
+    <!--Non-default Application Server-->
+    <http-server>
+      <http-server-name>@ml.app-name</http-server-name>
+      <enabled>false</enabled>
+      <root>/@ml.app-name/</root>
+      <port>@ml.app-port</port>
+      <modules name="@ml.modules-db"/>
+      <database name="@ml.content-db"/>
+      <last-login>Last-Login</last-login>
+      <display-last-login>true</display-last-login>
+      <address>1.2.3.4</address>
+      <backlog>321</backlog>
+      <threads>123</threads>
+      <request-timeout>321</request-timeout>
+      <keep-alive-timeout>123</keep-alive-timeout>
+      <session-timeout>321</session-timeout>
+      <max-time-limit>123</max-time-limit>
+      <default-time-limit>321</default-time-limit>
+      <static-expires>123</static-expires>
+      <pre-commit-trigger-depth>321</pre-commit-trigger-depth>
+      <pre-commit-trigger-limit>123</pre-commit-trigger-limit>
+      <collation>http://marklogic.com/collation/codepoint</collation>
+      <authentication>basic</authentication>
+      <default-user>@ml.default-user</default-user>
+      <privilege>admin-ui</privilege>
+      <concurrent-request-limit>123</concurrent-request-limit>
+      <log-errors>false</log-errors>
+      <debug-allow>false</debug-allow>
+      <profile-allow>false</profile-allow>
+      <default-xquery-version>1.0</default-xquery-version>
+      <multi-version-concurrency-control>nonblocking</multi-version-concurrency-control>
+      <distribute-timestamps>strict</distribute-timestamps>
+
+      <output-sgml-character-entities>normal</output-sgml-character-entities>
+      <output-encoding>ASCII</output-encoding>
+      <output-method>xml</output-method>
+      <output-byte-order-mark>yes</output-byte-order-mark>
+      <output-cdata-section-namespace-uri>a</output-cdata-section-namespace-uri>
+      <output-cdata-section-localname>b</output-cdata-section-localname>
+      <output-doctype-public>c</output-doctype-public>
+      <output-doctype-system>d</output-doctype-system>
+      <output-escape-uri-attributes>yes</output-escape-uri-attributes>
+      <output-include-content-type>yes</output-include-content-type>
+      <output-indent>yes</output-indent>
+      <output-indent-untyped>yes</output-indent-untyped>
+      <output-media-type>text/xml</output-media-type>
+      <output-normalization-form>NFC</output-normalization-form>
+      <output-omit-xml-declaration>yes</output-omit-xml-declaration>
+      <output-standalone>yes</output-standalone>
+      <output-undeclare-prefixes>yes</output-undeclare-prefixes>
+      <output-version>1.0</output-version>
+      <output-include-default-attributes>yes</output-include-default-attributes>
+
+      <error-handler>/roxy/error.xqy</error-handler>
+      <schemas>
+        <schema>
+          <namespace-uri>http://www.ns.com/ns0</namespace-uri>
+          <schema-location>/test.xsd</schema-location>
+        </schema>
+      </schemas>
+      <namespaces>
+        <namespace>
+          <prefix>ns1</prefix>
+          <namespace-uri>http://www.ns.com/ns1</namespace-uri>
+        </namespace>
+        <namespace>
+          <prefix>ns2</prefix>
+          <namespace-uri>http://www.ns.com/ns2</namespace-uri>
+        </namespace>
+        <using-namespace>
+          <namespace-uri>http://www.ns.com/ns3</namespace-uri>
+        </using-namespace>
+      </namespaces>
+      <module-locations>
+        <module-location>
+          <namespace-uri>http://www.ns.com/ns4</namespace-uri>
+          <location>/test-lib.xqy</location>
+        </module-location>
+        <module-location>
+          <namespace-uri>http://www.ns.com/ns5</namespace-uri>
+          <location>/test-lib2.xqy</location>
+        </module-location>
+      </module-locations>
+      <request-blackouts>
+        <request-blackout>
+          <users names="infostudio-admin nobody"/>
+          <roles names="app-user rest-reader"/>
+          <blackout-type>recurring</blackout-type>
+          <days>
+            <day>monday</day>
+          </days>
+          <period>
+            <start-time>12:34:00+02:00</start-time>
+            <end-time>23:45:00+02:00</end-time>
+          </period>
+        </request-blackout>
+        <request-blackout>
+          <users names="infostudio-admin nobody"/>
+          <roles names="app-user rest-reader"/>
+          <blackout-type>recurring</blackout-type>
+          <days>
+            <day>monday</day>
+          </days>
+          <period>
+            <start-time>12:34:00+02:00</start-time>
+            <duration>PT1H23M</duration>
+          </period>
+        </request-blackout>
+        <request-blackout>
+          <users names="infostudio-admin nobody"/>
+          <roles names="app-user rest-reader"/>
+          <blackout-type>recurring</blackout-type>
+          <days>
+            <day>monday</day>
+          </days>
+          <period/>
+        </request-blackout>
+        <request-blackout>
+          <users names="infostudio-admin nobody"/>
+          <roles names="app-user rest-reader"/>
+          <blackout-type>once</blackout-type>
+          <days/>
+          <period>
+            <start-date>1234-11-22</start-date>
+            <start-time>12:34:00+02:00</start-time>
+            <end-date>1234-12-23</end-date>
+            <end-time>23:34:00+02:00</end-time>
+          </period>
+        </request-blackout>
+      </request-blackouts>
+      <url-rewriter>/roxy/rewrite.xqy</url-rewriter>
+      <rewrite-resolves-globally>true</rewrite-resolves-globally>
+      <ssl-allow-sslv3>false</ssl-allow-sslv3>
+      <ssl-allow-tls>false</ssl-allow-tls>
+      <ssl-hostname>sixer</ssl-hostname>
+      <ssl-ciphers>ALL:!LOW:@STRENGTH:ROXY</ssl-ciphers>
+      <ssl-require-client-certificate>false</ssl-require-client-certificate>
+      <ssl-client-certificate-authorities/>
+    </http-server>
+    <http-server group="roxy-self-test">
+      <http-server-name>@ml.app-name2</http-server-name>
+      <enabled>false</enabled>
+      <root>/@ml.app-name/</root>
+      <port>1@ml.app-port</port>
+      <modules name="@ml.modules-db"/>
+      <database name="@ml.content-db"/>
+      <last-login>Last-Login</last-login>
+      <display-last-login>true</display-last-login>
+      <address>1.2.3.4</address>
+      <backlog>321</backlog>
+      <threads>123</threads>
+      <request-timeout>321</request-timeout>
+      <keep-alive-timeout>123</keep-alive-timeout>
+      <session-timeout>321</session-timeout>
+      <max-time-limit>123</max-time-limit>
+      <default-time-limit>321</default-time-limit>
+      <static-expires>123</static-expires>
+      <pre-commit-trigger-depth>321</pre-commit-trigger-depth>
+      <pre-commit-trigger-limit>123</pre-commit-trigger-limit>
+      <collation>http://marklogic.com/collation/codepoint</collation>
+      <authentication>basic</authentication>
+      <default-user>@ml.default-user</default-user>
+      <privilege>admin-ui</privilege>
+      <concurrent-request-limit>123</concurrent-request-limit>
+      <log-errors>false</log-errors>
+      <debug-allow>false</debug-allow>
+      <profile-allow>false</profile-allow>
+      <default-xquery-version>1.0</default-xquery-version>
+      <multi-version-concurrency-control>nonblocking</multi-version-concurrency-control>
+      <distribute-timestamps>strict</distribute-timestamps>
+
+      <output-sgml-character-entities>normal</output-sgml-character-entities>
+      <output-encoding>ASCII</output-encoding>
+      <output-method>xml</output-method>
+      <output-byte-order-mark>yes</output-byte-order-mark>
+      <output-cdata-section-namespace-uri>a</output-cdata-section-namespace-uri>
+      <output-cdata-section-localname>b</output-cdata-section-localname>
+      <output-doctype-public>c</output-doctype-public>
+      <output-doctype-system>d</output-doctype-system>
+      <output-escape-uri-attributes>yes</output-escape-uri-attributes>
+      <output-include-content-type>yes</output-include-content-type>
+      <output-indent>yes</output-indent>
+      <output-indent-untyped>yes</output-indent-untyped>
+      <output-media-type>text/xml</output-media-type>
+      <output-normalization-form>NFC</output-normalization-form>
+      <output-omit-xml-declaration>yes</output-omit-xml-declaration>
+      <output-standalone>yes</output-standalone>
+      <output-undeclare-prefixes>yes</output-undeclare-prefixes>
+      <output-version>1.0</output-version>
+      <output-include-default-attributes>yes</output-include-default-attributes>
+
+      <error-handler>/roxy/error.xqy</error-handler>
+      <schemas>
+        <schema>
+          <namespace-uri>http://www.ns.com/ns0</namespace-uri>
+          <schema-location>/test.xsd</schema-location>
+        </schema>
+      </schemas>
+      <namespaces>
+        <namespace>
+          <prefix>ns1</prefix>
+          <namespace-uri>http://www.ns.com/ns1</namespace-uri>
+        </namespace>
+        <namespace>
+          <prefix>ns2</prefix>
+          <namespace-uri>http://www.ns.com/ns2</namespace-uri>
+        </namespace>
+        <using-namespace>
+          <namespace-uri>http://www.ns.com/ns3</namespace-uri>
+        </using-namespace>
+      </namespaces>
+      <module-locations>
+        <module-location>
+          <namespace-uri>http://www.ns.com/ns4</namespace-uri>
+          <location>/test-lib.xqy</location>
+        </module-location>
+        <module-location>
+          <namespace-uri>http://www.ns.com/ns5</namespace-uri>
+          <location>/test-lib2.xqy</location>
+        </module-location>
+      </module-locations>
+      <request-blackouts>
+        <request-blackout>
+          <users names="infostudio-admin nobody"/>
+          <roles names="app-user rest-reader"/>
+          <blackout-type>recurring</blackout-type>
+          <days>
+            <day>monday</day>
+          </days>
+          <period>
+            <start-time>12:34:00+02:00</start-time>
+            <end-time>23:45:00+02:00</end-time>
+          </period>
+        </request-blackout>
+        <request-blackout>
+          <users names="infostudio-admin nobody"/>
+          <roles names="app-user rest-reader"/>
+          <blackout-type>recurring</blackout-type>
+          <days>
+            <day>monday</day>
+          </days>
+          <period>
+            <start-time>12:34:00+02:00</start-time>
+            <duration>PT1H23M</duration>
+          </period>
+        </request-blackout>
+        <request-blackout>
+          <users names="infostudio-admin nobody"/>
+          <roles names="app-user rest-reader"/>
+          <blackout-type>recurring</blackout-type>
+          <days>
+            <day>monday</day>
+          </days>
+          <period/>
+        </request-blackout>
+        <request-blackout>
+          <users names="infostudio-admin nobody"/>
+          <roles names="app-user rest-reader"/>
+          <blackout-type>once</blackout-type>
+          <days/>
+          <period>
+            <start-date>1234-11-22</start-date>
+            <start-time>12:34:00+02:00</start-time>
+            <end-date>1234-12-23</end-date>
+            <end-time>23:34:00+02:00</end-time>
+          </period>
+        </request-blackout>
+      </request-blackouts>
+      <url-rewriter>/roxy/rewrite.xqy</url-rewriter>
+      <rewrite-resolves-globally>true</rewrite-resolves-globally>
+      <ssl-allow-sslv3>false</ssl-allow-sslv3>
+      <ssl-allow-tls>false</ssl-allow-tls>
+      <ssl-hostname>sixer</ssl-hostname>
+      <ssl-ciphers>ALL:!LOW:@STRENGTH:ROXY</ssl-ciphers>
+      <ssl-require-client-certificate>false</ssl-require-client-certificate>
+      <ssl-client-certificate-authorities/>
+    </http-server>
+    @ml.test-appserver
+    <http-server>
+      <http-server-name>@ml.app-name-dav</http-server-name>
+      <enabled>false</enabled>
+      <root>/@ml.app-name/</root>
+      <port>@ml.dav-port</port>
+      <webDAV>true</webDAV>
+      <compute-content-length>true</compute-content-length>
+      <database name="@ml.content-db"/>
+      <last-login>Last-Login</last-login>
+      <display-last-login>true</display-last-login>
+      <address>1.2.3.4</address>
+      <backlog>321</backlog>
+      <threads>123</threads>
+      <request-timeout>321</request-timeout>
+      <keep-alive-timeout>123</keep-alive-timeout>
+      <session-timeout>321</session-timeout>
+      <max-time-limit>123</max-time-limit>
+      <default-time-limit>321</default-time-limit>
+      <static-expires>123</static-expires>
+      <pre-commit-trigger-depth>321</pre-commit-trigger-depth>
+      <pre-commit-trigger-limit>123</pre-commit-trigger-limit>
+      <collation>http://marklogic.com/collation/codepoint</collation>
+      <authentication>basic</authentication>
+      <default-user>@ml.default-user</default-user>
+      <privilege>admin-ui</privilege>
+      <concurrent-request-limit>123</concurrent-request-limit>
+      <log-errors>false</log-errors>
+      <debug-allow>false</debug-allow>
+      <profile-allow>false</profile-allow>
+      <default-xquery-version>1.0</default-xquery-version>
+      <multi-version-concurrency-control>nonblocking</multi-version-concurrency-control>
+      <distribute-timestamps>strict</distribute-timestamps>
+
+      <output-sgml-character-entities>normal</output-sgml-character-entities>
+      <output-encoding>ASCII</output-encoding>
+      <output-method>xml</output-method>
+      <output-byte-order-mark>yes</output-byte-order-mark>
+      <output-cdata-section-namespace-uri>a</output-cdata-section-namespace-uri>
+      <output-cdata-section-localname>b</output-cdata-section-localname>
+      <output-doctype-public>c</output-doctype-public>
+      <output-doctype-system>d</output-doctype-system>
+      <output-escape-uri-attributes>yes</output-escape-uri-attributes>
+      <output-include-content-type>yes</output-include-content-type>
+      <output-indent>yes</output-indent>
+      <output-indent-untyped>yes</output-indent-untyped>
+      <output-media-type>text/xml</output-media-type>
+      <output-normalization-form>NFC</output-normalization-form>
+      <output-omit-xml-declaration>yes</output-omit-xml-declaration>
+      <output-standalone>yes</output-standalone>
+      <output-undeclare-prefixes>yes</output-undeclare-prefixes>
+      <output-version>1.0</output-version>
+      <output-include-default-attributes>yes</output-include-default-attributes>
+
+      <schemas>
+        <schema>
+          <namespace-uri>http://www.ns.com/ns0</namespace-uri>
+          <schema-location>/test.xsd</schema-location>
+        </schema>
+      </schemas>
+      <namespaces>
+        <namespace>
+          <prefix>ns1</prefix>
+          <namespace-uri>http://www.ns.com/ns1</namespace-uri>
+        </namespace>
+        <namespace>
+          <prefix>ns2</prefix>
+          <namespace-uri>http://www.ns.com/ns2</namespace-uri>
+        </namespace>
+        <using-namespace>
+          <namespace-uri>http://www.ns.com/ns3</namespace-uri>
+        </using-namespace>
+      </namespaces>
+      <request-blackouts>
+        <request-blackout>
+          <users names="infostudio-admin nobody"/>
+          <roles names="app-user rest-reader"/>
+          <blackout-type>recurring</blackout-type>
+          <days>
+            <day>monday</day>
+          </days>
+          <period>
+            <start-time>12:34:00+02:00</start-time>
+            <end-time>23:45:00+02:00</end-time>
+          </period>
+        </request-blackout>
+        <request-blackout>
+          <users names="infostudio-admin nobody"/>
+          <roles names="app-user rest-reader"/>
+          <blackout-type>recurring</blackout-type>
+          <days>
+            <day>monday</day>
+          </days>
+          <period>
+            <start-time>12:34:00+02:00</start-time>
+            <duration>PT1H23M</duration>
+          </period>
+        </request-blackout>
+        <request-blackout>
+          <users names="infostudio-admin nobody"/>
+          <roles names="app-user rest-reader"/>
+          <blackout-type>recurring</blackout-type>
+          <days>
+            <day>monday</day>
+          </days>
+          <period/>
+        </request-blackout>
+        <request-blackout>
+          <users names="infostudio-admin nobody"/>
+          <roles names="app-user rest-reader"/>
+          <blackout-type>once</blackout-type>
+          <days/>
+          <period>
+            <start-date>1234-11-22</start-date>
+            <start-time>12:34:00+02:00</start-time>
+            <end-date>1234-12-23</end-date>
+            <end-time>23:34:00+02:00</end-time>
+          </period>
+        </request-blackout>
+      </request-blackouts>
+      <ssl-allow-sslv3>false</ssl-allow-sslv3>
+      <ssl-allow-tls>false</ssl-allow-tls>
+      <ssl-hostname>sixer</ssl-hostname>
+      <ssl-ciphers>ALL:!LOW:@STRENGTH:ROXY</ssl-ciphers>
+      <ssl-require-client-certificate>false</ssl-require-client-certificate>
+      <ssl-client-certificate-authorities/>
+    </http-server>
+  </http-servers>
+  <xdbc-servers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://marklogic.com/xdmp/group" xsi:schemaLocation="http://marklogic.com/xdmp/group group.xsd">
+    @ml.xdbc-server
+  </xdbc-servers>
+  <odbc-servers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://marklogic.com/xdmp/group" xsi:schemaLocation="http://marklogic.com/xdmp/group group.xsd">
+    @ml.odbc-server
+  </odbc-servers>
+  <groups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://marklogic.com/xdmp/group" xsi:schemaLocation="http://marklogic.com/xdmp/group group.xsd">
+    <group>
+      <group-name>roxy-self-test</group-name>
+      <!-- Begin - issue-585 -->
+      <module-location>
+        <namespace-uri>http://roxy/modules/dummy</namespace-uri>
+        <location>/roxy/dummy.xqy</location>
+      </module-location>
+      <namespace>
+        <prefix>prefix1</prefix>
+        <namespace-uri>http://roxy/namespaces/prefix1</namespace-uri>
+      </namespace>
+      <schema>
+        <namespace-uri>http://roxy/schemas/dummy</namespace-uri>
+        <schema-location>/roxy/dummy.xsd</schema-location>
+      </schema>
+      <trace-event>
+        <event-id>roxy-dummy-event</event-id>
+      </trace-event>
+      <using-namespace>
+        <namespace-uri>http://roxy/namespaces/prefix2</namespace-uri>
+      </using-namespace>
+      <!-- End - issue-585 -->
+      <list-cache-size>2048</list-cache-size>
+      <list-cache-partitions>1</list-cache-partitions>
+      <compressed-tree-cache-size>1024</compressed-tree-cache-size>
+      <compressed-tree-cache-partitions>2</compressed-tree-cache-partitions>
+      <compressed-tree-read-size>32</compressed-tree-read-size>
+      <expanded-tree-cache-size>2048</expanded-tree-cache-size>
+      <expanded-tree-cache-partitions>2</expanded-tree-cache-partitions>
+      <triple-cache-size>2048</triple-cache-size>
+      <triple-cache-partitions>1</triple-cache-partitions>
+      <triple-cache-timeout>300</triple-cache-timeout>
+      <triple-value-cache-size>1024</triple-value-cache-size>
+      <triple-value-cache-partitions>2</triple-value-cache-partitions>
+      <triple-value-cache-timeout>300</triple-value-cache-timeout>
+
+      <smtp-relay>localhost</smtp-relay>
+      <smtp-timeout>60</smtp-timeout>
+      <http-user-agent>MarkLogic Server</http-user-agent>
+      <http-timeout>60</http-timeout>
+      <xdqp-timeout>10</xdqp-timeout>
+      <host-timeout>30</host-timeout>
+      <host-initial-timeout>240</host-initial-timeout>
+      <retry-timeout>180</retry-timeout>
+      <module-cache-timeout>300</module-cache-timeout>
+
+      <system-log-level>notice</system-log-level>
+      <file-log-level>info</file-log-level>
+      <rotate-log-files>daily</rotate-log-files>
+      <keep-log-files>7</keep-log-files>
+
+      <failover-enable>true</failover-enable>
+      <xdqp-ssl-enabled>false</xdqp-ssl-enabled>
+      <xdqp-ssl-allow-sslv3>true</xdqp-ssl-allow-sslv3>
+      <xdqp-ssl-allow-tls>true</xdqp-ssl-allow-tls>
+      <xdqp-ssl-ciphers>ALL:!LOW:@STRENGTH</xdqp-ssl-ciphers>
+
+      <background-io-limit>0</background-io-limit>
+      <metering-enabled>true</metering-enabled>
+      <performance-metering-enabled>true</performance-metering-enabled>
+      <performance-metering-period>60</performance-metering-period>
+      <performance-metering-retain-raw>7</performance-metering-retain-raw>
+      <performance-metering-retain-hourly>30</performance-metering-retain-hourly>
+      <performance-metering-retain-daily>90</performance-metering-retain-daily>
+
+      <s3-domain>s3.amazonaws.com</s3-domain>
+      <s3-protocol>http</s3-protocol>
+      <s3-server-side-encryption>none</s3-server-side-encryption>
+
+      <!-- Diagnostics -->
+      <trace-events-activated>true</trace-events-activated>
+
+      <!-- Auditing -->
+      <audit-enabled>true</audit-enabled>
+      <rotate-audit-files>daily</rotate-audit-files>
+      <keep-audit-files>7</keep-audit-files>
+      <audit-outcome-restriction>both</audit-outcome-restriction>
+    </group>
+  </groups>
+  <hosts xsi:schemaLocation="http://marklogic.com/xdmp/hosts hosts.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://marklogic.com/xdmp/hosts">
+    <host>
+      <host-name>@ml.bootstrap-host</host-name>
+      <group name="roxy-self-test"/>
+    </host>
+  </hosts>
+  <!--Assignments-->
+  <assignments xmlns="http://marklogic.com/xdmp/assignments" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://marklogic.com/xdmp/assignments assignments.xsd">
+    <assignment>
+      <forest-name>@ml.content-db</forest-name>
+    </assignment>
+    @ml.test-content-db-assignment
+    @ml.test-modules-db-assignment
+    <assignment>
+      <forest-name>@ml.modules-db</forest-name>
+    </assignment>
+    @ml.schemas-assignment
+    @ml.triggers-assignment
+  </assignments>
+  <!--
+    =========================================================
+    Databases that are created as part of the application
+    Add any database configuration or indexes here
+      =========================================================
+  -->
+  <databases xmlns="http://marklogic.com/xdmp/database" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://marklogic.com/xdmp/database database.xsd">
+    <!--Application Database Configuration-->
+    @ml.test-content-db-xml
+    <database>
+      <database-name>@ml.content-db</database-name>
+      <forests-per-host>@ml.content-forests-per-host</forests-per-host>
+      @ml.schemas-mapping
+      @ml.triggers-mapping
+      <forests>
+        <forest-id name="@ml.content-db"/>
+      </forests>
+      <enabled>true</enabled>
+      <security-database>@ml.content-db-security</security-database>
+      <language>en</language>
+    </database>
+    <!--Create Application Modules Database-->
+    <database>
+      <database-name>@ml.modules-db</database-name>
+      <forests>
+        <forest-id name="@ml.modules-db"/>
+      </forests>
+      <stemmed-searches>basic</stemmed-searches>
+      <word-searches>false</word-searches>
+      <word-positions>false</word-positions>
+      <fast-phrase-searches>true</fast-phrase-searches>
+      <fast-reverse-searches>false</fast-reverse-searches>
+      <fast-case-sensitive-searches>true</fast-case-sensitive-searches>
+      <fast-diacritic-sensitive-searches>true</fast-diacritic-sensitive-searches>
+      <fast-element-word-searches>true</fast-element-word-searches>
+      <element-word-positions>false</element-word-positions>
+      <fast-element-phrase-searches>true</fast-element-phrase-searches>
+      <element-value-positions>false</element-value-positions>
+      <attribute-value-positions>false</attribute-value-positions>
+      <field-value-searches>false</field-value-searches>
+      <field-value-positions>false</field-value-positions>
+      <three-character-searches>false</three-character-searches>
+      <three-character-word-positions>false</three-character-word-positions>
+      <fast-element-character-searches>false</fast-element-character-searches>
+      <trailing-wildcard-searches>false</trailing-wildcard-searches>
+      <trailing-wildcard-word-positions>false</trailing-wildcard-word-positions>
+      <fast-element-trailing-wildcard-searches>false</fast-element-trailing-wildcard-searches>
+      <word-lexicons>
+        <word-lexicon>http://marklogic.com/collation/</word-lexicon>
+        <word-lexicon>http://marklogic.com/collation/codepoint</word-lexicon>
+      </word-lexicons>
+      <two-character-searches>false</two-character-searches>
+      <one-character-searches>false</one-character-searches>
+      <uri-lexicon>true</uri-lexicon>
+      <collection-lexicon>false</collection-lexicon>
+      <reindexer-enable>true</reindexer-enable>
+      <reindexer-throttle>5</reindexer-throttle>
+      <reindexer-timestamp>0</reindexer-timestamp>
+      <directory-creation>manual</directory-creation>
+      <maintain-last-modified>false</maintain-last-modified>
+      <maintain-directory-last-modified>false</maintain-directory-last-modified>
+      <inherit-permissions>false</inherit-permissions>
+      <inherit-collections>false</inherit-collections>
+      <inherit-quality>false</inherit-quality>
+      <in-memory-limit>32768</in-memory-limit>
+      <in-memory-list-size>64</in-memory-list-size>
+      <in-memory-tree-size>16</in-memory-tree-size>
+      <in-memory-range-index-size>2</in-memory-range-index-size>
+      <in-memory-reverse-index-size>2</in-memory-reverse-index-size>
+      <large-size-threshold>1024</large-size-threshold>
+      <locking>fast</locking>
+      <journaling>fast</journaling>
+      <journal-size>128</journal-size>
+      <preallocate-journals>false</preallocate-journals>
+      <preload-mapped-data>false</preload-mapped-data>
+      <preload-replica-mapped-data>false</preload-replica-mapped-data>
+      <range-index-optimize>facet-time</range-index-optimize>
+      <positions-list-max-size>256</positions-list-max-size>
+      <format-compatibility>automatic</format-compatibility>
+      <index-detection>automatic</index-detection>
+      <expunge-locks>automatic</expunge-locks>
+      <tf-normalization>scaled-log</tf-normalization>
+      <merge-priority>lower</merge-priority>
+      <merge-max-size>0</merge-max-size>
+      <merge-min-size>1024</merge-min-size>
+      <merge-min-ratio>2</merge-min-ratio>
+      <merge-timestamp>0</merge-timestamp>
+    </database>
+    <!--Create Test Modules Database-->
+    @ml.test-modules-db-xml
+    <!--Create a Triggers Database-->
+    @ml.triggers-db-xml
+    @ml.schemas-db-xml
+  </databases>
+  <roles xmlns="http://marklogic.com/xdmp/security">
+    <role>
+      <role-name>@ml.app-role</role-name>
+      <description>A role for users of the @ml.app-name application</description>
+      <compartment>roxy</compartment>
+      <role-names>
+      </role-names>
+      <permissions>
+        <permission>
+          <capability>execute</capability>
+          <role-name>@ml.app-role</role-name>
+        </permission>
+        <permission>
+          <capability>update</capability>
+          <role-name>@ml.app-role</role-name>
+        </permission>
+        <permission>
+          <capability>insert</capability>
+          <role-name>@ml.app-role</role-name>
+        </permission>
+        <permission>
+          <capability>read</capability>
+          <role-name>@ml.app-role</role-name>
+        </permission>
+      </permissions>
+      <collections>
+      </collections>
+      <privileges>
+        <privilege>
+          <privilege-name>xdmp:value</privilege-name>
+        </privilege>
+        <privilege>
+          <privilege-name>xdmp:add-response-header</privilege-name>
+        </privilege>
+        <privilege>
+          <privilege-name>xdmp:invoke</privilege-name>
+        </privilege>
+        <privilege>
+          <privilege-name>xdmp:with-namespaces</privilege-name>
+        </privilege>
+      </privileges>
+    </role>
+    <role>
+      <role-name>@ml.app-role2</role-name>
+      <description>A second role for users of the @ml.app-name application</description>
+      <role-names>
+      </role-names>
+      <permissions>
+        <permission>
+          <capability>execute</capability>
+          <role-name>@ml.app-role2</role-name>
+        </permission>
+        <permission>
+          <capability>update</capability>
+          <role-name>@ml.app-role2</role-name>
+        </permission>
+        <permission>
+          <capability>insert</capability>
+          <role-name>@ml.app-role2</role-name>
+        </permission>
+        <permission>
+          <capability>read</capability>
+          <role-name>@ml.app-role2</role-name>
+        </permission>
+      </permissions>
+      <collections>
+      </collections>
+      <privileges>
+        <privilege>
+          <privilege-name>xdmp:value</privilege-name>
+        </privilege>
+        <privilege>
+          <privilege-name>xdmp:add-response-header</privilege-name>
+        </privilege>
+        <privilege>
+          <privilege-name>xdmp:invoke</privilege-name>
+        </privilege>
+        <privilege>
+          <privilege-name>xdmp:with-namespaces</privilege-name>
+        </privilege>
+      </privileges>
+    </role>
+  </roles>
+  <users xmlns="http://marklogic.com/xdmp/security">
+    <user>
+      <user-name>@ml.app-name-user</user-name>
+      <description>A user for the @ml.app-name application</description>
+      <password>password</password>
+      <role-names>
+        <role-name>@ml.app-role</role-name>
+      </role-names>
+      <permissions/>
+      <collections/>
+    </user>
+    <user>
+      <user-name>@ml.app-name-user2</user-name>
+      <description>A second user for the @ml.app-name application</description>
+      <password>password2</password>
+      <role-names>
+        <role-name>@ml.app-role2</role-name>
+      </role-names>
+      <permissions/>
+      <collections/>
+    </user>
+  </users>
+  <amps xmlns="http://marklogic.com/xdmp/security">
+    <amp>
+      <namespace>http://marklogic.com/roxy</namespace>
+      <local-name>sample</local-name>
+      <doc-uri>/app/models/sample.xqy</doc-uri>
+      <db-name>@ml.modules-db</db-name>
+      <role-name>admin</role-name>
+    </amp>
+    <amp>
+      <namespace>http://marklogic.com/roxy</namespace>
+      <local-name>sample2</local-name>
+      <doc-uri>/app/models/sample2.xqy</doc-uri>
+      <db-name>@ml.modules-db</db-name>
+      <role-name>admin</role-name>
+    </amp>
+  </amps>
+  <privileges xmlns="http://marklogic.com/xdmp/security">
+    <privilege>
+      <privilege-name>my-action</privilege-name>
+      <action>http://marklogic.com/custom/privilege/my-action</action>
+      <kind>execute</kind>
+    </privilege>
+    <privilege>
+      <privilege-name>my-action2</privilege-name>
+      <action>http://marklogic.com/custom/privilege/my-action2</action>
+      <kind>execute</kind>
+    </privilege>
+  </privileges>
+  <mimetypes xmlns="http://marklogic.com/xdmp/mimetypes">
+    <mimetype>
+      <name>application/crazy</name>
+      <extension>crazy stuff</extension>
+      <format>text</format>
+    </mimetype>
+    <mimetype>
+      <name>application/crazy2</name>
+      <extension>crazy stuff 2</extension>
+      <format>text</format>
+    </mimetype>
+  </mimetypes>
+  <external-security xmlns="http://marklogic.com/xdmp/security">
+    <external-security-name>test-external</external-security-name>
+    <description>a big test</description>
+    <authentication>ldap</authentication>
+    <cache-timeout>300</cache-timeout>
+    <authorization>ldap</authorization>
+    <ldap-server-uri>ldap://dc1.mltest1.local:389</ldap-server-uri>
+    <ldap-base>CN=Users,DC=MLTEST1,DC=LOCAL</ldap-base>
+    <ldap-attribute>sAMAccountName</ldap-attribute>
+    <ldap-default-user/>
+    <ldap-password/>
+  </external-security>
+</configuration>
diff --git a/deploy/test/test_server_config.rb b/deploy/test/test_server_config.rb
index f0677d79..65c641a8 100644
--- a/deploy/test/test_server_config.rb
+++ b/deploy/test/test_server_config.rb
@@ -74,16 +74,39 @@
       r = @s.execute_query %Q{xdmp:host-name(xdmp:host())}
       r.body = parse_body(r.body)
       @properties['ml.bootstrap-host'] = r.body
+    end
 
+    it "should bootstrap successfully" do
+      @logger.info "\n\n*** bootstrap:\n"
       @s.bootstrap.must_equal true
+      @logger.info "\n\n*** validate:\n"
       @s.validate_install.must_equal true
     end
 
-    it "should bootstrap successfully twice consecutively" do
+    it "should bootstrap twice consecutively" do
+      @logger.info "\n\n*** bootstrap twice:\n"
       @s.bootstrap.must_equal true
+      @logger.info "\n\n*** validate twice:\n"
       @s.validate_install.must_equal true
     end
 
+    it "should skip removal of indexes at bootstrap if not specified" do
+      unchanged_config = File.expand_path("../data/ml#{@version}-config-unchanged.xml", __FILE__)
+
+      if File.exists?(unchanged_config)
+        @s = ServerConfig.new({
+            :config_file => unchanged_config,
+            :properties => @properties,
+            :logger => @logger
+          })
+
+        @logger.info "\n\n*** bootstrap unchanged:\n"
+        @s.bootstrap.must_equal true
+        @logger.info "\n\n*** validate unchanged:\n"
+        @s.validate_install.must_equal true
+      end
+    end
+
     it "should bootstrap a changed config file" do
       changed_config = File.expand_path("../data/ml#{@version}-config-changed.xml", __FILE__)
 
@@ -94,7 +117,9 @@
             :logger => @logger
           })
 
+        @logger.info "\n\n*** bootstrap changed:\n"
         @s.bootstrap.must_equal true
+        @logger.info "\n\n*** validate changed:\n"
         @s.validate_install.must_equal true
       end
     end