Skip to content

Commit

Permalink
Fixed ml-configs to reflect a change in property names
Browse files Browse the repository at this point in the history
  • Loading branch information
@RobertSzkutak
RobertSzkutak committed Feb 3, 2017
1 parent 36cbdb7 commit 7bc489b
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 52 deletions.
16 changes: 8 additions & 8 deletions deploy/sample/ml-config.sample.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<task-period>2</task-period>
<task-start-time>13:00:00-05:00</task-start-time>
<task-database name="${content-db}"/>
<task-modules name="${app-modules-db}"/>
<task-modules name="${modules-db}"/>
<task-user name="${app-name}-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -40,7 +40,7 @@
<task-period>2</task-period>
<task-minute>15</task-minute>
<task-database name="${content-db}"/>
<task-modules name="${app-modules-db}"/>
<task-modules name="${modules-db}"/>
<task-user name="${app-name}-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -49,7 +49,7 @@
<task-type>minutely</task-type>
<task-period>3</task-period>
<task-database name="${content-db}"/>
<task-modules name="${app-modules-db}"/>
<task-modules name="${modules-db}"/>
<task-user name="${app-name}-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -60,7 +60,7 @@
<task-month-day>15</task-month-day>
<task-start-time>13:00:00-05:00</task-start-time>
<task-database name="${content-db}"/>
<task-modules name="${app-modules-db}"/>
<task-modules name="${modules-db}"/>
<task-user name="${app-name}-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -70,7 +70,7 @@
<task-period>1</task-period>
<task-start>2019-01-01T13:00:00-05:00</task-start>
<task-database name="${content-db}"/>
<task-modules name="${app-modules-db}"/>
<task-modules name="${modules-db}"/>
<task-user name="${app-name}-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -85,7 +85,7 @@
</task-days>
<task-start-time>13:00:00-05:00</task-start-time>
<task-database name="${content-db}"/>
<task-modules name="${app-modules-db}"/>
<task-modules name="${modules-db}"/>
<task-user name="${app-name}-user"/>
</scheduled-task>
</scheduled-tasks>
Expand All @@ -97,7 +97,7 @@
<http-server-name>${app-name}</http-server-name>
<port>${app-port}</port>
<database name="${content-db}"/>
<modules name="${app-modules-db}"/>
<modules name="${modules-db}"/>
<root>${modules-root}</root>
<authentication>${authentication-method}</authentication>
<default-user name="${default-user}"/>
Expand Down Expand Up @@ -550,7 +550,7 @@
<namespace>http://marklogic.com/roxy</namespace>
<local-name>sample</local-name>
<doc-uri>/app/models/sample.xqy</doc-uri>
<db-name>${app-modules-db}</db-name>
<db-name>${modules-db}</db-name>
<role-name>a-privileged-role</role-name>
</amp>
-->
Expand Down
8 changes: 4 additions & 4 deletions deploy/test/data/ml4-config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<http-server-name>@ml.app-name</http-server-name>
<port>@ml.app-port</port>
<database name="@ml.content-db"/>
<modules name="@ml.app-modules-db"/>
<modules name="@ml.modules-db"/>
<last-login>0</last-login>
<display-last-login>false</display-last-login>
<address>0.0.0.0</address>
Expand Down Expand Up @@ -604,14 +604,14 @@
<namespace>http://marklogic.com/roxy</namespace>
<local-name>sample</local-name>
<doc-uri>/app/models/sample.xqy</doc-uri>
<db-name>@ml.app-modules-db</db-name>
<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.app-modules-db</db-name>
<db-name>@ml.modules-db</db-name>
<role-name>admin</role-name>
</amp>
</amps>
Expand Down Expand Up @@ -639,4 +639,4 @@
<format>text</format>
</mimetype>
</mimetypes>
</configuration>
</configuration>
6 changes: 3 additions & 3 deletions deploy/test/data/ml5-config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<http-server-name>@ml.app-name</http-server-name>
<port>@ml.app-port</port>
<database name="@ml.content-db"/>
<modules name="@ml.app-modules-db"/>
<modules name="@ml.modules-db"/>
<last-login>0</last-login>
<display-last-login>false</display-last-login>
<address>0.0.0.0</address>
Expand Down Expand Up @@ -662,14 +662,14 @@
<namespace>http://marklogic.com/roxy</namespace>
<local-name>sample</local-name>
<doc-uri>/app/models/sample.xqy</doc-uri>
<db-name>@ml.app-modules-db</db-name>
<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.app-modules-db</db-name>
<db-name>@ml.modules-db</db-name>
<role-name>admin</role-name>
</amp>
</amps>
Expand Down
26 changes: 13 additions & 13 deletions deploy/test/data/ml6-config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<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.app-modules-db"/>
<task-modules name="@ml.modules-db"/>
<task-user name="@ml.app-name-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -29,7 +29,7 @@
<task-period>2</task-period>
<task-minute>15</task-minute>
<task-database name="@ml.content-db"/>
<task-modules name="@ml.app-modules-db"/>
<task-modules name="@ml.modules-db"/>
<task-user name="@ml.app-name-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -38,7 +38,7 @@
<task-type>minutely</task-type>
<task-period>3</task-period>
<task-database name="@ml.content-db"/>
<task-modules name="@ml.app-modules-db"/>
<task-modules name="@ml.modules-db"/>
<task-user name="@ml.app-name-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -49,7 +49,7 @@
<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.app-modules-db"/>
<task-modules name="@ml.modules-db"/>
<task-user name="@ml.app-name-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -58,7 +58,7 @@
<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.app-modules-db"/>
<task-modules name="@ml.modules-db"/>
<task-user name="@ml.app-name-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -73,7 +73,7 @@
</task-days>
<task-start-time>13:00:00-05:00</task-start-time>
<task-database name="@ml.content-db"/>
<task-modules name="@ml.app-modules-db"/>
<task-modules name="@ml.modules-db"/>
<task-user name="@ml.app-name-user"/>
</scheduled-task>
</scheduled-tasks>
Expand All @@ -84,7 +84,7 @@
<http-server-name>@ml.app-name</http-server-name>
<port>@ml.app-port</port>
<database name="@ml.content-db"/>
<modules name="@ml.app-modules-db"/>
<modules name="@ml.modules-db"/>
<last-login>0</last-login>
<display-last-login>false</display-last-login>
<address>0.0.0.0</address>
Expand Down Expand Up @@ -155,7 +155,7 @@
<enabled>false</enabled>
<root>/@ml.app-name/</root>
<port>1@ml.app-port</port>
<modules name="@ml.app-modules-db"/>
<modules name="@ml.modules-db"/>
<database name="@ml.content-db"/>
<last-login>Last-Login</last-login>
<display-last-login>true</display-last-login>
Expand Down Expand Up @@ -309,7 +309,7 @@
<profile-allow>false</profile-allow>
<default-xquery-version>1.0</default-xquery-version>
<multi-version-concurrency-control>nonblocking</multi-version-concurrency-control>

