From: Olivier Lamy <olamy@apache.org>
Date: Fri, 14 Dec 2012 13:25:43 +0000 (+0000)
Subject: bindDn was not in the ldap form
X-Git-Tag: archiva-1.4-M4~487
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c0e2ac135b4a74d1e877c916a4a3920678b78462;p=archiva.git

bindDn was not in the ldap form

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1421846 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 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
@@ -953,6 +953,15 @@
                        data-bind="value: archivaRuntimeConfiguration().ldapConfiguration().baseDn"/>
               </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')}