fix ugly bean attribute names

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1425057 13f79535-47bb-0310-9956-ffa450edef68

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 db9f7a49c9f183ca5d4b01992c0b7cca2ec290f2..201e8ede9700dbee41b140d751bc160ad6ce7857 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
@@ -1494,14 +1494,14 @@
           <defaultValue>true</defaultValue>
         </field>
         <field>
-          <name>useUsersCacheTimeToIdleSeconds</name>
+          <name>usersCacheTimeToIdleSeconds</name>
           <description>TimeToIdleSeconds for users cache</description>
           <version>1.4.0+</version>
           <type>int</type>
           <defaultValue>14400</defaultValue>
         </field>
         <field>
-          <name>useUsersCacheTimeToLiveSeconds</name>
+          <name>usersCacheTimeToLiveSeconds</name>
           <description>TimeToLiveSeconds for users cache</description>
           <version>1.4.0+</version>
           <type>int</type>

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
index a21d213ce2268cbe27c34d3dc3f950e4d1e6904d..bfec4ed9300d312be34271fe9d92b6522c0f04f6 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
@@ -62,12 +62,12 @@ public class RedbackRuntimeConfiguration
     /**
      * TimeToIdleSeconds for users cache.
      */
-    private int useUsersCacheTimeToIdleSeconds = 14400;
+    private int usersCacheTimeToIdleSeconds = 14400;
 
     /**
      * TimeToLiveSeconds for users cache.
      */
-    private int useUsersCacheTimeToLiveSeconds = 14400;
+    private int usersCacheTimeToLiveSeconds = 14400;
 
     public RedbackRuntimeConfiguration()
     {
@@ -151,24 +151,24 @@ public class RedbackRuntimeConfiguration
         this.useUsersCache = useUsersCache;
     }
 
-    public int getUseUsersCacheTimeToIdleSeconds()
+    public int getUsersCacheTimeToIdleSeconds()
     {
-        return useUsersCacheTimeToIdleSeconds;
+        return usersCacheTimeToIdleSeconds;
     }
 
-    public void setUseUsersCacheTimeToIdleSeconds( int useUsersCacheTimeToIdleSeconds )
+    public void setUsersCacheTimeToIdleSeconds( int usersCacheTimeToIdleSeconds )
     {
-        this.useUsersCacheTimeToIdleSeconds = useUsersCacheTimeToIdleSeconds;
+        this.usersCacheTimeToIdleSeconds = usersCacheTimeToIdleSeconds;
     }
 
-    public int getUseUsersCacheTimeToLiveSeconds()
+    public int getUsersCacheTimeToLiveSeconds()
     {
-        return useUsersCacheTimeToLiveSeconds;
+        return usersCacheTimeToLiveSeconds;
     }
 
-    public void setUseUsersCacheTimeToLiveSeconds( int useUsersCacheTimeToLiveSeconds )
+    public void setUsersCacheTimeToLiveSeconds( int usersCacheTimeToLiveSeconds )
     {
-        this.useUsersCacheTimeToLiveSeconds = useUsersCacheTimeToLiveSeconds;
+        this.usersCacheTimeToLiveSeconds = usersCacheTimeToLiveSeconds;
     }
 
     @Override
@@ -182,8 +182,8 @@ public class RedbackRuntimeConfiguration
         sb.append( ", configurationProperties=" ).append( configurationProperties );
         sb.append( ", configurationPropertiesEntries=" ).append( configurationPropertiesEntries );
         sb.append( ", useUsersCache=" ).append( useUsersCache );
