svn commit: r1726355 - in /zookeeper/branches/branch-3.5: 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

[rakeshr]

Author: rakeshr
Date: Sat Jan 23 05:08:02 2016
New Revision: 1726355

URL: http://svn.apache.org/viewvc?rev=1726355&view=rev
Log:
Revert ZOOKEEPER-2297

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java
    
zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/SSLAuthTest.java
    
zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/SSLTest.java

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1726355&r1=1726354&r2=1726355&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Sat Jan 23 05:08:02 2016
@@ -97,9 +97,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-2270: Allow MBeanRegistry to be overridden for better unit tests

Modified: 
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java?rev=1726355&r1=1726354&r2=1726355&view=diff
==============================================================================
--- 
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java
 (original)
+++ 
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java
 Sat Jan 23 05:08:02 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/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/SSLAuthTest.java
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/SSLAuthTest.java?rev=1726355&r1=1726354&r2=1726355&view=diff
==============================================================================
--- 
zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/SSLAuthTest.java
 (original)
+++ 
zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/SSLAuthTest.java
 Sat Jan 23 05:08:02 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/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/SSLTest.java
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/SSLTest.java?rev=1726355&r1=1726354&r2=1726355&view=diff
==============================================================================
--- 
zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/SSLTest.java
 (original)
+++ 
zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/SSLTest.java
 Sat Jan 23 05:08:02 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