Skip to content
This repository was archived by the owner on Nov 9, 2022. It is now read-only.

Commit 7bc489b

Browse files
RobertSzkutakRobertSzkutak
committed
Fixed ml-configs to reflect a change in property names
1 parent 36cbdb7 commit 7bc489b

File tree

6 files changed

+52
-52
lines changed

6 files changed

+52
-52
lines changed

‎deploy/sample/ml-config.sample.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<task-period>2</task-period>
3131
<task-start-time>13:00:00-05:00</task-start-time>
3232
<task-database name="${content-db}"/>
33-
<task-modules name="${app-modules-db}"/>
33+
<task-modules name="${modules-db}"/>
3434
<task-user name="${app-name}-user"/>
3535
</scheduled-task>
3636
<scheduled-task>
@@ -40,7 +40,7 @@
4040
<task-period>2</task-period>
4141
<task-minute>15</task-minute>
4242
<task-database name="${content-db}"/>
43-
<task-modules name="${app-modules-db}"/>
43+
<task-modules name="${modules-db}"/>
4444
<task-user name="${app-name}-user"/>
4545
</scheduled-task>
4646
<scheduled-task>
@@ -49,7 +49,7 @@
4949
<task-type>minutely</task-type>
5050
<task-period>3</task-period>
5151
<task-database name="${content-db}"/>
52-
<task-modules name="${app-modules-db}"/>
52+
<task-modules name="${modules-db}"/>
5353
<task-user name="${app-name}-user"/>
5454
</scheduled-task>
5555
<scheduled-task>
@@ -60,7 +60,7 @@
6060
<task-month-day>15</task-month-day>
6161
<task-start-time>13:00:00-05:00</task-start-time>
6262
<task-database name="${content-db}"/>
63-
<task-modules name="${app-modules-db}"/>
63+
<task-modules name="${modules-db}"/>
6464
<task-user name="${app-name}-user"/>
6565
</scheduled-task>
6666
<scheduled-task>
@@ -70,7 +70,7 @@
7070
<task-period>1</task-period>
7171
<task-start>2019-01-01T13:00:00-05:00</task-start>
7272
<task-database name="${content-db}"/>
73-
<task-modules name="${app-modules-db}"/>
73+
<task-modules name="${modules-db}"/>
7474
<task-user name="${app-name}-user"/>
7575
</scheduled-task>
7676
<scheduled-task>
@@ -85,7 +85,7 @@
8585
</task-days>
8686
<task-start-time>13:00:00-05:00</task-start-time>
8787
<task-database name="${content-db}"/>
88-
<task-modules name="${app-modules-db}"/>
88+
<task-modules name="${modules-db}"/>
8989
<task-user name="${app-name}-user"/>
9090
</scheduled-task>
9191
</scheduled-tasks>
@@ -97,7 +97,7 @@
9797
<http-server-name>${app-name}</http-server-name>
9898
<port>${app-port}</port>
9999
<database name="${content-db}"/>
100-
<modules name="${app-modules-db}"/>
100+
<modules name="${modules-db}"/>
101101
<root>${modules-root}</root>
102102
<authentication>${authentication-method}</authentication>
103103
<default-user name="${default-user}"/>
@@ -550,7 +550,7 @@
550550
<namespace>http://marklogic.com/roxy</namespace>
551551
<local-name>sample</local-name>
552552
<doc-uri>/app/models/sample.xqy</doc-uri>
553-
<db-name>${app-modules-db}</db-name>
553+
<db-name>${modules-db}</db-name>
554554
<role-name>a-privileged-role</role-name>
555555
</amp>
556556
-->