-        sb.append( ", useUsersCacheTimeToIdleSeconds=" ).append( useUsersCacheTimeToIdleSeconds );
-        sb.append( ", useUsersCacheTimeToLiveSeconds=" ).append( useUsersCacheTimeToLiveSeconds );
+        sb.append( ", usersCacheTimeToIdleSeconds=" ).append( usersCacheTimeToIdleSeconds );
+        sb.append( ", usersCacheTimeToLiveSeconds=" ).append( usersCacheTimeToLiveSeconds );
         sb.append( '}' );
         return sb.toString();
     }

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
index 6f9c6b0d70bb4d893d3d2bffdcaf0d9fd0f5d6ac..536ea50fc4d22a2b20dcbeb6d533414439e37a52 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
@@ -83,8 +83,8 @@ public class DefaultRedbackRuntimeConfigurationService
     {
         RedbackRuntimeConfiguration redbackRuntimeConfiguration =
             redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration();
-        usersCache.setTimeToIdleSeconds( redbackRuntimeConfiguration.getUseUsersCacheTimeToIdleSeconds() );
-        usersCache.setTimeToLiveSeconds( redbackRuntimeConfiguration.getUseUsersCacheTimeToLiveSeconds() );
+        usersCache.setTimeToIdleSeconds( redbackRuntimeConfiguration.getUsersCacheTimeToIdleSeconds() );
+        usersCache.setTimeToLiveSeconds( redbackRuntimeConfiguration.getUsersCacheTimeToLiveSeconds() );
     }
 
     public RedbackRuntimeConfiguration getRedbackRuntimeConfiguration()
@@ -148,8 +148,8 @@ public class DefaultRedbackRuntimeConfigurationService
             }
 
             // users cache
-            usersCache.setTimeToIdleSeconds( redbackRuntimeConfiguration.getUseUsersCacheTimeToIdleSeconds() );
-            usersCache.setTimeToLiveSeconds( redbackRuntimeConfiguration.getUseUsersCacheTimeToLiveSeconds() );
+            usersCache.setTimeToIdleSeconds( redbackRuntimeConfiguration.getUsersCacheTimeToIdleSeconds() );
+            usersCache.setTimeToLiveSeconds( redbackRuntimeConfiguration.getUsersCacheTimeToLiveSeconds() );
 
             return Boolean.TRUE;
         }

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 4024da78d548504e2364dad30a9641b114bc8cd3..dc093b85dc69d140d4cea3e7a10e1dc49a702938 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
@@ -632,11 +632,11 @@ redback.runtime.ldap.checkModification=Verify LDAP changes.
 redback.runtime.ldap.checkServer=Verify LDAP configuration on server side.
 redback.runtime.useUsersCache.label=Use a cache for users.
 redback.runtime.users.cache.title=Users Cache
-redback.runtime.useUsersCacheTimeToLiveSeconds.label=Time to Live
-redback.runtime.useUsersCacheTimeToLiveSeconds.help.title=
-redback.runtime.useUsersCacheTimeToLiveSeconds.help.content=
-redback.runtime.useUsersCacheTimeToIdleSeconds.label=Time to Idle
-redback.runtime.useUsersCacheTimeToIdleSeconds.help.title=
-redback.runtime.useUsersCacheTimeToIdleSeconds.help.content=
+redback.runtime.usersCacheTimeToLiveSeconds.label=Time to Live
+redback.runtime.usersCacheTimeToLiveSeconds.help.title=
+redback.runtime.usersCacheTimeToLiveSeconds.help.content=
+redback.runtime.usersCacheTimeToIdleSeconds.label=Time to Idle
+redback.runtime.usersCacheTimeToIdleSeconds.help.title=
+redback.runtime.usersCacheTimeToIdleSeconds.help.content=
 
 

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
index aa80ffb3bc2729dcc1e77ba1b054e97337e75856..0fa26baa43301e8acb4d547a7edeb364ceccd8ec 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
@@ -1152,7 +1152,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
 
 
   RedbackRuntimeConfiguration=function(userManagerImpls,ldapConfiguration,migratedFromRedbackConfiguration,configurationPropertiesEntries
-                                      ,useUsersCache,useUsersCacheTimeToIdleSeconds,useUsersCacheTimeToLiveSeconds){
+                                      ,useUsersCache,usersCacheTimeToIdleSeconds,usersCacheTimeToLiveSeconds){
     $.log("new RedbackRuntimeConfiguration");
     var self=this;
     this.modified=ko.observable(false);
@@ -1189,11 +1189,11 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
     this.useUsersCache=ko.observable(useUsersCache);
     this.useUsersCache.subscribe(function(newValue){self.modified(true)});
 
-    this.useUsersCacheTimeToIdleSeconds=ko.observable(useUsersCacheTimeToIdleSeconds);
-    this.useUsersCacheTimeToIdleSeconds.subscribe(function(newValue){self.modified(true)});
+    this.usersCacheTimeToIdleSeconds=ko.observable(usersCacheTimeToIdleSeconds);
+    this.usersCacheTimeToIdleSeconds.subscribe(function(newValue){self.modified(true)});
 
-    this.useUsersCacheTimeToLiveSeconds=ko.observable(useUsersCacheTimeToLiveSeconds);
-    this.useUsersCacheTimeToLiveSeconds.subscribe(function(newValue){self.modified(true)});
+    this.usersCacheTimeToLiveSeconds=ko.observable(usersCacheTimeToLiveSeconds);
+    this.usersCacheTimeToLiveSeconds.subscribe(function(newValue){self.modified(true)});
 
   }
 
