Changed configuration model

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 b6acf5366c54c543c6cbfe6beb68b6c6b5122046..91dbb65b2a3c242dc77571b2ec3a1ca6cb00fba0 100644 (file)
--- 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>

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 9a34ace94a0be89b8401d56476ada5f3ace24d96..c5acb803dd0577af38a4aff93bae361b79817033 100644 (file)
--- 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>

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 4462b6dacbf36649e626e7d05d5a56c3dccf2a62..8575ebd12ab76cfa54b1b3405645199737b369e5 100644 (file)
--- 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>

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 bb3d8034bb0889ca83f1904ee6695c604151ffbb..dc1215e6923f52934efcd660aeb5dfa6c58b6206 100755 (executable)
--- 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>