Changing daysOlder to retentionTime

diff --git a/archiva-docs/src/site/apt/adminguide/configuration-files.apt.vm b/archiva-docs/src/site/apt/adminguide/configuration-files.apt.vm
index 22f17dc162f2c06bdffbdb590b470137c5ac167c..e6f17cf0d13a00b46f66b405dda933582a50fc01 100644 (file)
--- a/archiva-docs/src/site/apt/adminguide/configuration-files.apt.vm
+++ b/archiva-docs/src/site/apt/adminguide/configuration-files.apt.vm
@@ -60,7 +60,7 @@ Configuration Files of Apache Archiva
   <managedRepositories>
     <managedRepository>
       <location>${appserver.base}/repositories/internal</location>
-      <daysOlder>30</daysOlder>
+      <retentionTime>30</retentionTime>
       <id>internal</id>
       <name>Archiva Managed Internal Repository</name>
     </managedRepository>

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 5af50af7f5edccb429e8e64a2b53535db5c76ae3..1189ec00608571d9fbaf2592cdd35d0c1fae80ba 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
@@ -709,7 +709,7 @@
           <defaultValue>2</defaultValue>
         </field>
         <field>
-          <name>daysOlder</name>
+          <name>retentionTime</name>
           <version>1.0.0+</version>
           <type>int</type>
           <description>

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 88144df1cd1877f07e4ed61f57530bd001844dac..9a34ace94a0be89b8401d56476ada5f3ace24d96 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>
-      <daysOlder>30</daysOlder>
+      <retentionTime>30</retentionTime>
     </managedRepository>
     <managedRepository>
       <id>snapshots</id>
@@ -26,7 +26,7 @@
       <blockRedeployments>false</blockRedeployments>
       <scanned>true</scanned>
       <refreshCronExpression>0 0\,30 * * * ?</refreshCronExpression>
-      <daysOlder>30</daysOlder>
+      <retentionTime>30</retentionTime>
     </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 7d559f49220887f87f299128da4ab0fc201bd377..4462b6dacbf36649e626e7d05d5a56c3dccf2a62 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>
-<daysOlder>30</daysOlder>
+<retentionTime>30</retentionTime>
 <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>
-<daysOlder>30</daysOlder>
+<retentionTime>30</retentionTime>
 <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 6f44eb4afccb5887f1feeadfdb4453a6dc2f4896..ab0f50dbb027c84f3c8f5817e914c483b9a1bd20 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>
-      <daysOlder>30</daysOlder>
+      <retentionTime>30</retentionTime>
     </managedRepository>
     <managedRepository>
       <id>snapshots</id>
@@ -21,7 +21,7 @@
       <snapshots>true</snapshots>
       <scanned>true</scanned>
       <refreshCronExpression>0 0\,30 * * * ?</refreshCronExpression>
-      <daysOlder>30</daysOlder>
+      <retentionTime>30</retentionTime>
     </managedRepository>
   </managedRepositories>
   <remoteRepositories>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