‎deploy/test/data/ml4-config.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<http-server-name>@ml.app-name</http-server-name>
2020
<port>@ml.app-port</port>
2121
<database name="@ml.content-db"/>
22-
<modules name="@ml.app-modules-db"/>
22+
<modules name="@ml.modules-db"/>
2323
<last-login>0</last-login>
2424
<display-last-login>false</display-last-login>
2525
<address>0.0.0.0</address>
@@ -604,14 +604,14 @@
604604
<namespace>http://marklogic.com/roxy</namespace>
605605
<local-name>sample</local-name>
606606
<doc-uri>/app/models/sample.xqy</doc-uri>
607-
<db-name>@ml.app-modules-db</db-name>
607+
<db-name>@ml.modules-db</db-name>
608608
<role-name>admin</role-name>
609609
</amp>
610610
<amp>
611611
<namespace>http://marklogic.com/roxy</namespace>
612612
<local-name>sample2</local-name>
613613
<doc-uri>/app/models/sample2.xqy</doc-uri>
614-
<db-name>@ml.app-modules-db</db-name>
614+
<db-name>@ml.modules-db</db-name>
615615
<role-name>admin</role-name>
616616
</amp>
617617
</amps>
@@ -639,4 +639,4 @@
639639
<format>text</format>
640640
</mimetype>
641641
</mimetypes>
642-
</configuration>
642+
</configuration>

‎deploy/test/data/ml5-config.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<http-server-name>@ml.app-name</http-server-name>
2020
<port>@ml.app-port</port>
2121
<database name="@ml.content-db"/>
22-
<modules name="@ml.app-modules-db"/>
22+
<modules name="@ml.modules-db"/>
2323
<last-login>0</last-login>
2424
<display-last-login>false</display-last-login>
2525
<address>0.0.0.0</address>
@@ -662,14 +662,14 @@
662662
<namespace>http://marklogic.com/roxy</namespace>
663663
<local-name>sample</local-name>
664664
<doc-uri>/app/models/sample.xqy</doc-uri>
665-
<db-name>@ml.app-modules-db</db-name>
665+
<db-name>@ml.modules-db</db-name>
666666
<role-name>admin</role-name>
667667
</amp>
668668
<amp>
669669
<namespace>http://marklogic.com/roxy</namespace>
670670
<local-name>sample2</local-name>
671671
<doc-uri>/app/models/sample2.xqy</doc-uri>
672-
<db-name>@ml.app-modules-db</db-name>
672+
<db-name>@ml.modules-db</db-name>
673673
<role-name>admin</role-name>
674674
</amp>
675675
</amps>

