You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2015/09/26 02:57:57 UTC
svn commit: r1705392 - in
/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main:
java/org/apache/manifoldcf/authorities/authorities/ldap/
native2ascii/org/apache/manifoldcf/authorities/authorities/ldap/
resources/org/apache/manifoldcf...
Author: kwright
Date: Sat Sep 26 00:57:57 2015
New Revision: 1705392
URL: http://svn.apache.org/viewvc?rev=1705392&view=rev
Log:
Debug certificate UI
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/viewConfiguration.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=1705392&r1=1705391&r2=1705392&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 00:57:57 2015
@@ -587,26 +587,25 @@ public class LDAPAuthority extends org.a
}
}
+ String sslKeystoreValue = variableContext.getParameter("sslkeystoredata");
final String sslConfigOp = variableContext.getParameter("sslconfigop");
if (sslConfigOp != null)
{
if (sslConfigOp.equals("Delete"))
{
final String alias = variableContext.getParameter("sslkeystorealias");
- final String sslKeystoreValue = parameters.getParameter("sslkeystore");
final IKeystoreManager mgr;
if (sslKeystoreValue != null)
mgr = KeystoreManagerFactory.make("",sslKeystoreValue);
else
mgr = KeystoreManagerFactory.make("");
mgr.remove(alias);
- parameters.setParameter("sslkeystore",mgr.getString());
+ sslKeystoreValue = mgr.getString();
}
else if (sslConfigOp.equals("Add"))
{
String alias = IDFactory.make(threadContext);
byte[] certificateValue = variableContext.getBinaryBytes("sslcertificate");
- final String sslKeystoreValue = parameters.getParameter("sslkeystore");
final IKeystoreManager mgr;
if (sslKeystoreValue != null)
mgr = KeystoreManagerFactory.make("",sslKeystoreValue);
@@ -638,9 +637,11 @@ public class LDAPAuthority extends org.a
{
return "Illegal certificate: "+certError;
}
- parameters.setParameter("sslkeystore",mgr.getString());
+ sslKeystoreValue = mgr.getString();
}
}
+ if (sslKeystoreValue != null)
+ parameters.setParameter("sslkeystore",sslKeystoreValue);
return null;
}
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=1705392&r1=1705391&r2=1705392&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 00:57:57 2015
@@ -56,3 +56,5 @@ LDAP.SSLCertificateList=SSL certificate
LDAP.AddCert=Add certificate
LDAP.Add=Add
LDAP.Certificate=Certificate:
+LDAP.ChooseACertificateFile=Choose a certificate file
+
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=1705392&r1=1705391&r2=1705392&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 00:57:57 2015
@@ -56,3 +56,4 @@ LDAP.SSLCertificateList=SSL certificate
LDAP.AddCert=Add certificate
LDAP.Add=Add
LDAP.Certificate=Certificate:
+LDAP.ChooseACertificateFile=Choose a certificate file
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=1705392&r1=1705391&r2=1705392&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 00:57:57 2015
@@ -56,3 +56,4 @@ LDAP.SSLCertificateList=SSL certificate
LDAP.AddCert=Add certificate
LDAP.Add=Add
LDAP.Certificate=Certificate:
+LDAP.ChooseACertificateFile=Choose a certificate file
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=1705392&r1=1705391&r2=1705392&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 00:57:57 2015
@@ -56,3 +56,4 @@ LDAP.SSLCertificateList=SSL certificate
LDAP.AddCert=Add certificate
LDAP.Add=Add
LDAP.Certificate=Certificate:
+LDAP.ChooseACertificateFile=Choose a certificate file
Modified: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html?rev=1705392&r1=1705391&r2=1705392&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html (original)
+++ manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html Sat Sep 26 00:57:57 2015
@@ -93,9 +93,6 @@
#if($SSLCERTIFICATESMAP)
#foreach($cert in $SSLCERTIFICATESMAP.entrySet())
<tr>
- <td class="description">
- $Encoder.bodyEscape($cert.Key)
- </td>
<td class="value">
$Encoder.bodyEscape($cert.Value)
</td>