index 155e5f620c3ad00c95ab6fa7ea37ccc2d65caaf0..8687313b79c744e1addc9e40879b1cd3f3020760 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
@@ -53,15 +53,15 @@ public class DaysOldRepositoryPurge
 {
     private SimpleDateFormat timestampParser;
 
-    private int daysOlder;
+    private int retentionTime;
 
     private int retentionCount;
 
-    public DaysOldRepositoryPurge( ManagedRepositoryContent repository, int daysOlder, int retentionCount,
+    public DaysOldRepositoryPurge( ManagedRepositoryContent repository, int retentionTime, int retentionCount,
                                    RepositorySession repositorySession, List<RepositoryListener> listeners )
     {
         super( repository, repositorySession, listeners );
-        this.daysOlder = daysOlder;
+        this.retentionTime = retentionTime;
         this.retentionCount = retentionCount;
         timestampParser = new SimpleDateFormat( "yyyyMMdd.HHmmss" );
         timestampParser.setTimeZone( DateUtils.UTC_TIME_ZONE );
@@ -83,7 +83,7 @@ public class DaysOldRepositoryPurge
             ArtifactReference artifact = repository.toArtifactReference( path );
 
             Calendar olderThanThisDate = Calendar.getInstance( DateUtils.UTC_TIME_ZONE );
-            olderThanThisDate.add( Calendar.DATE, -daysOlder );
+            olderThanThisDate.add( Calendar.DATE, -retentionTime );
 
             // respect retention count
             VersionedReference reference = new VersionedReference( );

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager-daysOld.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager-daysOld.xml
index bbbee3eb2d8e5496f90e19b61cd3f1923090d2bc..6b1779c4705c82ad30dbbbd1fdd6e8efb0d106e3 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager-daysOld.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager-daysOld.xml
@@ -68,7 +68,7 @@
       <snapshots>true</snapshots>
       <indexed>true</indexed>
       <refreshCronExpression>0 0 * * * ?</refreshCronExpression>
-      <daysOlder>100</daysOlder>
+      <retentionTime>100</retentionTime>
       <deleteReleasedSnapshots>true</deleteReleasedSnapshots>
     </repository>
   </repositories>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager.xml
index 29cdebde418d01aa30675862103919b817466abe..171cfd131e3875aba3b6b888d8868bd6dd5b5bbe 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager.xml
@@ -68,7 +68,7 @@
       <snapshots>true</snapshots>
       <indexed>true</indexed>
       <refreshCronExpression>0 0 * * * ?</refreshCronExpression>
-      <daysOlder>0</daysOlder>
+      <retentionTime>0</retentionTime>
       <retentionCount>2</retentionCount>
     </repository>
   </repositories>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/conf/repository-manager.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/conf/repository-manager.xml
index 19e1449cdac7c2afa8c5e01f710d4ac0bd963a66..6c836b81c3ae8c8e6836f210e7f7d55cdcb90938 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/conf/repository-manager.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/conf/repository-manager.xml
@@ -30,7 +30,7 @@
       <snapshots>true</snapshots>
       <indexed>true</indexed>
       <refreshCronExpression>0 0 * * * ?</refreshCronExpression>
-      <daysOlder>0</daysOlder>
+      <retentionTime>0</retentionTime>
       <retentionCount>2</retentionCount>
     </repository>
   </repositories>

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ManagedRepository.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ManagedRepository.java
index 4236ca1149efbf66f25774a02658b87aab78eb0e..b8b58ea50764b8129cae20e291c417b939b9b9ad 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ManagedRepository.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ManagedRepository.java
@@ -57,7 +57,7 @@ public class ManagedRepository
     /**
      * default model value
      */
-    private int daysOlder = 100;
+    private int retentionTime = 100;
 
     /**
      * default model value
@@ -82,7 +82,7 @@ public class ManagedRepository
 
     public ManagedRepository( String id, String name, String location, String layout, boolean snapshots,
                               boolean releases, boolean blockRedeployments, String cronExpression, String indexDir,
-                              boolean scanned, int daysOlder, int retentionCount, boolean deleteReleasedSnapshots,
+                              boolean scanned, int retentionTime, int retentionCount, boolean deleteReleasedSnapshots,
                               boolean stageRepoNeeded )
     {
         super( id, name, layout );
@@ -94,7 +94,7 @@ public class ManagedRepository
         this.setCronExpression( cronExpression );
         this.setIndexDirectory( indexDir );
         this.scanned = scanned;
-        this.daysOlder = daysOlder;
+        this.retentionTime = retentionTime;
         this.retentionCount = retentionCount;
         this.deleteReleasedSnapshots = deleteReleasedSnapshots;
         this.stageRepoNeeded = stageRepoNeeded;
@@ -105,11 +105,11 @@ public class ManagedRepository
      */
     public ManagedRepository( String id, String name, String location, String layout, boolean snapshots,
                               boolean releases, boolean blockRedeployments, String cronExpression, String indexDir,
-                              boolean scanned, int daysOlder, int retentionCount, boolean deleteReleasedSnapshots,
+                              boolean scanned, int retentionTime, int retentionCount, boolean deleteReleasedSnapshots,
                               boolean stageRepoNeeded, String description, boolean skipPackedIndexCreation )
     {
         this( id, name, location, layout, snapshots, releases, blockRedeployments, cronExpression, indexDir, scanned,
-              daysOlder, retentionCount, deleteReleasedSnapshots, stageRepoNeeded );
+              retentionTime, retentionCount, deleteReleasedSnapshots, stageRepoNeeded );
         setDescription( description );
         setSkipPackedIndexCreation( skipPackedIndexCreation );
     }
@@ -194,12 +194,12 @@ public class ManagedRepository
 
     public int getDaysOlder()
     {
-        return daysOlder;
+        return retentionTime;
     }
 
-    public void setDaysOlder( int daysOlder )
+    public void setDaysOlder( int retentionTime )
     {
-        this.daysOlder = daysOlder;
+        this.retentionTime = retentionTime;
     }
 
     public int getRetentionCount()
@@ -265,7 +265,7 @@ public class ManagedRepository
         sb.append( ", cronExpression='" ).append( cronExpression ).append( '\'' );
         sb.append( ", stagingRepository=" ).append( stagingRepository );
         sb.append( ", scanned=" ).append( scanned );
-        sb.append( ", daysOlder=" ).append( daysOlder );
+        sb.append( ", retentionTime=" ).append( retentionTime );
         sb.append( ", retentionCount=" ).append( retentionCount );
         sb.append( ", deleteReleasedSnapshots=" ).append( deleteReleasedSnapshots );
         sb.append( ", stageRepoNeeded=" ).append( stageRepoNeeded );

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
index d36546a99f421fef9bd315f520504cec40029307..6d7a914f54ae6ed16b994a1d01a46d2c143efe58 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
@@ -158,7 +158,7 @@ public class DefaultManagedRepositoryAdmin
                 new ManagedRepository( repoConfig.getId(), repoConfig.getName(), repoConfig.getLocation(),
                                        repoConfig.getLayout(), repoConfig.isSnapshots(), repoConfig.isReleases(),
                                        repoConfig.isBlockRedeployments(), repoConfig.getRefreshCronExpression(),
-                                       repoConfig.getIndexDir(), repoConfig.isScanned(), repoConfig.getDaysOlder(),
+                                       repoConfig.getIndexDir(), repoConfig.isScanned(), repoConfig.getRetentionTime(),
                                        repoConfig.getRetentionCount(), repoConfig.isDeleteReleasedSnapshots(),
                                        repoConfig.isStageRepoNeeded() );
             repo.setDescription( repoConfig.getDescription() );
@@ -225,7 +225,7 @@ public class DefaultManagedRepositoryAdmin
                                                                  String location, boolean blockRedeployments,
                                                                  boolean releasesIncluded, boolean snapshotsIncluded,
                                                                  boolean stageRepoNeeded, String cronExpression,
-                                                                 String indexDir, int daysOlder, int retentionCount,
+                                                                 String indexDir, int retentionTime, int retentionCount,
                                                                  boolean deteleReleasedSnapshots, String description,
                                                                  boolean skipPackedIndexCreation, boolean scanned,
                                                                  AuditInformation auditInformation,
@@ -245,7 +245,7 @@ public class DefaultManagedRepositoryAdmin
         repository.setLayout( layout );
         repository.setRefreshCronExpression( cronExpression );
         repository.setIndexDir( indexDir );
-        repository.setDaysOlder( daysOlder );
+        repository.setRetentionTime( retentionTime );
         repository.setRetentionCount( retentionCount );
         repository.setDeleteReleasedSnapshots( deteleReleasedSnapshots );
         repository.setIndexDir( indexDir );
@@ -675,7 +675,7 @@ public class DefaultManagedRepositoryAdmin
         stagingRepository.setLayout( repository.getLayout() );
         stagingRepository.setName( repository.getName() + STAGE_REPO_ID_END );
         stagingRepository.setBlockRedeployments( repository.isBlockRedeployments() );
-        stagingRepository.setDaysOlder( repository.getDaysOlder() );
+        stagingRepository.setRetentionTime( repository.getRetentionTime() );
         stagingRepository.setDeleteReleasedSnapshots( repository.isDeleteReleasedSnapshots() );
 
         String path = repository.getLocation();

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java
index e70924d357061e3c2e26bd6f274a56a18597c9bd..d8dd8f38bad5c40fc95f493dbd115ed3636e0484 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java
@@ -55,7 +55,7 @@ public class MockManagedRepositoryAdmin
                 new ManagedRepository( repoConfig.getId(), repoConfig.getName(), repoConfig.getLocation(),
                                        repoConfig.getLayout(), repoConfig.isSnapshots(), repoConfig.isReleases(),
                                        repoConfig.isBlockRedeployments(), repoConfig.getRefreshCronExpression(),
-                                       repoConfig.getIndexDir(), repoConfig.isScanned(), repoConfig.getDaysOlder(),
+                                       repoConfig.getIndexDir(), repoConfig.isScanned(), repoConfig.getRetentionTime(),
                                        repoConfig.getRetentionCount(), repoConfig.isDeleteReleasedSnapshots(), true );
 
             managedRepos.add( repo );

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index 69749777b28ff545ea9fb626c93859c0efeae8b5..666d997b8ff4e9458d2d6da0850d369ef816c7af 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -84,7 +84,7 @@ index.directory=Index Directory
 retentionCount=Retention Count
 snapshots=Snapshots
 blockRedeployments=Block Redeployments
-daysOlder=Days Older
+retentionTime=Days Older
 cronExpression=Cron Expression
 cronExpression.help.title=Cron Expression Format
 cronExpression.help.content= Quartz cron is used. Documentation is: <a target="_blank" href="http://quartz-scheduler.org/documentation/quartz-2.1.x/cookbook/">here</a>
@@ -129,8 +129,8 @@ managedRepository.location.help.title=Location
 managedRepository.location.help.content=Location on File System (can be relative to Archiva base directory or absolute path)
 managedRepository.indexDirectory.help.title=Index Directory
 managedRepository.indexDirectory.help.content=Path to the Maven Index directory
-managedRepository.daysOlder.help.title=Days Older
-managedRepository.daysOlder.help.content=For snapshots repositories, maximum file days age you want to keep
+managedRepository.retentionTime.help.title=Days Older
+managedRepository.retentionTime.help.content=For snapshots repositories, maximum file days age you want to keep
 managedRepository.retentionCount.help.title=Retention Count
 managedRepository.retentionCount.help.content=For snapshots repositories, maximum of files you want to keep.
 managedRepository.description.help.content=A free description for your repository

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repositories.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repositories.js
index abfb373b3dc462a1a91f7a1b5ad86f3011715164..0e703723051171aa018c14b8fb85489f01909b5b 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repositories.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repositories.js
@@ -32,7 +32,7 @@ function(jquery,i18n,jqueryTmpl,bootstrap,jqueryValidate,ko) {
             ];
 
   ManagedRepository=function(id,name,layout,indexDirectory,location,snapshots,releases,blockRedeployments,cronExpression,
-                             scanned,daysOlder,retentionCount,deleteReleasedSnapshots,stageRepoNeeded,description,
+                             scanned,retentionTime,retentionCount,deleteReleasedSnapshots,stageRepoNeeded,description,
                              skipPackedIndexCreation,feedsUrl,url){
 
     var self=this;
@@ -63,9 +63,9 @@ function(jquery,i18n,jqueryTmpl,bootstrap,jqueryValidate,ko) {
 
     //private ManagedRepository stagingRepository;
 
-    //private int daysOlder = 100;
-    this.daysOlder=ko.observable(daysOlder);
-    this.daysOlder.subscribe(function(newValue){self.modified(true)});
+    //private int retentionTime = 100;
+    this.retentionTime=ko.observable(retentionTime);
+    this.retentionTime.subscribe(function(newValue){self.modified(true)});
 
     //private int retentionCount = 2;
     this.retentionCount=ko.observable(retentionCount);
@@ -167,7 +167,7 @@ function(jquery,i18n,jqueryTmpl,bootstrap,jqueryValidate,ko) {
     return new ManagedRepository(data.id,data.name,data.layout,data.indexDirectory,data.location,data.snapshots
                                  ,data.releases,
                                  data.blockRedeployments,data.cronExpression,
-                                 data.scanned,data.daysOlder,data.retentionCount,data.deleteReleasedSnapshots,
+                                 data.scanned,data.retentionTime,data.retentionCount,data.deleteReleasedSnapshots,
                                  data.stageRepoNeeded,data.description,data.skipPackedIndexCreation);
   }
 
@@ -298,7 +298,7 @@ function(jquery,i18n,jqueryTmpl,bootstrap,jqueryValidate,ko) {
   activateManagedRepositoryFormValidation=function(){
     var validator = $("#main-content" ).find("#managed-repository-edit-form").validate({
       rules: {
-        daysOlder : {
+        retentionTime : {
           digits: true,
           min: 1
         },

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html
index c23158e954b3832097bfe39544c31bb2f6c0b962..5629b5553e4adb241945782e8228a21c0cafb19e 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html
@@ -282,14 +282,14 @@
         </div>
       </div>
       <div class="control-group">
-        <label class="control-label" for="daysOlder">${$.i18n.prop('daysOlder')}</label>
+        <label class="control-label" for="retentionTime">${$.i18n.prop('retentionTime')}</label>
 
         <div class="controls">
-          <input type="text" id="daysOlder" class="digits" name="daysOlder" size="5"
-                 data-bind="value: managedRepository.daysOlder"/>
-          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-daysOlder-info-button"
-             data-original-title="${$.i18n.prop('managedRepository.daysOlder.help.title')}"
-             data-content="${$.i18n.prop('managedRepository.daysOlder.help.content')}">
+          <input type="text" id="retentionTime" class="digits" name="retentionTime" size="5"
+                 data-bind="value: managedRepository.retentionTime"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-retentionTime-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.retentionTime.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.retentionTime.help.content')}">
             <i class="icon-question-sign icon-white"></i>
           </a>
         </div>
@@ -604,7 +604,7 @@
         <label class="control-label" for="timeout">${$.i18n.prop('timeout')}</label>
 
         <div class="controls">
-          <input type="text" id="timeout" class="digits" name="daysOlder" size="5"
+          <input type="text" id="timeout" class="digits" name="retentionTime" size="5"
                  data-bind="value: remoteRepository.timeout"/>
           <a class="btn btn-warning btn-mini popover-doc" id="remoteRepository-timeout-info-button"
              data-original-title="${$.i18n.prop('remoteRepository.timeout.help.title')}"

diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java
index b9ba411efc4c41e4107a666966de1a788a91e68a..a0b7e6a15acea6513a1fbcc087d5d5751a2fa410 100644 (file)
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/MockRepoAdmin.java
@@ -157,7 +157,7 @@ public class MockRepoAdmin
                                               repoConfig.getLayout(), repoConfig.isSnapshots(), repoConfig.isReleases(),
                                               repoConfig.isBlockRedeployments(), repoConfig.getRefreshCronExpression(),
                                               repoConfig.getIndexDir(), repoConfig.isScanned(),
-                                              repoConfig.getDaysOlder(), repoConfig.getRetentionCount(),
+                                              repoConfig.getRetentionTime(), repoConfig.getRetentionCount(),
                                               repoConfig.isDeleteReleasedSnapshots(), false );
             }
         }