marklogic-community#808: a few small changes to make it actually work

grtjn · Jun 14, 2017 · ff509ae · ff509ae
1 parent 9d1f4a2
commit ff509ae
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb
@@ -2685,7 +2685,7 @@ def conditional_prop(prop, default_prop)
 
   def triggers_db_xml
     %Q{
-      <database>
+      <database xmlns="http://marklogic.com/xdmp/database">
         <database-name>@ml.triggers-db</database-name>
         <forests>
           <forest-id name="@ml.triggers-db"/>
@@ -2696,7 +2696,7 @@ def triggers_db_xml
 
   def triggers_assignment
     %Q{
-      <assignment>
+      <assignment xmlns="http://marklogic.com/xdmp/assignments">
         <forest-name>@ml.triggers-db</forest-name>
       </assignment>
     }
@@ -2705,7 +2705,7 @@ def triggers_assignment
   def xdbc_server
     xdbc_auth_method = conditional_prop('ml.xdbc-authentication-method', 'ml.authentication-method')
     %Q{
-      <xdbc-server>
+      <xdbc-server xmlns="http://marklogic.com/xdmp/group">
         <xdbc-server-name>@ml.app-name-xcc</xdbc-server-name>
         <port>@ml.xcc-port</port>
         <database name="@ml.content-db"/>
@@ -2718,7 +2718,7 @@ def xdbc_server
   def odbc_server
     odbc_auth_method = conditional_prop('ml.odbc-authentication-method', 'ml.authentication-method')
     %Q{
-      <odbc-server>
+      <odbc-server xmlns="http://marklogic.com/xdmp/group">
         <odbc-server-name>@ml.app-name-odbc</odbc-server-name>
         <port>@ml.odbc-port</port>
         <database name="@ml.content-db"/>
@@ -2730,7 +2730,7 @@ def odbc_server
 
   def schemas_db_xml
     %Q{
-      <database>
+      <database xmlns="http://marklogic.com/xdmp/database">
         <database-name>@ml.schemas-db</database-name>
         <forests>
           <forest-id name="@ml.schemas-db"/>
@@ -2741,15 +2741,15 @@ def schemas_db_xml
 
   def schemas_assignment
     %Q{
-      <assignment>
+      <assignment xmlns="http://marklogic.com/xdmp/assignments">
         <forest-name>@ml.schemas-db</forest-name>
       </assignment>
     }
   end
 
   def test_content_db_xml
     %Q{
-      <database import="@ml.content-db">
+      <database import="@ml.content-db" xmlns="http://marklogic.com/xdmp/database">
         <database-name>@ml.test-content-db</database-name>
         <forests>
           <forest-id name="@ml.test-content-db"/>
@@ -2760,7 +2760,7 @@ def test_content_db_xml
 
   def test_content_db_assignment
     %Q{
-      <assignment>
+      <assignment xmlns="http://marklogic.com/xdmp/assignments">
         <forest-name>@ml.test-content-db</forest-name>
       </assignment>
     }
@@ -2773,7 +2773,7 @@ def test_appserver
     test_default_user = conditional_prop('ml.test-default-user', 'ml.default-user')
 
     %Q{
-      <http-server import="@ml.app-name">
+      <http-server import="@ml.app-name" xmlns="http://marklogic.com/xdmp/group">
         <http-server-name>@ml.app-name-test</http-server-name>
         <port>@ml.test-port</port>
         <database name="@ml.test-content-db"/>
@@ -2786,7 +2786,7 @@ def test_appserver
 
   def test_modules_db_xml
     %Q{
-      <database import="@ml.modules-db">
+      <database import="@ml.modules-db" xmlns="http://marklogic.com/xdmp/database">
         <database-name>@ml.test-modules-db</database-name>
         <forests>
           <forest-id name="@ml.test-modules-db"/>
@@ -2797,7 +2797,7 @@ def test_modules_db_xml
 
   def test_user_xml
     %Q{
-      <user>
+      <user xmlns="http://marklogic.com/xdmp/security">
         <user-name>${test-user}</user-name>
         <description>A user for the ${app-name} unit tests</description>
         <password>${test-user-password}</password>
@@ -2812,7 +2812,7 @@ def test_user_xml
 
   def test_modules_db_assignment
     %Q{
-      <assignment>
+      <assignment xmlns="http://marklogic.com/xdmp/assignments">
         <forest-name>@ml.test-modules-db</forest-name>
       </assignment>
     }
@@ -2833,7 +2833,7 @@ def rest_appserver
     end
 
     %Q{
-      <http-server import="@ml.app-name">
+      <http-server import="@ml.app-name" xmlns="http://marklogic.com/xdmp/group">
         <http-server-name>@ml.app-name-rest</http-server-name>
         <port>@ml.rest-port</port>
         <database name="@ml.content-db"/>
@@ -2851,7 +2851,7 @@ def rest_modules_db_xml
     rest_modules_db = conditional_prop('ml.rest-modules-db', 'ml.modules-db')
 
     %Q{
-      <database>
+      <database xmlns="http://marklogic.com/xdmp/database">
         <database-name>#{rest_modules_db}</database-name>
         <forests>
           <forest-id name="#{rest_modules_db}"/>
@@ -2864,15 +2864,15 @@ def rest_modules_db_assignment
     rest_modules_db = conditional_prop('ml.rest-modules-db', 'ml.modules-db')
 
     %Q{
-      <assignment>
+      <assignment xmlns="http://marklogic.com/xdmp/assignments">
         <forest-name>#{rest_modules_db}</forest-name>
       </assignment>
     }
   end
 
   def ssl_certificate_xml
     %Q{
-      <certificate>
+      <certificate xmlns="http://marklogic.com/xdmp/pki">
         <name>@ml.ssl-certificate-template</name>
         <countryName>@ml.ssl-certificate-countryName</countryName>
         <stateOrProvinceName>@ml.ssl-certificate-stateOrProvinceName</stateOrProvinceName>

diff --git a/deploy/sample/ml-config.sample/security/amps/sample-amp.xml b/deploy/sample/ml-config.sample/security/amps/sample-amp.xml
@@ -8,5 +8,5 @@
   <local-name>sample</local-name>
   <doc-uri>/app/models/sample.xqy</doc-uri>
   <db-name>${modules-db}</db-name>
-  <role-name>a-privileged-role</role-name>
+  <role-name>${app-role}</role-name>
 </amp>
diff --git a/deploy/sample/ml-config.sample/tasks/tasks.xml b/deploy/sample/ml-config.sample/tasks/tasks.xml
@@ -28,7 +28,7 @@
             <task-start-time>13:00:00-05:00</task-start-time>
             <task-database name="${content-db}"/>
             <task-modules name="${modules-db}"/>
-            <task-user name="${app-name}-user"/>
+            <task-user name="${default-user}"/>
           </scheduled-task>
           <scheduled-task>
             <task-path>/some/hourly-task.xqy</task-path>
@@ -38,7 +38,7 @@
             <task-minute>15</task-minute>
             <task-database name="${content-db}"/>
             <task-modules name="${modules-db}"/>
-            <task-user name="${app-name}-user"/>
+            <task-user name="${default-user}"/>
           </scheduled-task>
           <scheduled-task>
             <task-path>/some/minutely-task.xqy</task-path>
@@ -47,7 +47,7 @@
             <task-period>3</task-period>
             <task-database name="${content-db}"/>
             <task-modules name="${modules-db}"/>
-            <task-user name="${app-name}-user"/>
+            <task-user name="${default-user}"/>
           </scheduled-task>
           <scheduled-task>
             <task-path>/some/monthly-task.xqy</task-path>
@@ -58,17 +58,16 @@
             <task-start-time>13:00:00-05:00</task-start-time>
             <task-database name="${content-db}"/>
             <task-modules name="${modules-db}"/>
-            <task-user name="${app-name}-user"/>
+            <task-user name="${default-user}"/>
           </scheduled-task>
           <scheduled-task>
             <task-path>/some/once-task.xqy</task-path>
             <task-root>/</task-root>
             <task-type>once</task-type>
-            <task-period>1</task-period>
             <task-start>2019-01-01T13:00:00-05:00</task-start>
             <task-database name="${content-db}"/>
             <task-modules name="${modules-db}"/>
-            <task-user name="${app-name}-user"/>
+            <task-user name="${default-user}"/>
           </scheduled-task>
           <scheduled-task>
             <task-path>/some/weekly-task.xqy</task-path>
@@ -83,7 +82,7 @@
             <task-start-time>13:00:00-05:00</task-start-time>
             <task-database name="${content-db}"/>
             <task-modules name="${modules-db}"/>
-            <task-user name="${app-name}-user"/>
+            <task-user name="${default-user}"/>
           </scheduled-task>
         </scheduled-tasks>
       </task-server>