Adapting the web modules to the new repository api

2 files changed, 12 insertions, 12 deletions

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 0e7037230..b169712cf 100644
--- 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,retentionTime,retentionCount,deleteReleasedSnapshots,stageRepoNeeded,description,
+                             scanned,retentionPeriod,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 retentionTime = 100;
-    this.retentionTime=ko.observable(retentionTime);
-    this.retentionTime.subscribe(function(newValue){self.modified(true)});
+    //private int retentionPeriod = 100;
+    this.retentionPeriod=ko.observable(retentionPeriod);
+    this.retentionPeriod.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.retentionTime,data.retentionCount,data.deleteReleasedSnapshots,
+                                 data.scanned,data.retentionPeriod,data.retentionCount,data.deleteReleasedSnapshots,
                                  data.stageRepoNeeded,data.description,data.skipPackedIndexCreation);
   }
 
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 5629b5553..17735c66d 100644
--- 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="retentionTime">${$.i18n.prop('retentionTime')}</label>
+        <label class="control-label" for="retentionPeriod">${$.i18n.prop('retentionPeriod')}</label>
 
         <div class="controls">
-          <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')}">
+          <input type="text" id="retentionPeriod" class="digits" name="retentionPeriod" size="5"
+                 data-bind="value: managedRepository.retentionPeriod"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-retentionPeriod-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.retentionPeriod.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.retentionPeriod.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="retentionTime" size="5"
+          <input type="text" id="timeout" class="digits" name="retentionPeriod" 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')}"