aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-12-14 13:25:43 +0000
committerOlivier Lamy <olamy@apache.org>2012-12-14 13:25:43 +0000
commitc0e2ac135b4a74d1e877c916a4a3920678b78462 (patch)
treed9c5e5201d4aaa1f8896609b3a24ddec939fb71c /archiva-modules/archiva-web
parentcc2839453d683836a511883cc49e9ac724d922d8 (diff)
downloadarchiva-c0e2ac135b4a74d1e877c916a4a3920678b78462.tar.gz
archiva-c0e2ac135b4a74d1e877c916a4a3920678b78462.zip
bindDn was not in the ldap form
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1421846 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web')
-rw-r--r--archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties1
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html9
2 files changed, 10 insertions, 0 deletions
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 39414bfce..525e9cabb 100644
--- 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
@@ -587,6 +587,7 @@ redback.runtime.ldap.host.label=host
redback.runtime.general.title=General
redback.runtime.ldap.title=LDAP
redback.runtime.ldap.baseDn.label=baseDn
+redback.runtime.ldap.bindDn.label=bindDn
redback.runtime.ldap.password.label=password
redback.runtime.ldap.contextFactory.label=contextFactory
redback.runtime.ldap.ssl.label=ssl enabled
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 489e442dc..b1426f532 100644
--- 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
@@ -954,6 +954,15 @@
</div>
</div>
<div class="control-group">
+ <label for="ldap-bindDn" class="control-label">
+ ${$.i18n.prop('redback.runtime.ldap.bindDn.label')}
+ </label>
+ <div class="controls">
+ <input type="text" id="ldap-bindDn" name="ldap-bindDn" class="input-xxlarge"
+ data-bind="value: archivaRuntimeConfiguration().ldapConfiguration().bindDn"/>
+ </div>
+ </div>
+ <div class="control-group">
<label for="ldap-ssl" class="control-label">
${$.i18n.prop('redback.runtime.ldap.ssl.label')}
</label>