‎deploy/test/data/ml6-config.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<task-period>2</task-period>
2020
<task-start-time>13:00:00-05:00</task-start-time>
2121
<task-database name="@ml.content-db"/>
22-
<task-modules name="@ml.app-modules-db"/>
22+
<task-modules name="@ml.modules-db"/>
2323
<task-user name="@ml.app-name-user"/>
2424
</scheduled-task>
2525
<scheduled-task>
@@ -29,7 +29,7 @@
2929
<task-period>2</task-period>
3030
<task-minute>15</task-minute>
3131
<task-database name="@ml.content-db"/>
32-
<task-modules name="@ml.app-modules-db"/>
32+
<task-modules name="@ml.modules-db"/>
3333
<task-user name="@ml.app-name-user"/>
3434
</scheduled-task>
3535
<scheduled-task>
@@ -38,7 +38,7 @@
3838
<task-type>minutely</task-type>
3939
<task-period>3</task-period>
4040
<task-database name="@ml.content-db"/>
41-
<task-modules name="@ml.app-modules-db"/>
41+
<task-modules name="@ml.modules-db"/>
4242
<task-user name="@ml.app-name-user"/>
4343
</scheduled-task>
4444
<scheduled-task>
@@ -49,7 +49,7 @@
4949
<task-month-day>15</task-month-day>
5050
<task-start-time>13:00:00-05:00</task-start-time>
5151
<task-database name="@ml.content-db"/>
52-
<task-modules name="@ml.app-modules-db"/>
52+
<task-modules name="@ml.modules-db"/>
5353
<task-user name="@ml.app-name-user"/>
5454
</scheduled-task>
5555
<scheduled-task>
@@ -58,7 +58,7 @@
5858
<task-type>once</task-type>
5959
<task-start>2019-01-01T13:00:00-05:00</task-start>
6060
<task-database name="@ml.content-db"/>
61-
<task-modules name="@ml.app-modules-db"/>
61+
<task-modules name="@ml.modules-db"/>
6262
<task-user name="@ml.app-name-user"/>
6363
</scheduled-task>
6464
<scheduled-task>
@@ -73,7 +73,7 @@
7373
</task-days>
7474
<task-start-time>13:00:00-05:00</task-start-time>
7575
<task-database name="@ml.content-db"/>
76-
<task-modules name="@ml.app-modules-db"/>
76+
<task-modules name="@ml.modules-db"/>
7777
<task-user name="@ml.app-name-user"/>
7878
</scheduled-task>
7979
</scheduled-tasks>
@@ -84,7 +84,7 @@
8484
<http-server-name>@ml.app-name</http-server-name>
8585
<port>@ml.app-port</port>
8686
<database name="@ml.content-db"/>
87-
<modules name="@ml.app-modules-db"/>
87+
<modules name="@ml.modules-db"/>
8888
<last-login>0</last-login>
8989
<display-last-login>false</display-last-login>
9090
<address>0.0.0.0</address>
@@ -155,7 +155,7 @@
155155
<enabled>false</enabled>
156156
<root>/@ml.app-name/</root>
157157
<port>[email protected]</port>
158-
<modules name="@ml.app-modules-db"/>
158+
<modules name="@ml.modules-db"/>
159159
<database name="@ml.content-db"/>
160160
<last-login>Last-Login</last-login>
161161
<display-last-login>true</display-last-login>
@@ -309,7 +309,7 @@
309309
<profile-allow>false</profile-allow>
310310
<default-xquery-version>1.0</default-xquery-version>
311311
<multi-version-concurrency-control>nonblocking</multi-version-concurrency-control>
312-
312+
313313
<output-sgml-character-entities>normal</output-sgml-character-entities>
314314
<output-encoding>ASCII</output-encoding>
315315
<output-method>xml</output-method>
@@ -457,10 +457,10 @@
457457
<s3-domain>s3.amazonaws.com</s3-domain>
458458
<s3-protocol>http</s3-protocol>
459459
<s3-server-side-encryption>none</s3-server-side-encryption>
460-
460+
461461
<!-- Diagnostics -->
462462
<trace-events-activated>true</trace-events-activated>
463-
463+
464464
<!-- Auditing -->
465465
<audit-enabled>true</audit-enabled>
466466
<rotate-audit-files>daily</rotate-audit-files>
@@ -1083,14 +1083,14 @@
10831083
<namespace>http://marklogic.com/roxy</namespace>
10841084
<local-name>sample</local-name>
10851085
<doc-uri>/app/models/sample.xqy</doc-uri>
1086-
<db-name>@ml.app-modules-db</db-name>
1086+
<db-name>@ml.modules-db</db-name>
10871087
<role-name>admin</role-name>
10881088
</amp>
10891089
<amp>
10901090
<namespace>http://marklogic.com/roxy</namespace>
10911091
<local-name>sample2</local-name>
10921092
<doc-uri>/app/models/sample2.xqy</doc-uri>
1093-
<db-name>@ml.app-modules-db</db-name>
1093+
<db-name>@ml.modules-db</db-name>
10941094
<role-name>admin</role-name>
10951095
</amp>
10961096
</amps>

