Author: kwright
Date: Sat Sep 26 06:19:18 2015
New Revision: 1705396
URL: http://svn.apache.org/viewvc?rev=1705396&view=rev
Log:
Add UI support for ldap protocol
Modified:
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_en_US.properties
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_ja_JP.properties
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_pl_PL.properties
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_zh_CN.properties
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html
Modified:
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java?rev=1705396&r1=1705395&r2=1705396&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
(original)
+++
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
Sat Sep 26 06:19:18 2015
@@ -527,6 +527,7 @@ public class LDAPAuthority extends org.a
@Override
public String processConfigurationPost(IThreadContext threadContext,
IPostParameters variableContext, Locale locale, ConfigParams parameters)
throws ManifoldCFException {
+ copyParam(variableContext, parameters, "ldapProtocol");
copyParam(variableContext, parameters, "ldapServerName");
copyParam(variableContext, parameters, "ldapServerPort");
copyParam(variableContext, parameters, "ldapServerBase");
@@ -690,6 +691,7 @@ public class LDAPAuthority extends org.a
/** Fill in LDAP tab */
protected static void fillInLDAPTab(Map<String,Object> velocityContext,
IHTTPOutput out, ConfigParams parameters)
{
+ velocityContext.put("FSERVERPROTOCOL", getParam(parameters,
"ldapProtocol", "ldap"));
velocityContext.put("FSERVERNAME", getParam(parameters, "ldapServerName",
""));
velocityContext.put("FSERVERPORT", getParam(parameters, "ldapServerPort",
"389"));
velocityContext.put("FSERVERBASE", getParam(parameters, "ldapServerBase",
""));
Modified:
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_en_US.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_en_US.properties?rev=1705396&r1=1705395&r2=1705396&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_en_US.properties
(original)
+++
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_en_US.properties
Sat Sep 26 06:19:18 2015
@@ -57,4 +57,5 @@ LDAP.AddCert=Add certificate
LDAP.Add=Add
LDAP.Certificate=Certificate:
LDAP.ChooseACertificateFile=Choose a certificate file
+LDAP.LDAPProtocolColon=LDAP protocol:
Modified:
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_ja_JP.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_ja_JP.properties?rev=1705396&r1=1705395&r2=1705396&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_ja_JP.properties
(original)
+++
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_ja_JP.properties
Sat Sep 26 06:19:18 2015
@@ -57,3 +57,4 @@ LDAP.AddCert=Add certificate
LDAP.Add=Add
LDAP.Certificate=Certificate:
LDAP.ChooseACertificateFile=Choose a certificate file
+LDAP.LDAPProtocolColon=LDAP protocol:
Modified:
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_pl_PL.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_pl_PL.properties?rev=1705396&r1=1705395&r2=1705396&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_pl_PL.properties
(original)
+++
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_pl_PL.properties
Sat Sep 26 06:19:18 2015
@@ -57,3 +57,4 @@ LDAP.AddCert=Add certificate
LDAP.Add=Add
LDAP.Certificate=Certificate:
LDAP.ChooseACertificateFile=Choose a certificate file
+LDAP.LDAPProtocolColon=LDAP protocol:
Modified:
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_zh_CN.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_zh_CN.properties?rev=1705396&r1=1705395&r2=1705396&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_zh_CN.properties
(original)
+++
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/common_zh_CN.properties
Sat Sep 26 06:19:18 2015
@@ -57,3 +57,4 @@ LDAP.AddCert=Add certificate
LDAP.Add=Add
LDAP.Certificate=Certificate:
LDAP.ChooseACertificateFile=Choose a certificate file
+LDAP.LDAPProtocolColon=LDAP protocol:
Modified:
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html?rev=1705396&r1=1705395&r2=1705396&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html
(original)
+++
manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html
Sat Sep 26 06:19:18 2015
@@ -24,6 +24,33 @@
<table class="displaytable">
<tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.LDAPProtocolColon'))</nobr></td>
+ <td class="value">
+ <select name="ldapProtocol" size="4">
+ #if($FSERVERPROTOCOL == '' || $FSERVERPROTOCOL == 'ldap')
+ <option value="ldap" selected="true">LDAP</option>
+ #else
+ <option value="ldap">LDAP</option>
+ #end
+ #if($FSERVERPROTOCOL == 'ldaps')
+ <option value="ldaps" selected="true">LDAPS</option>
+ #else
+ <option value="ldaps">LDAPS</option>
+ #end
+ #if($FSERVERPROTOCOL == 'ldap+tls')
+ <option value="ldap+tls" selected="true">LDAP+TLS</option>
+ #else
+ <option value="ldap+tls">LDAP+TLS</option>
+ #end
+ #if($FSERVERPROTOCOL == 'ldaps+tls')
+ <option value="ldaps+tls" selected="true">LDAPS+TLS</option>
+ #else
+ <option value="ldaps+tls">LDAPS+TLS</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.LDAPServerNameColon'))</nobr></td>
<td class="value"><input type="text" size="32" name="ldapServerName"
value="$Encoder.attributeEscape($FSERVERNAME)"/></td>
</tr>
@@ -127,6 +154,7 @@
</table>
#else
+<input type="hidden" name="ldapProtocol"
value="$Encoder.attributeEscape($FSERVERPROTOCOL)"/>
<input type="hidden" name="ldapServerName"
value="$Encoder.attributeEscape($FSERVERNAME)"/>
<input type="hidden" name="ldapServerPort"
value="$Encoder.attributeEscape($FSERVERPORT)"/>
<input type="hidden" name="ldapServerBase"
value="$Encoder.attributeEscape($FSERVERBASE)"/>