@@ -1204,7 +1204,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
 
     var redbackRuntimeConfiguration =
             new RedbackRuntimeConfiguration(data.userManagerImpls,ldapConfiguration,data.migratedFromRedbackConfiguration,[]
-                    ,data.useUsersCache,data.useUsersCacheTimeToIdleSeconds,data.useUsersCacheTimeToLiveSeconds);
+                    ,data.useUsersCache,data.usersCacheTimeToIdleSeconds,data.usersCacheTimeToLiveSeconds);
 
     $.log("mapRedbackRuntimeConfiguration done");
     var configurationPropertiesEntries = data.configurationPropertiesEntries == null ? []: $.each(data.configurationPropertiesEntries,function(item){

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
index bc6caebd74d057a73aef82ecdcc02094cae55dd9..5fde1e03b87b8552f9b8d8018ff7537e626692cb 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
@@ -1038,18 +1038,18 @@
             </div>
 
             <div class="control-group">
-              <label class="control-label" for="useUsersCacheTimeToLiveSeconds">${$.i18n.prop('redback.runtime.useUsersCacheTimeToLiveSeconds.label')}</label>
+              <label class="control-label" for="usersCacheTimeToLiveSeconds">${$.i18n.prop('redback.runtime.usersCacheTimeToLiveSeconds.label')}</label>
               <div class="controls">
-                <input type="text" class="xlarge required numeric" data-bind="value: redbackRuntimeConfiguration().useUsersCacheTimeToLiveSeconds"
-                       id="useUsersCacheTimeToLiveSeconds" name="useUsersCacheTimeToLiveSeconds" />
+                <input type="text" class="xlarge required numeric" data-bind="value: redbackRuntimeConfiguration().usersCacheTimeToLiveSeconds"
+                       id="usersCacheTimeToLiveSeconds" name="usersCacheTimeToLiveSeconds" />
               </div>
             </div>
 
             <div class="control-group">
-              <label class="control-label" for="useUsersCacheTimeToIdleSeconds">${$.i18n.prop('redback.runtime.useUsersCacheTimeToIdleSeconds.label')}</label>
+              <label class="control-label" for="usersCacheTimeToIdleSeconds">${$.i18n.prop('redback.runtime.usersCacheTimeToIdleSeconds.label')}</label>
               <div class="controls">
-                <input type="text" class="xlarge required numeric" data-bind="value: redbackRuntimeConfiguration().useUsersCacheTimeToIdleSeconds"
-                       id="useUsersCacheTimeToIdleSeconds" name="useUsersCacheTimeToIdleSeconds" />
+                <input type="text" class="xlarge required numeric" data-bind="value: redbackRuntimeConfiguration().usersCacheTimeToIdleSeconds"
+                       id="usersCacheTimeToIdleSeconds" name="usersCacheTimeToIdleSeconds" />
               </div>
             </div>