From 89e648a42617c85707ac59770cbc30b30e00f258 Mon Sep 17 00:00:00 2001
From: Geert Josten <geert.josten@marklogic.com>
Date: Mon, 12 Jun 2017 15:30:03 +0200
Subject: [PATCH] Syncing test files with issue #500

---
 deploy/test/data/ml8-config-changed.xml | 18 ++++++++++++------
 deploy/test/data/ml8-config.xml         | 18 ++++++++++++------
 deploy/test/data/ml9-config-changed.xml | 18 ++++++++++++------
 deploy/test/data/ml9-config.xml         | 18 ++++++++++++------
 4 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/deploy/test/data/ml8-config-changed.xml b/deploy/test/data/ml8-config-changed.xml
index 7320b60e..34c6ad9d 100644
--- a/deploy/test/data/ml8-config-changed.xml
+++ b/deploy/test/data/ml8-config-changed.xml
@@ -20,7 +20,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/hourly-task.xqy</task-path>
@@ -30,7 +31,8 @@
         <task-minute>15</task-minute>
         <task-database name="@ml.content-db"/>
         <task-modules name="@ml.modules-db"/>
-        <task-user name="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/minutely-task.xqy</task-path>
@@ -39,7 +41,8 @@
         <task-period>3</task-period>
         <task-database name="@ml.content-db"/>
         <task-modules name="@ml.modules-db"/>
-        <task-user name="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/monthly-task.xqy</task-path>
@@ -50,7 +53,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/once-task.xqy</task-path>
@@ -59,7 +63,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/weekly-task.xqy</task-path>
@@ -74,7 +79,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
     </scheduled-tasks>
   </task-server>
diff --git a/deploy/test/data/ml8-config.xml b/deploy/test/data/ml8-config.xml
index 1a3d0933..6e0c06d5 100644
--- a/deploy/test/data/ml8-config.xml
+++ b/deploy/test/data/ml8-config.xml
@@ -20,7 +20,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/hourly-task.xqy</task-path>
@@ -30,7 +31,8 @@
         <task-minute>15</task-minute>
         <task-database name="@ml.content-db"/>
         <task-modules name="@ml.modules-db"/>
-        <task-user name="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/minutely-task.xqy</task-path>
@@ -39,7 +41,8 @@
         <task-period>3</task-period>
         <task-database name="@ml.content-db"/>
         <task-modules name="@ml.modules-db"/>
-        <task-user name="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/monthly-task.xqy</task-path>
@@ -50,7 +53,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/once-task.xqy</task-path>
@@ -59,7 +63,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/weekly-task.xqy</task-path>
@@ -74,7 +79,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
     </scheduled-tasks>
   </task-server>
diff --git a/deploy/test/data/ml9-config-changed.xml b/deploy/test/data/ml9-config-changed.xml
index 7320b60e..34c6ad9d 100644
--- a/deploy/test/data/ml9-config-changed.xml
+++ b/deploy/test/data/ml9-config-changed.xml
@@ -20,7 +20,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/hourly-task.xqy</task-path>
@@ -30,7 +31,8 @@
         <task-minute>15</task-minute>
         <task-database name="@ml.content-db"/>
         <task-modules name="@ml.modules-db"/>
-        <task-user name="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/minutely-task.xqy</task-path>
@@ -39,7 +41,8 @@
         <task-period>3</task-period>
         <task-database name="@ml.content-db"/>
         <task-modules name="@ml.modules-db"/>
-        <task-user name="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/monthly-task.xqy</task-path>
@@ -50,7 +53,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/once-task.xqy</task-path>
@@ -59,7 +63,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/weekly-task.xqy</task-path>
@@ -74,7 +79,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
     </scheduled-tasks>
   </task-server>
diff --git a/deploy/test/data/ml9-config.xml b/deploy/test/data/ml9-config.xml
index 1a3d0933..6e0c06d5 100644
--- a/deploy/test/data/ml9-config.xml
+++ b/deploy/test/data/ml9-config.xml
@@ -20,7 +20,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/hourly-task.xqy</task-path>
@@ -30,7 +31,8 @@
         <task-minute>15</task-minute>
         <task-database name="@ml.content-db"/>
         <task-modules name="@ml.modules-db"/>
-        <task-user name="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/minutely-task.xqy</task-path>
@@ -39,7 +41,8 @@
         <task-period>3</task-period>
         <task-database name="@ml.content-db"/>
         <task-modules name="@ml.modules-db"/>
-        <task-user name="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/monthly-task.xqy</task-path>
@@ -50,7 +53,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/once-task.xqy</task-path>
@@ -59,7 +63,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
       <scheduled-task>
         <task-path>/some/weekly-task.xqy</task-path>
@@ -74,7 +79,8 @@
         <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="@ml.app-name-user"/>
+        <task-user name="${default-user}"/>
+        <task-host name="${server-name}"/>
       </scheduled-task>
     </scheduled-tasks>
   </task-server>