Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@<zookeeper.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1163099 - in /zookeeper/trunk: ./ docs/
 src/docs/src/documentation/content/xdocs/
 src/java/main/org/apache/zookeeper/server/quorum/
Date: Tue, 30 Aug 2011 06:29:08 -0000
To: commits@zookeeper.apache.org
From: mahadev@apache.org
Message-Id: <20110830062909.22436238889B@eris.apache.org>

Author: mahadev
Date: Tue Aug 30 06:29:07 2011
New Revision: 1163099

URL: http://svn.apache.org/viewvc?rev=1163099&view=rev
Log:
ZOOKEEPER-1153. Deprecate AuthFLE and LE. (Flavio Junqueira via mahadev)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/docs/bookkeeperConfig.pdf
    zookeeper/trunk/docs/bookkeeperOverview.pdf
    zookeeper/trunk/docs/bookkeeperProgrammer.pdf
    zookeeper/trunk/docs/bookkeeperStarted.pdf
    zookeeper/trunk/docs/bookkeeperStream.pdf
    zookeeper/trunk/docs/index.pdf
    zookeeper/trunk/docs/javaExample.pdf
    zookeeper/trunk/docs/linkmap.pdf
    zookeeper/trunk/docs/recipes.pdf
    zookeeper/trunk/docs/releasenotes.pdf
    zookeeper/trunk/docs/zookeeperAdmin.html
    zookeeper/trunk/docs/zookeeperAdmin.pdf
    zookeeper/trunk/docs/zookeeperHierarchicalQuorums.pdf
    zookeeper/trunk/docs/zookeeperInternals.pdf
    zookeeper/trunk/docs/zookeeperJMX.pdf
    zookeeper/trunk/docs/zookeeperObservers.pdf
    zookeeper/trunk/docs/zookeeperOver.pdf
    zookeeper/trunk/docs/zookeeperProgrammers.pdf
    zookeeper/trunk/docs/zookeeperQuotas.pdf
    zookeeper/trunk/docs/zookeeperStarted.pdf
    zookeeper/trunk/docs/zookeeperTutorial.pdf
    zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
    zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java
    zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java
    zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Tue Aug 30 06:29:07 2011
@@ -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:

Modified: zookeeper/trunk/docs/bookkeeperConfig.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/bookkeeperConfig.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Files zookeeper/trunk/docs/bookkeeperConfig.pdf (original) and zookeeper/trunk/docs/bookkeeperConfig.pdf Tue Aug 30 06:29:07 2011 differ

Modified: zookeeper/trunk/docs/bookkeeperOverview.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/bookkeeperOverview.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Files zookeeper/trunk/docs/bookkeeperOverview.pdf (original) and zookeeper/trunk/docs/bookkeeperOverview.pdf Tue Aug 30 06:29:07 2011 differ

Modified: zookeeper/trunk/docs/bookkeeperProgrammer.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/bookkeeperProgrammer.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Files zookeeper/trunk/docs/bookkeeperProgrammer.pdf (original) and zookeeper/trunk/docs/bookkeeperProgrammer.pdf Tue Aug 30 06:29:07 2011 differ

Modified: zookeeper/trunk/docs/bookkeeperStarted.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/bookkeeperStarted.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Files zookeeper/trunk/docs/bookkeeperStarted.pdf (original) and zookeeper/trunk/docs/bookkeeperStarted.pdf Tue Aug 30 06:29:07 2011 differ

Modified: zookeeper/trunk/docs/bookkeeperStream.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/bookkeeperStream.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Files zookeeper/trunk/docs/bookkeeperStream.pdf (original) and zookeeper/trunk/docs/bookkeeperStream.pdf Tue Aug 30 06:29:07 2011 differ

Modified: zookeeper/trunk/docs/index.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/index.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/trunk/docs/javaExample.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/javaExample.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/trunk/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/linkmap.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/trunk/docs/recipes.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/recipes.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/trunk/docs/releasenotes.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/releasenotes.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/trunk/docs/zookeeperAdmin.html
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperAdmin.html?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
--- zookeeper/trunk/docs/zookeeperAdmin.html (original)
+++ zookeeper/trunk/docs/zookeeperAdmin.html Tue Aug 30 06:29:07 2011
@@ -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>

Modified: zookeeper/trunk/docs/zookeeperAdmin.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperAdmin.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/trunk/docs/zookeeperHierarchicalQuorums.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperHierarchicalQuorums.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Files zookeeper/trunk/docs/zookeeperHierarchicalQuorums.pdf (original) and zookeeper/trunk/docs/zookeeperHierarchicalQuorums.pdf Tue Aug 30 06:29:07 2011 differ

Modified: zookeeper/trunk/docs/zookeeperInternals.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperInternals.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/trunk/docs/zookeeperJMX.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperJMX.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Files zookeeper/trunk/docs/zookeeperJMX.pdf (original) and zookeeper/trunk/docs/zookeeperJMX.pdf Tue Aug 30 06:29:07 2011 differ

Modified: zookeeper/trunk/docs/zookeeperObservers.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperObservers.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Files zookeeper/trunk/docs/zookeeperObservers.pdf (original) and zookeeper/trunk/docs/zookeeperObservers.pdf Tue Aug 30 06:29:07 2011 differ

Modified: zookeeper/trunk/docs/zookeeperOver.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperOver.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/trunk/docs/zookeeperProgrammers.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperProgrammers.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/trunk/docs/zookeeperQuotas.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperQuotas.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Files zookeeper/trunk/docs/zookeeperQuotas.pdf (original) and zookeeper/trunk/docs/zookeeperQuotas.pdf Tue Aug 30 06:29:07 2011 differ

Modified: zookeeper/trunk/docs/zookeeperStarted.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperStarted.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/trunk/docs/zookeeperTutorial.pdf
URL: http://svn.apache.org/viewvc/zookeeper/trunk/docs/zookeeperTutorial.pdf?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
--- zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml (original)
+++ zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml Tue Aug 30 06:29:07 2011
@@ -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>

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java Tue Aug 30 06:29:07 2011
@@ -45,7 +45,10 @@ import org.apache.zookeeper.server.quoru
 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);
 

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java Tue Aug 30 06:29:07 2011
@@ -41,6 +41,10 @@ import org.apache.zookeeper.server.quoru
 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();

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java?rev=1163099&r1=1163098&r2=1163099&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java Tue Aug 30 06:29:07 2011
@@ -250,6 +250,10 @@ public class QuorumPeer extends Thread i
     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 i
      *
      *
      */
+    @Deprecated
     class ResponderThread extends Thread {
         ResponderThread() {
             super("ResponderThread");