Changed configuration model
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/55f72f28 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/55f72f28 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/55f72f28 Branch: refs/heads/master Commit: 55f72f28244b22a347b84a9868bbc54a0195714c Parents: 89f7aa3 Author: Martin Stockhammer <[email protected]> Authored: Wed Nov 1 15:26:06 2017 +0100 Committer: Martin Stockhammer <[email protected]> Committed: Wed Nov 1 15:26:06 2017 +0100 ---------------------------------------------------------------------- .../archiva-configuration/src/main/mdo/configuration.mdo | 6 ++++-- .../org/apache/archiva/configuration/default-archiva.xml | 4 ++-- .../archiva-configuration/src/test/conf/archiva-1.3.xml | 4 ++-- .../org/apache/archiva/configuration/test-default-archiva.xml | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/55f72f28/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo index b6acf53..91dbb65 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo @@ -707,11 +707,11 @@ <defaultValue>2</defaultValue> </field> <field> - <name>retentionTime</name> + <name>retentionPeriod</name> <version>1.0.0+</version> <type>int</type> <description> - The number of days old which will be the basis for removing a snapshot. + The number of days after which snapshots will be removed. </description> <defaultValue>100</defaultValue> </field> @@ -1550,12 +1550,14 @@ <name>defaultLanguage</name> <type>String</type> <version>3.0.0+</version> + <defaultValue>en-US</defaultValue> <description>The default language used for setting internationalized strings.</description> </field> <field> <name>languageRange</name> <type>String</type> <version>3.0.0+</version> + <defaultValue>en,fr,de</defaultValue> <description>Comma separated list of language patterns. Sorted by priority descending. Used for display of internationalized strings.</description> </field> </fields> http://git-wip-us.apache.org/repos/asf/archiva/blob/55f72f28/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml index 9a34ace..c5acb80 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml @@ -13,7 +13,7 @@ <blockRedeployments>true</blockRedeployments> <scanned>true</scanned> <refreshCronExpression>0 0 * * * ?</refreshCronExpression> - <retentionTime>30</retentionTime> + <retentionPeriod>30</retentionPeriod> </managedRepository> <managedRepository> <id>snapshots</id> @@ -26,7 +26,7 @@ <blockRedeployments>false</blockRedeployments> <scanned>true</scanned> <refreshCronExpression>0 0\,30 * * * ?</refreshCronExpression> - <retentionTime>30</retentionTime> + <retentionPeriod>30</retentionPeriod> </managedRepository> </managedRepositories> <remoteRepositories> http://git-wip-us.apache.org/repos/asf/archiva/blob/55f72f28/archiva-modules/archiva-base/archiva-configuration/src/test/conf/archiva-1.3.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/conf/archiva-1.3.xml b/archiva-modules/archiva-base/archiva-configuration/src/test/conf/archiva-1.3.xml index 4462b6d..8575ebd 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/conf/archiva-1.3.xml +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/conf/archiva-1.3.xml @@ -103,7 +103,7 @@ <managedRepository> <location>${appserver.base}/data/repositories/internal</location> <blockRedeployments>true</blockRedeployments> -<retentionTime>30</retentionTime> +<retentionPeriod>30</retentionPeriod> <id>internal</id> <name>Archiva Managed Internal Repository</name> </managedRepository> @@ -112,7 +112,7 @@ <releases>false</releases> <snapshots>true</snapshots> <refreshCronExpression>0 0\,30 * * * ?</refreshCronExpression> -<retentionTime>30</retentionTime> +<retentionPeriod>30</retentionPeriod> <id>snapshots</id> <name>Archiva Managed Snapshot Repository</name> </managedRepository> http://git-wip-us.apache.org/repos/asf/archiva/blob/55f72f28/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml index bb3d803..dc1215e 100755 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/archiva/configuration/test-default-archiva.xml @@ -10,7 +10,7 @@ <snapshots>false</snapshots> <scanned>true</scanned> <refreshCronExpression>0 0 * * * ?</refreshCronExpression> - <retentionTime>30</retentionTime> + <retentionPeriod>30</retentionPeriod> </managedRepository> <managedRepository> <id>snapshots</id> @@ -21,7 +21,7 @@ <snapshots>true</snapshots> <scanned>true</scanned> <refreshCronExpression>0 0\,30 * * * ?</refreshCronExpression> - <retentionTime>30</retentionTime> + <retentionPeriod>30</retentionPeriod> </managedRepository> </managedRepositories> <remoteRepositories>
