[MRM-1714] using LDAP can be configurable with the ui

add i18n and cleanup

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

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 bdde00408d958b9122ee23186c19f6052c0cfee8..674164ef35e2a42954920a2aac0813441cb35ab8 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
@@ -548,5 +548,7 @@ menu.docs=Documentation
 #runtime configuration
 runtime-configuration.title=Archiva Runtime Configuration
 runtime-configuration.usermanager.label=User Manager Implementation
-archiva-runtime-configuration.updated=Archiva Runtime Configuration updated.
+archiva-runtime-configuration.updated=Archiva Runtime Configuration updated to '{0}'
+archiva.redback.usermanager.ldap=LDAP User Manager.
+archiva.redback.usermanager.jdo=Database User Manager.
 

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 29abcc4f68da62e16c51996ece24747b464082cb..291616e8369326f529184af25d5605b73e9d8448 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
@@ -1174,7 +1174,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
           data:ko.toJSON(self.archivaRuntimeConfiguration),
           dataType: 'json',
           success: function(data) {
-            var message=$.i18n.prop('archiva-runtime-configuration.updated');
+            var message=$.i18n.prop('archiva-runtime-configuration.updated',self.archivaRuntimeConfiguration().userManagerImpl());
             displaySuccessMessage(message);
           },
           error: function(data) {

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 0f18811451fcb96560f2748d2629dc0564934817..6eccc7202ab910a5fd0b297949c31f7a4476ff74 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
@@ -905,8 +905,6 @@
           </label>
           <div class="controls">
             <select data-bind="options: userManagerImplementationInformations,optionsValue: 'beanId', optionsText: 'description', value: archivaRuntimeConfiguration().userManagerImpl, optionsCaption: 'Choose...'"></select>
-            <input type="text" id="userManagerImpl" name="userManagerImpl" class="input-small required"
-                    data-bind="value: archivaRuntimeConfiguration().userManagerImpl"/>
           </div>
         </div>
         <button data-bind="click: saveArchivaRuntimeConfiguration" id="archiva-runtime-configuration-save" class="btn">${$.i18n.prop('save')}</button>