Author: olamy
Date: Fri Nov 23 21:33:58 2012
New Revision: 1413072
URL: http://svn.apache.org/viewvc?rev=1413072&view=rev
Log:
[MRM-1714] using LDAP can be configurable with the ui
add i18n and cleanup
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1413072&r1=1413071&r2=1413072&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
Fri Nov 23 21:33:58 2012
@@ -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.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1413072&r1=1413071&r2=1413072&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
Fri Nov 23 21:33:58 2012
@@ -1174,7 +1174,7 @@ define("archiva.general-admin",["jquery"
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) {
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html?rev=1413072&r1=1413071&r2=1413072&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
Fri Nov 23 21:33:58 2012
@@ -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>