‎deploy/test/data/ml7-config-changed.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<task-period>2</task-period>
2020
<task-start-time>13:00:00-05:00</task-start-time>
2121
<task-database name="@ml.content-db"/>
22-
<task-modules name="@ml.app-modules-db"/>
22+
<task-modules name="@ml.modules-db"/>
2323
<task-user name="@ml.app-name-user"/>
2424
</scheduled-task>
2525
<scheduled-task>
@@ -29,7 +29,7 @@
2929
<task-period>2</task-period>
3030
<task-minute>15</task-minute>
3131
<task-database name="@ml.content-db"/>
32-
<task-modules name="@ml.app-modules-db"/>
32+
<task-modules name="@ml.modules-db"/>
3333
<task-user name="@ml.app-name-user"/>
3434
</scheduled-task>
3535
<scheduled-task>
@@ -38,7 +38,7 @@
3838
<task-type>minutely</task-type>
3939
<task-period>3</task-period>
4040
<task-database name="@ml.content-db"/>
41-
<task-modules name="@ml.app-modules-db"/>
41+
<task-modules name="@ml.modules-db"/>
4242
<task-user name="@ml.app-name-user"/>
4343
</scheduled-task>
4444
<scheduled-task>
@@ -49,7 +49,7 @@
4949
<task-month-day>15</task-month-day>
5050
<task-start-time>13:00:00-05:00</task-start-time>
5151
<task-database name="@ml.content-db"/>
52-
<task-modules name="@ml.app-modules-db"/>
52+
<task-modules name="@ml.modules-db"/>
5353
<task-user name="@ml.app-name-user"/>
5454
</scheduled-task>
5555
<scheduled-task>
@@ -58,7 +58,7 @@
5858
<task-type>once</task-type>
5959
<task-start>2019-01-01T13:00:00-05:00</task-start>
6060
<task-database name="@ml.content-db"/>
61-
<task-modules name="@ml.app-modules-db"/>
61+
<task-modules name="@ml.modules-db"/>
6262
<task-user name="@ml.app-name-user"/>
6363
</scheduled-task>
6464
<scheduled-task>
@@ -73,7 +73,7 @@
7373
</task-days>
7474
<task-start-time>13:00:00-05:00</task-start-time>
7575
<task-database name="@ml.content-db"/>
76-
<task-modules name="@ml.app-modules-db"/>
76+
<task-modules name="@ml.modules-db"/>
7777
<task-user name="@ml.app-name-user"/>
7878
</scheduled-task>
7979
</scheduled-tasks>
@@ -85,7 +85,7 @@
8585
<enabled>false</enabled>
8686
<root>/@ml.app-name/</root>
8787
<port>@ml.app-port</port>
88-
<modules name="@ml.app-modules-db"/>
88+
<modules name="@ml.modules-db"/>
8989
<database name="@ml.content-db"/>
9090
<last-login>Last-Login</last-login>
9191
<display-last-login>true</display-last-login>
@@ -223,7 +223,7 @@
223223
<enabled>false</enabled>
224224
<root>/@ml.app-name/</root>
225225
<port>[email protected]</port>
226-
<modules name="@ml.app-modules-db"/>
226+
<modules name="@ml.modules-db"/>
227227
<database name="@ml.content-db"/>
228228
<last-login>Last-Login</last-login>
229229
<display-last-login>true</display-last-login>
@@ -540,10 +540,10 @@
540540
<s3-domain>s3.amazonaws.com2</s3-domain>
541541
<s3-protocol>http</s3-protocol>
542542
<s3-server-side-encryption>none</s3-server-side-encryption>
543-
543+
544544
<!-- Diagnostics -->
545545
<trace-events-activated>false</trace-events-activated>
546-
546+
547547
<!-- Auditing -->
548548
<audit-enabled>false</audit-enabled>
549549
<rotate-audit-files>hourly</rotate-audit-files>
@@ -1209,14 +1209,14 @@
12091209
<namespace>http://marklogic.com/roxy</namespace>
12101210
<local-name>sample</local-name>
12111211
<doc-uri>/app/models/sample.xqy</doc-uri>
1212-
<db-name>@ml.app-modules-db</db-name>
1212+
<db-name>@ml.modules-db</db-name>
12131213
<role-name>admin</role-name>
12141214
</amp>
12151215
<amp>
12161216
<namespace>http://marklogic.com/roxy</namespace>
12171217
<local-name>sample2</local-name>
12181218
<doc-uri>/app/models/sample2.xqy</doc-uri>
1219-
<db-name>@ml.app-modules-db</db-name>
1219+
<db-name>@ml.modules-db</db-name>
12201220
<role-name>admin</role-name>
12211221
</amp>
12221222
</amps>

0 commit comments

Comments
 (0)