You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ra...@apache.org on 2016/01/23 06:06:58 UTC
svn commit: r1726354 - in /zookeeper/trunk: CHANGES.txt
src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java
src/java/test/org/apache/zookeeper/test/SSLAuthTest.java
src/java/test/org/apache/zookeeper/test/SSLTest.java
Author: rakeshr
Date: Sat Jan 23 05:06:58 2016
New Revision: 1726354
URL: http://svn.apache.org/viewvc?rev=1726354&view=rev
Log:
Revert ZOOKEEPER-2297
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SSLAuthTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SSLTest.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1726354&r1=1726353&r2=1726354&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sat Jan 23 05:06:58 2016
@@ -249,9 +249,6 @@ BUGFIXES:
ZOOKEEPER-412: checkstyle target fails trunk build (Akihiro Suda via cnauroth)
- ZOOKEEPER-2297: NPE is thrown while creating "key manager" and "trust manager"
- (Arshad Mohammad via rakeshr)
-
IMPROVEMENTS:
ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java?rev=1726354&r1=1726353&r2=1726354&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java Sat Jan 23 05:06:58 2016
@@ -39,8 +39,10 @@ public class ProviderRegistry {
return;
IPAuthenticationProvider ipp = new IPAuthenticationProvider();
DigestAuthenticationProvider digp = new DigestAuthenticationProvider();
+ X509AuthenticationProvider x509p = new X509AuthenticationProvider();
authenticationProviders.put(ipp.getScheme(), ipp);
authenticationProviders.put(digp.getScheme(), digp);
+ authenticationProviders.put(x509p.getScheme(), x509p);
Enumeration<Object> en = System.getProperties().keys();
while (en.hasMoreElements()) {
String k = (String) en.nextElement();
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SSLAuthTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SSLAuthTest.java?rev=1726354&r1=1726353&r2=1726354&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SSLAuthTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SSLAuthTest.java Sat Jan 23 05:06:58 2016
@@ -43,7 +43,6 @@ public class SSLAuthTest extends ClientB
System.setProperty(X509Util.SSL_TRUSTSTORE_LOCATION, testDataPath + "/ssl/testTrustStore.jks");
System.setProperty(X509Util.SSL_TRUSTSTORE_PASSWD, "testpass");
System.setProperty("javax.net.debug", "ssl");
- System.setProperty("zookeeper.authProvider.x509", "org.apache.zookeeper.server.auth.X509AuthenticationProvider");
String host = "localhost";
int port = PortAssignment.unique();
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SSLTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SSLTest.java?rev=1726354&r1=1726353&r2=1726354&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SSLTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SSLTest.java Sat Jan 23 05:06:58 2016
@@ -50,7 +50,6 @@ public class SSLTest extends QuorumPeerT
System.setProperty(X509Util.SSL_KEYSTORE_PASSWD, "testpass");
System.setProperty(X509Util.SSL_TRUSTSTORE_LOCATION, testDataPath + "/ssl/testTrustStore.jks");
System.setProperty(X509Util.SSL_TRUSTSTORE_PASSWD, "testpass");
- System.setProperty("zookeeper.authProvider.x509", "org.apache.zookeeper.server.auth.X509AuthenticationProvider");
}
@After