Author: olamy
Date: Fri Dec 14 13:25:43 2012
New Revision: 1421846
URL: http://svn.apache.org/viewvc?rev=1421846&view=rev
Log:
bindDn was not in the ldap form
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/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=1421846&r1=1421845&r2=1421846&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 Dec 14 13:25:43 2012
@@ -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
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=1421846&r1=1421845&r2=1421846&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 Dec 14 13:25:43 2012
@@ -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>
