ZOOKEEPER-1153. Deprecate AuthFLE and LE. (Flavio Junqueira via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1163099 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -435,6 +435,9 @@ NEW FEATURES:
 
   ZOOKEEPER-999. Create an package integration project (Eric Yang via phunt)
 
+DEPRECATION:
+  ZOOKEEPER-1153. Deprecate AuthFLE and LE. (Flavio Junqueira via mahadev)
+  
 Release 3.3.0 - 2010-03-24
 
 Non-backward compatible changes:

docs/zookeeperAdmin.html

@@ -1171,13 +1171,10 @@ server.3=zoo3:2888:3888</pre>
 <div class="label">Note</div>
 <div class="content">
               
-<p> The implementations of leader election
-              1 and 2 are currently not supported, and we have the intention
-              of deprecating them in the near future. Implementations 0 and 3 are 
-              currently supported, and we plan to keep supporting them in the near future. 
-              To avoid having to support multiple versions of leader election unecessarily, 
-              we may eventually consider deprecating algorithm 0 as well, but we will plan
-              according to the needs of the community. 
+<p> The implementations of leader election 0, 1, and 2 are now 
+              <strong> deprecated </strong>. We have the intention
+              of removing them in the next release, at which point only the 
+              FastLeaderElection will be available. 
               </p>
               
 </div>

src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml

@@ -798,13 +798,10 @@ server.3=zoo3:2888:3888</programlisting>
               fast leader election. Currently, algorithm 3 is the default</para>
               
               <note>
-              <para> The implementations of leader election
-              1 and 2 are currently not supported, and we have the intention
-              of deprecating them in the near future. Implementations 0 and 3 are 
-              currently supported, and we plan to keep supporting them in the near future. 
-              To avoid having to support multiple versions of leader election unecessarily, 
-              we may eventually consider deprecating algorithm 0 as well, but we will plan
-              according to the needs of the community. 
+              <para> The implementations of leader election 0, 1, and 2 are now 
+              <emphasis role="bold"> deprecated </emphasis>. We have the intention
+              of removing them in the next release, at which point only the 
+              FastLeaderElection will be available. 
               </para>
               </note>
             </listitem>

src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java

@@ -45,7 +45,10 @@ import org.apache.zookeeper.server.quorum.Vote;
 import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
 import org.apache.zookeeper.server.quorum.QuorumPeer.ServerState;
 
-
+/**
+ * @deprecated This class has been deprecated as of release 3.4.0. 
+ */
+@Deprecated
 public class AuthFastLeaderElection implements Election {
     private static final Logger LOG = LoggerFactory.getLogger(AuthFastLeaderElection.class);
 

src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java

@@ -41,6 +41,10 @@ import org.apache.zookeeper.server.quorum.QuorumPeer.LearnerType;
 import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
 import org.apache.zookeeper.server.quorum.QuorumPeer.ServerState;
 
+/**
+ * @deprecated This class has been deprecated as of release 3.4.0. 
+ */
+@Deprecated
 public class LeaderElection implements Election  {
     private static final Logger LOG = LoggerFactory.getLogger(LeaderElection.class);
     protected static final Random epochGen = new Random();

src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java

@@ -250,6 +250,10 @@ public class QuorumPeer extends Thread implements QuorumStats.Provider {
     protected int tick;
 
     /**
+     * @deprecated As of release 3.4.0, this class has been deprecated, since
+     * it is used with one of the udp-based versions of leader election, which
+     * we are also deprecating. 
+     * 
      * This class simply responds to requests for the current leader of this
      * node.
      * <p>
@@ -260,6 +264,7 @@ public class QuorumPeer extends Thread implements QuorumStats.Provider {
      *
      *
      */
+    @Deprecated
     class ResponderThread extends Thread {
         ResponderThread() {
             super("ResponderThread");