<output-sgml-character-entities>normal</output-sgml-character-entities>
<output-encoding>ASCII</output-encoding>
<output-method>xml</output-method>
Expand Down Expand Up @@ -457,10 +457,10 @@
<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>
Expand Down Expand Up @@ -1083,14 +1083,14 @@
<namespace>http://marklogic.com/roxy</namespace>
<local-name>sample</local-name>
<doc-uri>/app/models/sample.xqy</doc-uri>
<db-name>@ml.app-modules-db</db-name>
<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.app-modules-db</db-name>
<db-name>@ml.modules-db</db-name>
<role-name>admin</role-name>
</amp>
</amps>
Expand Down
24 changes: 12 additions & 12 deletions deploy/test/data/ml7-config-changed.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<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.app-modules-db"/>
<task-modules name="@ml.modules-db"/>
<task-user name="@ml.app-name-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -29,7 +29,7 @@
<task-period>2</task-period>
<task-minute>15</task-minute>
<task-database name="@ml.content-db"/>
<task-modules name="@ml.app-modules-db"/>
<task-modules name="@ml.modules-db"/>
<task-user name="@ml.app-name-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -38,7 +38,7 @@
<task-type>minutely</task-type>
<task-period>3</task-period>
<task-database name="@ml.content-db"/>
<task-modules name="@ml.app-modules-db"/>
<task-modules name="@ml.modules-db"/>
<task-user name="@ml.app-name-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -49,7 +49,7 @@
<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.app-modules-db"/>
<task-modules name="@ml.modules-db"/>
<task-user name="@ml.app-name-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -58,7 +58,7 @@
<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.app-modules-db"/>
<task-modules name="@ml.modules-db"/>
<task-user name="@ml.app-name-user"/>
</scheduled-task>
<scheduled-task>
Expand All @@ -73,7 +73,7 @@
</task-days>
<task-start-time>13:00:00-05:00</task-start-time>
<task-database name="@ml.content-db"/>
<task-modules name="@ml.app-modules-db"/>
<task-modules name="@ml.modules-db"/>
<task-user name="@ml.app-name-user"/>
</scheduled-task>
</scheduled-tasks>
Expand All @@ -85,7 +85,7 @@
<enabled>false</enabled>
<root>/@ml.app-name/</root>
<port>@ml.app-port</port>
<modules name="@ml.app-modules-db"/>
<modules name="@ml.modules-db"/>
<database name="@ml.content-db"/>
<last-login>Last-Login</last-login>
<display-last-login>true</display-last-login>
Expand Down Expand Up @@ -223,7 +223,7 @@
<enabled>false</enabled>
<root>/@ml.app-name/</root>
<port>1@ml.app-port</port>
<modules name="@ml.app-modules-db"/>
<modules name="@ml.modules-db"/>
<database name="@ml.content-db"/>
<last-login>Last-Login</last-login>
<display-last-login>true</display-last-login>
Expand Down Expand Up @@ -540,10 +540,10 @@
<s3-domain>s3.amazonaws.com2</s3-domain>
<s3-protocol>http</s3-protocol>
<s3-server-side-encryption>none</s3-server-side-encryption>

<!-- Diagnostics -->
<trace-events-activated>false</trace-events-activated>

<!-- Auditing -->
<audit-enabled>false</audit-enabled>
<rotate-audit-files>hourly</rotate-audit-files>
Expand Down Expand Up @@ -1209,14 +1209,14 @@
<namespace>http://marklogic.com/roxy</namespace>
<local-name>sample</local-name>
<doc-uri>/app/models/sample.xqy</doc-uri>
<db-name>@ml.app-modules-db</db-name>
<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.app-modules-db</db-name>
<db-name>@ml.modules-db</db-name>
<role-name>admin</role-name>
</amp>
</amps>
Expand Down
Loading

0 comments on commit 7bc489b

Please sign in to comment.