From zookeeper-commits-return-19-apmail-hadoop-zookeeper-commits-archive=hadoop.apache.org@hadoop.apache.org Tue Jun 24 18:22:06 2008 Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@locus.apache.org Received: (qmail 11580 invoked from network); 24 Jun 2008 18:22:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Jun 2008 18:22:06 -0000 Received: (qmail 26248 invoked by uid 500); 24 Jun 2008 18:22:03 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 26234 invoked by uid 500); 24 Jun 2008 18:22:03 -0000 Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: zookeeper-dev@ Delivered-To: mailing list zookeeper-commits@hadoop.apache.org Received: (qmail 26211 invoked by uid 99); 24 Jun 2008 18:22:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jun 2008 11:22:03 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jun 2008 18:21:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 11E8F2388A10; Tue, 24 Jun 2008 11:20:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r671284 [2/3] - in /hadoop/zookeeper/trunk: ./ bin/ src/ src/java/jmx/org/apache/zookeeper/jmx/ src/java/jmx/org/apache/zookeeper/jmx/server/ src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ src/java/jmx/org/apache/zookeeper/server/ src... Date: Tue, 24 Jun 2008 18:20:50 -0000 To: zookeeper-commits@hadoop.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080624182058.11E8F2388A10@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JDouble.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JDouble.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JDouble.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JDouble.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; /** * Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JField.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JField.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JField.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JField.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; /** * Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JFile.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JFile.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JFile.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JFile.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; import java.io.IOException; import java.util.ArrayList; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JFloat.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JFloat.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JFloat.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JFloat.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; /** * Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JInt.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JInt.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JInt.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JInt.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; /** * Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JLong.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JLong.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JLong.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JLong.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; /** * Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JMap.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JMap.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JMap.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JMap.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; /** * @@ -60,7 +60,7 @@ } ret.append(" {\n"); incrLevel(); - ret.append(" com.yahoo.jute.Index "+getId("midx")+" = a_.startMap(\""+tag+"\");\n"); + ret.append(" org.apache.jute.Index "+getId("midx")+" = a_.startMap(\""+tag+"\");\n"); ret.append(" "+fname+"=new java.util.TreeMap();\n"); ret.append(" for (; !"+getId("midx")+".done(); "+getId("midx")+".incr()) {\n"); ret.append(mKey.genJavaReadWrapper(getId("k"),getId("k"),true)); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JRecord.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JRecord.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JRecord.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JRecord.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; import java.io.File; import java.io.FileWriter; @@ -377,7 +377,7 @@ FileWriter jj = new FileWriter(jfile); jj.write("// File generated by hadoop record compiler. Do not edit.\n"); jj.write("package "+getJavaPackage()+";\n\n"); - jj.write("import com.yahoo.jute.*;\n"); + jj.write("import org.apache.jute.*;\n"); jj.write("public class "+getName()+" implements Record {\n"); for (Iterator i = mFields.iterator(); i.hasNext();) { JField jf = (JField) i.next(); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JString.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JString.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JString.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JString.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; /** * Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JType.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JType.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JType.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JType.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; /** * Abstract Base class for all types supported by Hadoop Record I/O. Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JVector.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JVector.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JVector.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JVector.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; /** * Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JavaGenerator.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JavaGenerator.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JavaGenerator.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JavaGenerator.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; import java.util.ArrayList; import java.io.File; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/ParseException.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/ParseException.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/ParseException.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/ParseException.java Tue Jun 24 11:20:47 2008 @@ -17,7 +17,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler.generated; +package org.apache.jute.compiler.generated; /** * This exception is thrown when parse errors are encountered. Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/Rcc.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/Rcc.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/Rcc.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/Rcc.java Tue Jun 24 11:20:47 2008 @@ -17,9 +17,9 @@ * limitations under the License. */ -package com.yahoo.jute.compiler.generated; +package org.apache.jute.compiler.generated; -import com.yahoo.jute.compiler.*; +import org.apache.jute.compiler.*; import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/RccConstants.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/RccConstants.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/RccConstants.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/RccConstants.java Tue Jun 24 11:20:47 2008 @@ -17,7 +17,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler.generated; +package org.apache.jute.compiler.generated; public interface RccConstants { Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/RccTokenManager.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/RccTokenManager.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/RccTokenManager.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/RccTokenManager.java Tue Jun 24 11:20:47 2008 @@ -17,8 +17,8 @@ * limitations under the License. */ -package com.yahoo.jute.compiler.generated; -import com.yahoo.jute.compiler.*; +package org.apache.jute.compiler.generated; +import org.apache.jute.compiler.*; import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/SimpleCharStream.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/SimpleCharStream.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/SimpleCharStream.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/SimpleCharStream.java Tue Jun 24 11:20:47 2008 @@ -17,7 +17,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler.generated; +package org.apache.jute.compiler.generated; /** * An implementation of interface CharStream, where the stream is assumed to Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/Token.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/Token.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/Token.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/Token.java Tue Jun 24 11:20:47 2008 @@ -17,7 +17,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler.generated; +package org.apache.jute.compiler.generated; /** * Describes the input token stream. Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/TokenMgrError.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/TokenMgrError.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/TokenMgrError.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/TokenMgrError.java Tue Jun 24 11:20:47 2008 @@ -17,7 +17,7 @@ * limitations under the License. */ -package com.yahoo.jute.compiler.generated; +package org.apache.jute.compiler.generated; public class TokenMgrError extends Error { Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/rcc.jj URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/rcc.jj?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/rcc.jj (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/rcc.jj Tue Jun 24 11:20:47 2008 @@ -21,9 +21,9 @@ * limitations under the License. */ -package com.yahoo.jute.compiler.generated; +package org.apache.jute.compiler.generated; -import com.yahoo.jute.compiler.*; +import org.apache.jute.compiler.*; import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/AsyncCallback.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/AsyncCallback.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/AsyncCallback.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/AsyncCallback.java Tue Jun 24 11:20:47 2008 @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yahoo.zookeeper; +package org.apache.zookeeper; import java.util.List; -import com.yahoo.zookeeper.data.ACL; -import com.yahoo.zookeeper.data.Stat; +import org.apache.zookeeper.data.ACL; +import org.apache.zookeeper.data.Stat; public interface AsyncCallback { interface StatCallback extends AsyncCallback { Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper; +package org.apache.zookeeper; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -34,35 +34,35 @@ import org.apache.log4j.Logger; -import com.yahoo.jute.BinaryInputArchive; -import com.yahoo.jute.BinaryOutputArchive; -import com.yahoo.jute.Record; -import com.yahoo.zookeeper.AsyncCallback.ACLCallback; -import com.yahoo.zookeeper.AsyncCallback.ChildrenCallback; -import com.yahoo.zookeeper.AsyncCallback.DataCallback; -import com.yahoo.zookeeper.AsyncCallback.StatCallback; -import com.yahoo.zookeeper.AsyncCallback.StringCallback; -import com.yahoo.zookeeper.AsyncCallback.VoidCallback; -import com.yahoo.zookeeper.Watcher.Event; -import com.yahoo.zookeeper.ZooDefs.OpCode; -import com.yahoo.zookeeper.ZooKeeper.States; -import com.yahoo.zookeeper.ZooKeeper.WatchRegistration; -import com.yahoo.zookeeper.proto.AuthPacket; -import com.yahoo.zookeeper.proto.ConnectRequest; -import com.yahoo.zookeeper.proto.ConnectResponse; -import com.yahoo.zookeeper.proto.CreateResponse; -import com.yahoo.zookeeper.proto.ExistsResponse; -import com.yahoo.zookeeper.proto.GetACLResponse; -import com.yahoo.zookeeper.proto.GetChildrenResponse; -import com.yahoo.zookeeper.proto.GetDataResponse; -import com.yahoo.zookeeper.proto.ReplyHeader; -import com.yahoo.zookeeper.proto.RequestHeader; -import com.yahoo.zookeeper.proto.SetACLResponse; -import com.yahoo.zookeeper.proto.SetDataResponse; -import com.yahoo.zookeeper.proto.WatcherEvent; -import com.yahoo.zookeeper.server.ByteBufferInputStream; -import com.yahoo.zookeeper.server.ZooKeeperServer; -import com.yahoo.zookeeper.server.ZooTrace; +import org.apache.jute.BinaryInputArchive; +import org.apache.jute.BinaryOutputArchive; +import org.apache.jute.Record; +import org.apache.zookeeper.AsyncCallback.ACLCallback; +import org.apache.zookeeper.AsyncCallback.ChildrenCallback; +import org.apache.zookeeper.AsyncCallback.DataCallback; +import org.apache.zookeeper.AsyncCallback.StatCallback; +import org.apache.zookeeper.AsyncCallback.StringCallback; +import org.apache.zookeeper.AsyncCallback.VoidCallback; +import org.apache.zookeeper.Watcher.Event; +import org.apache.zookeeper.ZooDefs.OpCode; +import org.apache.zookeeper.ZooKeeper.States; +import org.apache.zookeeper.ZooKeeper.WatchRegistration; +import org.apache.zookeeper.proto.AuthPacket; +import org.apache.zookeeper.proto.ConnectRequest; +import org.apache.zookeeper.proto.ConnectResponse; +import org.apache.zookeeper.proto.CreateResponse; +import org.apache.zookeeper.proto.ExistsResponse; +import org.apache.zookeeper.proto.GetACLResponse; +import org.apache.zookeeper.proto.GetChildrenResponse; +import org.apache.zookeeper.proto.GetDataResponse; +import org.apache.zookeeper.proto.ReplyHeader; +import org.apache.zookeeper.proto.RequestHeader; +import org.apache.zookeeper.proto.SetACLResponse; +import org.apache.zookeeper.proto.SetDataResponse; +import org.apache.zookeeper.proto.WatcherEvent; +import org.apache.zookeeper.server.ByteBufferInputStream; +import org.apache.zookeeper.server.ZooKeeperServer; +import org.apache.zookeeper.server.ZooTrace; /** * This class manages the socket i/o for the client. ClientCnxn maintains a list Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/KeeperException.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/KeeperException.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/KeeperException.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/KeeperException.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper; +package org.apache.zookeeper; @SuppressWarnings("serial") public abstract class KeeperException extends Exception { Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ServerAdminClient.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ServerAdminClient.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ServerAdminClient.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ServerAdminClient.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper; +package org.apache.zookeeper; import java.io.IOException; import java.io.InputStream; @@ -26,7 +26,7 @@ import org.apache.log4j.Logger; -import com.yahoo.zookeeper.server.ZooTrace; +import org.apache.zookeeper.server.ZooTrace; public class ServerAdminClient { private static final Logger LOG = Logger.getLogger(ServerAdminClient.class); @@ -230,7 +230,7 @@ private static void usage() { System.out - .println("usage: java [-cp CLASSPATH] com.yahoo.zookeeper.ServerAdminClient " + .println("usage: java [-cp CLASSPATH] org.apache.zookeeper.ServerAdminClient " + "host port op (ruok|stat|dump|kill|gettracemask|settracemask) [arguments]"); } Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/Version.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/Version.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/Version.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/Version.java Tue Jun 24 11:20:47 2008 @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.yahoo.zookeeper; +package org.apache.zookeeper; -public class Version implements com.yahoo.zookeeper.version.Info{ +public class Version implements org.apache.zookeeper.version.Info{ public static int getRevision() { return REVISION; @@ -40,7 +40,7 @@ public static void printUsage() { System.out - .print("Usage:\tjava -cp ... com.yahoo.zookeeper.Version " + .print("Usage:\tjava -cp ... org.apache.zookeeper.Version " + "[--full | --short | --revision],\n\tPrints --full version " + "info if no arg specified."); System.exit(1); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/Watcher.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/Watcher.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/Watcher.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/Watcher.java Tue Jun 24 11:20:47 2008 @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.yahoo.zookeeper; +package org.apache.zookeeper; -import com.yahoo.zookeeper.proto.WatcherEvent; +import org.apache.zookeeper.proto.WatcherEvent; /** * This interface specifies the public interface an event handler class must Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooDefs.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooDefs.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooDefs.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooDefs.java Tue Jun 24 11:20:47 2008 @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.yahoo.zookeeper; +package org.apache.zookeeper; import java.util.ArrayList; import java.util.Collections; -import com.yahoo.zookeeper.data.ACL; -import com.yahoo.zookeeper.data.Id; +import org.apache.zookeeper.data.ACL; +import org.apache.zookeeper.data.Id; public class ZooDefs { public interface OpCode { Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper; +package org.apache.zookeeper; import java.io.BufferedReader; import java.io.IOException; @@ -29,36 +29,36 @@ import org.apache.log4j.Logger; -import com.yahoo.zookeeper.AsyncCallback.ACLCallback; -import com.yahoo.zookeeper.AsyncCallback.ChildrenCallback; -import com.yahoo.zookeeper.AsyncCallback.DataCallback; -import com.yahoo.zookeeper.AsyncCallback.StatCallback; -import com.yahoo.zookeeper.AsyncCallback.StringCallback; -import com.yahoo.zookeeper.AsyncCallback.VoidCallback; -import com.yahoo.zookeeper.ZooDefs.Ids; -import com.yahoo.zookeeper.data.ACL; -import com.yahoo.zookeeper.data.Id; -import com.yahoo.zookeeper.data.Stat; -import com.yahoo.zookeeper.proto.CreateRequest; -import com.yahoo.zookeeper.proto.CreateResponse; -import com.yahoo.zookeeper.proto.DeleteRequest; -import com.yahoo.zookeeper.proto.ExistsRequest; -import com.yahoo.zookeeper.proto.GetACLRequest; -import com.yahoo.zookeeper.proto.GetACLResponse; -import com.yahoo.zookeeper.proto.GetChildrenRequest; -import com.yahoo.zookeeper.proto.GetChildrenResponse; -import com.yahoo.zookeeper.proto.GetDataRequest; -import com.yahoo.zookeeper.proto.GetDataResponse; -import com.yahoo.zookeeper.proto.ReplyHeader; -import com.yahoo.zookeeper.proto.RequestHeader; -import com.yahoo.zookeeper.proto.SetACLRequest; -import com.yahoo.zookeeper.proto.SetACLResponse; -import com.yahoo.zookeeper.proto.SetDataRequest; -import com.yahoo.zookeeper.proto.SetDataResponse; -import com.yahoo.zookeeper.proto.SyncRequest; -import com.yahoo.zookeeper.proto.SyncResponse; -import com.yahoo.zookeeper.proto.WatcherEvent; -import com.yahoo.zookeeper.server.DataTree; +import org.apache.zookeeper.AsyncCallback.ACLCallback; +import org.apache.zookeeper.AsyncCallback.ChildrenCallback; +import org.apache.zookeeper.AsyncCallback.DataCallback; +import org.apache.zookeeper.AsyncCallback.StatCallback; +import org.apache.zookeeper.AsyncCallback.StringCallback; +import org.apache.zookeeper.AsyncCallback.VoidCallback; +import org.apache.zookeeper.ZooDefs.Ids; +import org.apache.zookeeper.data.ACL; +import org.apache.zookeeper.data.Id; +import org.apache.zookeeper.data.Stat; +import org.apache.zookeeper.proto.CreateRequest; +import org.apache.zookeeper.proto.CreateResponse; +import org.apache.zookeeper.proto.DeleteRequest; +import org.apache.zookeeper.proto.ExistsRequest; +import org.apache.zookeeper.proto.GetACLRequest; +import org.apache.zookeeper.proto.GetACLResponse; +import org.apache.zookeeper.proto.GetChildrenRequest; +import org.apache.zookeeper.proto.GetChildrenResponse; +import org.apache.zookeeper.proto.GetDataRequest; +import org.apache.zookeeper.proto.GetDataResponse; +import org.apache.zookeeper.proto.ReplyHeader; +import org.apache.zookeeper.proto.RequestHeader; +import org.apache.zookeeper.proto.SetACLRequest; +import org.apache.zookeeper.proto.SetACLResponse; +import org.apache.zookeeper.proto.SetDataRequest; +import org.apache.zookeeper.proto.SetDataResponse; +import org.apache.zookeeper.proto.SyncRequest; +import org.apache.zookeeper.proto.SyncResponse; +import org.apache.zookeeper.proto.WatcherEvent; +import org.apache.zookeeper.server.DataTree; /** * This is the main class of ZooKeeper client library. To use a ZooKeeper @@ -365,7 +365,7 @@ * and/or sequential * @return the actual path of the created node * @throws KeeperException if the server returns a non-zero error code - * @throws com.yahoo.zookeeper.KeeperException.InvalidACLException if the ACL is invalid + * @throws org.apache.zookeeper.KeeperException.InvalidACLException if the ACL is invalid * @throws InterruptedException if the transaction is interrrupted */ public String create(String path, byte data[], List acl, int flags) @@ -777,7 +777,7 @@ * @return the stat of the node. * @throws InterruptedException If the server transaction is interrupted. * @throws KeeperException If the server signals an error with a non-zero error code. - * @throws com.yahoo.zookeeper.KeeperException.InvalidACLException If the acl is invalide. + * @throws org.apache.zookeeper.KeeperException.InvalidACLException If the acl is invalide. */ public Stat setACL(String path, List acl, int version) throws KeeperException, InterruptedException { Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ByteBufferInputStream.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ByteBufferInputStream.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ByteBufferInputStream.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ByteBufferInputStream.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.io.IOException; import java.io.InputStream; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataNode.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataNode.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataNode.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataNode.java Tue Jun 24 11:20:47 2008 @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import com.yahoo.jute.Index; -import com.yahoo.jute.InputArchive; -import com.yahoo.jute.OutputArchive; -import com.yahoo.jute.Record; -import com.yahoo.zookeeper.data.ACL; -import com.yahoo.zookeeper.data.Stat; +import org.apache.jute.Index; +import org.apache.jute.InputArchive; +import org.apache.jute.OutputArchive; +import org.apache.jute.Record; +import org.apache.zookeeper.data.ACL; +import org.apache.zookeeper.data.Stat; /** * This class contains the data for a node in the data tree. Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.io.IOException; import java.util.ArrayList; @@ -27,22 +27,22 @@ import org.apache.log4j.Logger; -import com.yahoo.jute.InputArchive; -import com.yahoo.jute.OutputArchive; -import com.yahoo.jute.Record; -import com.yahoo.zookeeper.KeeperException; -import com.yahoo.zookeeper.Watcher; -import com.yahoo.zookeeper.KeeperException.Code; -import com.yahoo.zookeeper.Watcher.Event; -import com.yahoo.zookeeper.ZooDefs.OpCode; -import com.yahoo.zookeeper.data.ACL; -import com.yahoo.zookeeper.data.Stat; -import com.yahoo.zookeeper.txn.CreateTxn; -import com.yahoo.zookeeper.txn.DeleteTxn; -import com.yahoo.zookeeper.txn.ErrorTxn; -import com.yahoo.zookeeper.txn.SetACLTxn; -import com.yahoo.zookeeper.txn.SetDataTxn; -import com.yahoo.zookeeper.txn.TxnHeader; +import org.apache.jute.InputArchive; +import org.apache.jute.OutputArchive; +import org.apache.jute.Record; +import org.apache.zookeeper.KeeperException; +import org.apache.zookeeper.Watcher; +import org.apache.zookeeper.KeeperException.Code; +import org.apache.zookeeper.Watcher.Event; +import org.apache.zookeeper.ZooDefs.OpCode; +import org.apache.zookeeper.data.ACL; +import org.apache.zookeeper.data.Stat; +import org.apache.zookeeper.txn.CreateTxn; +import org.apache.zookeeper.txn.DeleteTxn; +import org.apache.zookeeper.txn.ErrorTxn; +import org.apache.zookeeper.txn.SetACLTxn; +import org.apache.zookeeper.txn.SetDataTxn; +import org.apache.zookeeper.txn.TxnHeader; /** * This class maintains the tree data structure. It doesn't have any networking @@ -98,6 +98,10 @@ return nodes.size(); } + public int getWatchCount(){ + return dataWatches.size()+childWatches.size(); + } + /** * This is a pointer to the root of the DataTree. It is the source of truth, * but we usually use the nodes hashmap to find nodes in the tree. @@ -424,10 +428,10 @@ } void killSession(long session) { - // the list is already removed from the ephemerals + // the list is already removed from the ephemerals // so we do not have to worry about synchronyzing on // the list. This is only called from FinalRequestProcessor - // so there is no need for synchornization. The list is not + // so there is no need for synchornization. The list is not // changed here. Only create and delete change the list which // are again called from FinalRequestProcessor in sequence. HashSet list = ephemerals.remove(session); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.io.IOException; import java.nio.ByteBuffer; @@ -23,31 +23,31 @@ import org.apache.log4j.Logger; -import com.yahoo.jute.Record; -import com.yahoo.zookeeper.KeeperException; -import com.yahoo.zookeeper.ZooDefs; -import com.yahoo.zookeeper.KeeperException.Code; -import com.yahoo.zookeeper.ZooDefs.OpCode; -import com.yahoo.zookeeper.data.ACL; -import com.yahoo.zookeeper.data.Stat; -import com.yahoo.zookeeper.proto.CreateResponse; -import com.yahoo.zookeeper.proto.ExistsRequest; -import com.yahoo.zookeeper.proto.ExistsResponse; -import com.yahoo.zookeeper.proto.GetACLRequest; -import com.yahoo.zookeeper.proto.GetACLResponse; -import com.yahoo.zookeeper.proto.GetChildrenRequest; -import com.yahoo.zookeeper.proto.GetChildrenResponse; -import com.yahoo.zookeeper.proto.GetDataRequest; -import com.yahoo.zookeeper.proto.GetDataResponse; -import com.yahoo.zookeeper.proto.ReplyHeader; -import com.yahoo.zookeeper.proto.SetACLResponse; -import com.yahoo.zookeeper.proto.SetDataResponse; -import com.yahoo.zookeeper.proto.SyncRequest; -import com.yahoo.zookeeper.proto.SyncResponse; -import com.yahoo.zookeeper.server.DataTree.ProcessTxnResult; -import com.yahoo.zookeeper.server.NIOServerCnxn.Factory; -import com.yahoo.zookeeper.txn.CreateSessionTxn; -import com.yahoo.zookeeper.txn.ErrorTxn; +import org.apache.jute.Record; +import org.apache.zookeeper.KeeperException; +import org.apache.zookeeper.ZooDefs; +import org.apache.zookeeper.KeeperException.Code; +import org.apache.zookeeper.ZooDefs.OpCode; +import org.apache.zookeeper.data.ACL; +import org.apache.zookeeper.data.Stat; +import org.apache.zookeeper.proto.CreateResponse; +import org.apache.zookeeper.proto.ExistsRequest; +import org.apache.zookeeper.proto.ExistsResponse; +import org.apache.zookeeper.proto.GetACLRequest; +import org.apache.zookeeper.proto.GetACLResponse; +import org.apache.zookeeper.proto.GetChildrenRequest; +import org.apache.zookeeper.proto.GetChildrenResponse; +import org.apache.zookeeper.proto.GetDataRequest; +import org.apache.zookeeper.proto.GetDataResponse; +import org.apache.zookeeper.proto.ReplyHeader; +import org.apache.zookeeper.proto.SetACLResponse; +import org.apache.zookeeper.proto.SetDataResponse; +import org.apache.zookeeper.proto.SyncRequest; +import org.apache.zookeeper.proto.SyncResponse; +import org.apache.zookeeper.server.DataTree.ProcessTxnResult; +import org.apache.zookeeper.server.NIOServerCnxn.Factory; +import org.apache.zookeeper.txn.CreateSessionTxn; +import org.apache.zookeeper.txn.ErrorTxn; /** * This Request processor actually applies any transaction associated with a Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/LogFormatter.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/LogFormatter.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/LogFormatter.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/LogFormatter.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.io.ByteArrayInputStream; import java.io.EOFException; @@ -24,9 +24,9 @@ import org.apache.log4j.Logger; -import com.yahoo.jute.BinaryInputArchive; -import com.yahoo.jute.InputArchive; -import com.yahoo.zookeeper.txn.TxnHeader; +import org.apache.jute.BinaryInputArchive; +import org.apache.jute.InputArchive; +import org.apache.zookeeper.txn.TxnHeader; public class LogFormatter { private static final Logger LOG = Logger.getLogger(LogFormatter.class); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -38,22 +38,22 @@ import org.apache.log4j.Logger; -import com.yahoo.jute.BinaryInputArchive; -import com.yahoo.jute.BinaryOutputArchive; -import com.yahoo.jute.Record; -import com.yahoo.zookeeper.KeeperException; -import com.yahoo.zookeeper.Version; -import com.yahoo.zookeeper.Watcher; -import com.yahoo.zookeeper.ZooDefs.OpCode; -import com.yahoo.zookeeper.data.Id; -import com.yahoo.zookeeper.proto.AuthPacket; -import com.yahoo.zookeeper.proto.ConnectRequest; -import com.yahoo.zookeeper.proto.ConnectResponse; -import com.yahoo.zookeeper.proto.ReplyHeader; -import com.yahoo.zookeeper.proto.RequestHeader; -import com.yahoo.zookeeper.proto.WatcherEvent; -import com.yahoo.zookeeper.server.auth.AuthenticationProvider; -import com.yahoo.zookeeper.server.auth.ProviderRegistry; +import org.apache.jute.BinaryInputArchive; +import org.apache.jute.BinaryOutputArchive; +import org.apache.jute.Record; +import org.apache.zookeeper.KeeperException; +import org.apache.zookeeper.Version; +import org.apache.zookeeper.Watcher; +import org.apache.zookeeper.ZooDefs.OpCode; +import org.apache.zookeeper.data.Id; +import org.apache.zookeeper.proto.AuthPacket; +import org.apache.zookeeper.proto.ConnectRequest; +import org.apache.zookeeper.proto.ConnectResponse; +import org.apache.zookeeper.proto.ReplyHeader; +import org.apache.zookeeper.proto.RequestHeader; +import org.apache.zookeeper.proto.WatcherEvent; +import org.apache.zookeeper.server.auth.AuthenticationProvider; +import org.apache.zookeeper.server.auth.ProviderRegistry; /** * This class handles communication with clients using NIO. There is one per @@ -610,7 +610,7 @@ /* * (non-Javadoc) * - * @see com.yahoo.zookeeper.server.ServerCnxnIface#getSessionTimeout() + * @see org.apache.zookeeper.server.ServerCnxnIface#getSessionTimeout() */ public int getSessionTimeout() { return sessionTimeout; @@ -648,7 +648,7 @@ /* * (non-Javadoc) * - * @see com.yahoo.zookeeper.server.ServerCnxnIface#close() + * @see org.apache.zookeeper.server.ServerCnxnIface#close() */ public void close() { if (closed) { @@ -708,8 +708,8 @@ /* * (non-Javadoc) * - * @see com.yahoo.zookeeper.server.ServerCnxnIface#sendResponse(com.yahoo.zookeeper.proto.ReplyHeader, - * com.yahoo.jute.Record, java.lang.String) + * @see org.apache.zookeeper.server.ServerCnxnIface#sendResponse(org.apache.zookeeper.proto.ReplyHeader, + * org.apache.jute.Record, java.lang.String) */ synchronized public void sendResponse(ReplyHeader h, Record r, String tag) { if (closed) { @@ -748,7 +748,7 @@ /* * (non-Javadoc) * - * @see com.yahoo.zookeeper.server.ServerCnxnIface#process(com.yahoo.zookeeper.proto.WatcherEvent) + * @see org.apache.zookeeper.server.ServerCnxnIface#process(org.apache.zookeeper.proto.WatcherEvent) */ synchronized public void process(WatcherEvent event) { ReplyHeader h = new ReplyHeader(-1, -1L, 0); @@ -791,7 +791,7 @@ /* * (non-Javadoc) * - * @see com.yahoo.zookeeper.server.ServerCnxnIface#getSessionId() + * @see org.apache.zookeeper.server.ServerCnxnIface#getSessionId() */ public long getSessionId() { return sessionId; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -26,29 +26,29 @@ import org.apache.log4j.Logger; -import com.yahoo.jute.Record; -import com.yahoo.zookeeper.KeeperException; -import com.yahoo.zookeeper.ZooDefs; -import com.yahoo.zookeeper.KeeperException.Code; -import com.yahoo.zookeeper.ZooDefs.CreateFlags; -import com.yahoo.zookeeper.ZooDefs.OpCode; -import com.yahoo.zookeeper.data.ACL; -import com.yahoo.zookeeper.data.Id; -import com.yahoo.zookeeper.data.Stat; -import com.yahoo.zookeeper.proto.CreateRequest; -import com.yahoo.zookeeper.proto.DeleteRequest; -import com.yahoo.zookeeper.proto.SetACLRequest; -import com.yahoo.zookeeper.proto.SetDataRequest; -import com.yahoo.zookeeper.server.ZooKeeperServer.ChangeRecord; -import com.yahoo.zookeeper.server.auth.AuthenticationProvider; -import com.yahoo.zookeeper.server.auth.ProviderRegistry; -import com.yahoo.zookeeper.txn.CreateSessionTxn; -import com.yahoo.zookeeper.txn.CreateTxn; -import com.yahoo.zookeeper.txn.DeleteTxn; -import com.yahoo.zookeeper.txn.ErrorTxn; -import com.yahoo.zookeeper.txn.SetACLTxn; -import com.yahoo.zookeeper.txn.SetDataTxn; -import com.yahoo.zookeeper.txn.TxnHeader; +import org.apache.jute.Record; +import org.apache.zookeeper.KeeperException; +import org.apache.zookeeper.ZooDefs; +import org.apache.zookeeper.KeeperException.Code; +import org.apache.zookeeper.ZooDefs.CreateFlags; +import org.apache.zookeeper.ZooDefs.OpCode; +import org.apache.zookeeper.data.ACL; +import org.apache.zookeeper.data.Id; +import org.apache.zookeeper.data.Stat; +import org.apache.zookeeper.proto.CreateRequest; +import org.apache.zookeeper.proto.DeleteRequest; +import org.apache.zookeeper.proto.SetACLRequest; +import org.apache.zookeeper.proto.SetDataRequest; +import org.apache.zookeeper.server.ZooKeeperServer.ChangeRecord; +import org.apache.zookeeper.server.auth.AuthenticationProvider; +import org.apache.zookeeper.server.auth.ProviderRegistry; +import org.apache.zookeeper.txn.CreateSessionTxn; +import org.apache.zookeeper.txn.CreateTxn; +import org.apache.zookeeper.txn.DeleteTxn; +import org.apache.zookeeper.txn.ErrorTxn; +import org.apache.zookeeper.txn.SetACLTxn; +import org.apache.zookeeper.txn.SetDataTxn; +import org.apache.zookeeper.txn.TxnHeader; /** * This request processor is generally at the start of a RequestProcessor Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.io.File; import java.io.FileFilter; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Request.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Request.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Request.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Request.java Tue Jun 24 11:20:47 2008 @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import com.yahoo.jute.Record; -import com.yahoo.zookeeper.ZooDefs.OpCode; -import com.yahoo.zookeeper.data.Id; -import com.yahoo.zookeeper.txn.TxnHeader; +import org.apache.jute.Record; +import org.apache.zookeeper.ZooDefs.OpCode; +import org.apache.zookeeper.data.Id; +import org.apache.zookeeper.txn.TxnHeader; /** * This is the structure that represents a request moving through a chain of Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/RequestProcessor.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/RequestProcessor.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/RequestProcessor.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/RequestProcessor.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; /** * RequestProcessors are chained together to process transactions. Requests are Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxn.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxn.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxn.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxn.java Tue Jun 24 11:20:47 2008 @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.io.IOException; import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.util.ArrayList; -import com.yahoo.jute.Record; -import com.yahoo.zookeeper.Watcher; -import com.yahoo.zookeeper.data.Id; -import com.yahoo.zookeeper.proto.ReplyHeader; -import com.yahoo.zookeeper.proto.WatcherEvent; +import org.apache.jute.Record; +import org.apache.zookeeper.Watcher; +import org.apache.zookeeper.data.Id; +import org.apache.zookeeper.proto.ReplyHeader; +import org.apache.zookeeper.proto.WatcherEvent; public interface ServerCnxn extends Watcher { final static int killCmd = ByteBuffer.wrap("kill".getBytes()).getInt(); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerConfig.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerConfig.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerConfig.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerConfig.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; public class ServerConfig { private int clientPort; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerStats.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerStats.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerStats.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerStats.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; public class ServerStats { Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTracker.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTracker.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTracker.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTracker.java Tue Jun 24 11:20:47 2008 @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; -import com.yahoo.zookeeper.KeeperException; +import org.apache.zookeeper.KeeperException; /** * This is the basic interface that ZooKeeperServer uses to track sessions. The Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.util.ArrayList; import java.util.Collections; @@ -25,7 +25,7 @@ import org.apache.log4j.Logger; -import com.yahoo.zookeeper.KeeperException; +import org.apache.zookeeper.KeeperException; /** * This is a full featured SessionTracker. It tracks session in grouped by tick Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SyncRequestProcessor.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SyncRequestProcessor.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SyncRequestProcessor.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SyncRequestProcessor.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.io.ByteArrayOutputStream; import java.io.File; @@ -28,10 +28,10 @@ import org.apache.log4j.Logger; -import com.yahoo.jute.BinaryOutputArchive; -import com.yahoo.jute.Record; -import com.yahoo.zookeeper.server.util.Profiler; -import com.yahoo.zookeeper.txn.TxnHeader; +import org.apache.jute.BinaryOutputArchive; +import org.apache.jute.Record; +import org.apache.zookeeper.server.util.Profiler; +import org.apache.zookeeper.txn.TxnHeader; /** * This RequestProcessor logs requests to disk. It batches the requests to do Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/TraceFormatter.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/TraceFormatter.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/TraceFormatter.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/TraceFormatter.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.io.FileInputStream; import java.io.IOException; @@ -23,7 +23,7 @@ import java.text.DateFormat; import java.util.Date; -import com.yahoo.zookeeper.ZooDefs.OpCode; +import org.apache.zookeeper.ZooDefs.OpCode; public class TraceFormatter { Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.util.HashMap; import java.util.HashSet; @@ -22,8 +22,8 @@ import org.apache.log4j.Logger; -import com.yahoo.zookeeper.Watcher; -import com.yahoo.zookeeper.proto.WatcherEvent; +import org.apache.zookeeper.Watcher; +import org.apache.zookeeper.proto.WatcherEvent; /** * This class manages watches. It allows watches to be associated with a string Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -44,26 +44,26 @@ import org.apache.log4j.Logger; -import com.yahoo.jute.BinaryInputArchive; -import com.yahoo.jute.BinaryOutputArchive; -import com.yahoo.jute.InputArchive; -import com.yahoo.jute.Record; -import com.yahoo.zookeeper.ZooDefs.OpCode; -import com.yahoo.zookeeper.data.ACL; -import com.yahoo.zookeeper.data.Id; -import com.yahoo.zookeeper.data.Stat; -import com.yahoo.zookeeper.proto.RequestHeader; -import com.yahoo.zookeeper.server.SessionTracker.SessionExpirer; -import com.yahoo.zookeeper.server.quorum.Leader; -import com.yahoo.zookeeper.server.quorum.QuorumPacket; -import com.yahoo.zookeeper.server.quorum.Leader.Proposal; -import com.yahoo.zookeeper.txn.CreateSessionTxn; -import com.yahoo.zookeeper.txn.CreateTxn; -import com.yahoo.zookeeper.txn.DeleteTxn; -import com.yahoo.zookeeper.txn.ErrorTxn; -import com.yahoo.zookeeper.txn.SetACLTxn; -import com.yahoo.zookeeper.txn.SetDataTxn; -import com.yahoo.zookeeper.txn.TxnHeader; +import org.apache.jute.BinaryInputArchive; +import org.apache.jute.BinaryOutputArchive; +import org.apache.jute.InputArchive; +import org.apache.jute.Record; +import org.apache.zookeeper.ZooDefs.OpCode; +import org.apache.zookeeper.data.ACL; +import org.apache.zookeeper.data.Id; +import org.apache.zookeeper.data.Stat; +import org.apache.zookeeper.proto.RequestHeader; +import org.apache.zookeeper.server.SessionTracker.SessionExpirer; +import org.apache.zookeeper.server.quorum.Leader; +import org.apache.zookeeper.server.quorum.QuorumPacket; +import org.apache.zookeeper.server.quorum.Leader.Proposal; +import org.apache.zookeeper.txn.CreateSessionTxn; +import org.apache.zookeeper.txn.CreateTxn; +import org.apache.zookeeper.txn.DeleteTxn; +import org.apache.zookeeper.txn.ErrorTxn; +import org.apache.zookeeper.txn.SetACLTxn; +import org.apache.zookeeper.txn.SetDataTxn; +import org.apache.zookeeper.txn.TxnHeader; /** * This class implements a simple standalone ZooKeeperServer. It sets up the Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java Tue Jun 24 11:20:47 2008 @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import org.apache.log4j.Logger; -import com.yahoo.zookeeper.server.quorum.QuorumPacket; +import org.apache.zookeeper.server.quorum.QuorumPacket; /** * This class encapsulates and centralizes tracing for the ZooKeeper server. Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/AuthenticationProvider.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/AuthenticationProvider.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/AuthenticationProvider.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/AuthenticationProvider.java Tue Jun 24 11:20:47 2008 @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.auth; +package org.apache.zookeeper.server.auth; -import com.yahoo.zookeeper.server.ServerCnxn; +import org.apache.zookeeper.server.ServerCnxn; /** * This interface is implemented by authentication providers to add new kinds of Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.auth; +package org.apache.zookeeper.server.auth; import java.io.IOException; import java.security.MessageDigest; @@ -22,9 +22,9 @@ import org.apache.log4j.Logger; -import com.yahoo.zookeeper.KeeperException; -import com.yahoo.zookeeper.data.Id; -import com.yahoo.zookeeper.server.ServerCnxn; +import org.apache.zookeeper.KeeperException; +import org.apache.zookeeper.data.Id; +import org.apache.zookeeper.server.ServerCnxn; public class DigestAuthenticationProvider implements AuthenticationProvider { private static final Logger LOG = Logger.getLogger(DigestAuthenticationProvider.class); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/HostAuthenticationProvider.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/HostAuthenticationProvider.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/HostAuthenticationProvider.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/HostAuthenticationProvider.java Tue Jun 24 11:20:47 2008 @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.auth; +package org.apache.zookeeper.server.auth; -import com.yahoo.zookeeper.data.Id; -import com.yahoo.zookeeper.server.ServerCnxn; -import com.yahoo.zookeeper.KeeperException; +import org.apache.zookeeper.data.Id; +import org.apache.zookeeper.server.ServerCnxn; +import org.apache.zookeeper.KeeperException; public class HostAuthenticationProvider implements AuthenticationProvider { Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java Tue Jun 24 11:20:47 2008 @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.auth; +package org.apache.zookeeper.server.auth; -import com.yahoo.zookeeper.data.Id; -import com.yahoo.zookeeper.server.ServerCnxn; -import com.yahoo.zookeeper.KeeperException; +import org.apache.zookeeper.data.Id; +import org.apache.zookeeper.server.ServerCnxn; +import org.apache.zookeeper.KeeperException; public class IPAuthenticationProvider implements AuthenticationProvider { Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java Tue Jun 24 11:20:47 2008 @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.auth; +package org.apache.zookeeper.server.auth; import java.util.Enumeration; import java.util.HashMap; import org.apache.log4j.Logger; -import com.yahoo.zookeeper.server.ZooKeeperServer; +import org.apache.zookeeper.server.ZooKeeperServer; public class ProviderRegistry { private static final Logger LOG = Logger.getLogger(ProviderRegistry.class); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AckRequestProcessor.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AckRequestProcessor.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AckRequestProcessor.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AckRequestProcessor.java Tue Jun 24 11:20:47 2008 @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; -import com.yahoo.zookeeper.server.Request; -import com.yahoo.zookeeper.server.RequestProcessor; +import org.apache.zookeeper.server.Request; +import org.apache.zookeeper.server.RequestProcessor; /** * This is a very simple RequestProcessor that simply forwards a request from a Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.io.IOException; import java.net.DatagramPacket; @@ -30,10 +30,10 @@ import org.apache.log4j.Logger; -import com.yahoo.zookeeper.server.quorum.Election; -import com.yahoo.zookeeper.server.quorum.Vote; -import com.yahoo.zookeeper.server.quorum.QuorumPeer.QuorumServer; -import com.yahoo.zookeeper.server.quorum.QuorumPeer.ServerState; +import org.apache.zookeeper.server.quorum.Election; +import org.apache.zookeeper.server.quorum.Vote; +import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer; +import org.apache.zookeeper.server.quorum.QuorumPeer.ServerState; public class AuthFastLeaderElection implements Election { private static final Logger LOG = Logger.getLogger(AuthFastLeaderElection.class); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/CommitProcessor.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/CommitProcessor.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/CommitProcessor.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/CommitProcessor.java Tue Jun 24 11:20:47 2008 @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.util.ArrayList; import java.util.LinkedList; import org.apache.log4j.Logger; -import com.yahoo.zookeeper.ZooDefs.OpCode; -import com.yahoo.zookeeper.server.Request; -import com.yahoo.zookeeper.server.RequestProcessor; -import com.yahoo.zookeeper.server.ZooTrace; +import org.apache.zookeeper.ZooDefs.OpCode; +import org.apache.zookeeper.server.Request; +import org.apache.zookeeper.server.RequestProcessor; +import org.apache.zookeeper.server.ZooTrace; /** * This RequestProcessor matches the incoming committed requests with the Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java Tue Jun 24 11:20:47 2008 @@ -1,7 +1,7 @@ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; -import com.yahoo.zookeeper.server.quorum.Vote; +import org.apache.zookeeper.server.quorum.Vote; interface Election { public Vote lookForLeader() throws InterruptedException; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java Tue Jun 24 11:20:47 2008 @@ -15,7 +15,7 @@ */ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.net.DatagramSocket; import java.net.InetAddress; @@ -27,9 +27,9 @@ import org.apache.log4j.Logger; -import com.yahoo.zookeeper.server.quorum.QuorumCnxManager.Message; -import com.yahoo.zookeeper.server.quorum.QuorumPeer.QuorumServer; -import com.yahoo.zookeeper.server.quorum.QuorumPeer.ServerState; +import org.apache.zookeeper.server.quorum.QuorumCnxManager.Message; +import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer; +import org.apache.zookeeper.server.quorum.QuorumPeer.ServerState; /** Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Follower.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Follower.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Follower.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Follower.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ /** * This class has the control logic for the Follower. */ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -34,17 +34,17 @@ import org.apache.log4j.Logger; -import com.yahoo.jute.BinaryInputArchive; -import com.yahoo.jute.BinaryOutputArchive; -import com.yahoo.jute.InputArchive; -import com.yahoo.jute.OutputArchive; -import com.yahoo.jute.Record; -import com.yahoo.zookeeper.server.Request; -import com.yahoo.zookeeper.server.ServerCnxn; -import com.yahoo.zookeeper.server.ZooKeeperServer; -import com.yahoo.zookeeper.server.ZooTrace; -import com.yahoo.zookeeper.server.quorum.QuorumPeer.QuorumServer; -import com.yahoo.zookeeper.txn.TxnHeader; +import org.apache.jute.BinaryInputArchive; +import org.apache.jute.BinaryOutputArchive; +import org.apache.jute.InputArchive; +import org.apache.jute.OutputArchive; +import org.apache.jute.Record; +import org.apache.zookeeper.server.Request; +import org.apache.zookeeper.server.ServerCnxn; +import org.apache.zookeeper.server.ZooKeeperServer; +import org.apache.zookeeper.server.ZooTrace; +import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer; +import org.apache.zookeeper.txn.TxnHeader; public class Follower { private static final Logger LOG = Logger.getLogger(Follower.class); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerHandler.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerHandler.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerHandler.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerHandler.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -29,14 +29,14 @@ import org.apache.log4j.Logger; -import com.yahoo.jute.BinaryInputArchive; -import com.yahoo.jute.BinaryOutputArchive; -import com.yahoo.jute.Record; -import com.yahoo.zookeeper.ZooDefs.OpCode; -import com.yahoo.zookeeper.server.ZooKeeperServer; -import com.yahoo.zookeeper.server.ZooTrace; -import com.yahoo.zookeeper.server.quorum.Leader.Proposal; -import com.yahoo.zookeeper.txn.TxnHeader; +import org.apache.jute.BinaryInputArchive; +import org.apache.jute.BinaryOutputArchive; +import org.apache.jute.Record; +import org.apache.zookeeper.ZooDefs.OpCode; +import org.apache.zookeeper.server.ZooKeeperServer; +import org.apache.zookeeper.server.ZooTrace; +import org.apache.zookeeper.server.quorum.Leader.Proposal; +import org.apache.zookeeper.txn.TxnHeader; /** * There will be an instance of this class created by the Leader for each Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java Tue Jun 24 11:20:47 2008 @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.util.concurrent.LinkedBlockingQueue; import org.apache.log4j.Logger; -import com.yahoo.zookeeper.ZooDefs.OpCode; -import com.yahoo.zookeeper.server.RequestProcessor; -import com.yahoo.zookeeper.server.Request; -import com.yahoo.zookeeper.server.ZooTrace; +import org.apache.zookeeper.ZooDefs.OpCode; +import org.apache.zookeeper.server.RequestProcessor; +import org.apache.zookeeper.server.Request; +import org.apache.zookeeper.server.ZooTrace; /** * This RequestProcessor forwards any requests that modify the state of the Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerSessionTracker.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerSessionTracker.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerSessionTracker.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerSessionTracker.java Tue Jun 24 11:20:47 2008 @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; -import com.yahoo.zookeeper.server.SessionTracker; -import com.yahoo.zookeeper.server.SessionTrackerImpl; +import org.apache.zookeeper.server.SessionTracker; +import org.apache.zookeeper.server.SessionTrackerImpl; /** * This is really just a shell of a SessionTracker that tracks session activity Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.io.File; import java.io.IOException; @@ -23,14 +23,14 @@ import org.apache.log4j.Logger; -import com.yahoo.jute.Record; -import com.yahoo.zookeeper.server.FinalRequestProcessor; -import com.yahoo.zookeeper.server.Request; -import com.yahoo.zookeeper.server.RequestProcessor; -import com.yahoo.zookeeper.server.ServerCnxn; -import com.yahoo.zookeeper.server.SyncRequestProcessor; -import com.yahoo.zookeeper.server.ZooKeeperServer; -import com.yahoo.zookeeper.txn.TxnHeader; +import org.apache.jute.Record; +import org.apache.zookeeper.server.FinalRequestProcessor; +import org.apache.zookeeper.server.Request; +import org.apache.zookeeper.server.RequestProcessor; +import org.apache.zookeeper.server.ServerCnxn; +import org.apache.zookeeper.server.SyncRequestProcessor; +import org.apache.zookeeper.server.ZooKeeperServer; +import org.apache.zookeeper.txn.TxnHeader; /** * Just like the standard ZooKeeperServer. We just replace the request Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -29,10 +29,10 @@ import org.apache.log4j.Logger; -import com.yahoo.jute.BinaryOutputArchive; -import com.yahoo.zookeeper.server.FinalRequestProcessor; -import com.yahoo.zookeeper.server.Request; -import com.yahoo.zookeeper.server.RequestProcessor; +import org.apache.jute.BinaryOutputArchive; +import org.apache.zookeeper.server.FinalRequestProcessor; +import org.apache.zookeeper.server.Request; +import org.apache.zookeeper.server.RequestProcessor; /** * This class has the control logic for the Leader. @@ -413,7 +413,7 @@ /* * (non-Javadoc) * - * @see com.yahoo.zookeeper.server.RequestProcessor#processRequest(com.yahoo.zookeeper.server.Request) + * @see org.apache.zookeeper.server.RequestProcessor#processRequest(org.apache.zookeeper.server.Request) */ public void processRequest(Request request) { // request.addRQRec(">tobe"); @@ -428,7 +428,7 @@ /* * (non-Javadoc) * - * @see com.yahoo.zookeeper.server.RequestProcessor#shutdown() + * @see org.apache.zookeeper.server.RequestProcessor#shutdown() */ public void shutdown() { next.shutdown(); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.io.IOException; import java.net.DatagramPacket; @@ -29,9 +29,9 @@ import org.apache.log4j.Logger; -import com.yahoo.zookeeper.server.quorum.Vote; -import com.yahoo.zookeeper.server.quorum.QuorumPeer.QuorumServer; -import com.yahoo.zookeeper.server.quorum.QuorumPeer.ServerState; +import org.apache.zookeeper.server.quorum.Vote; +import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer; +import org.apache.zookeeper.server.quorum.QuorumPeer.ServerState; public class LeaderElection implements Election { private static final Logger LOG = Logger.getLogger(LeaderElection.class); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java Tue Jun 24 11:20:47 2008 @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.io.File; import java.io.IOException; -import com.yahoo.zookeeper.server.FinalRequestProcessor; -import com.yahoo.zookeeper.server.PrepRequestProcessor; -import com.yahoo.zookeeper.server.RequestProcessor; -import com.yahoo.zookeeper.server.SessionTrackerImpl; -import com.yahoo.zookeeper.server.ZooKeeperServer; +import org.apache.zookeeper.server.FinalRequestProcessor; +import org.apache.zookeeper.server.PrepRequestProcessor; +import org.apache.zookeeper.server.RequestProcessor; +import org.apache.zookeeper.server.SessionTrackerImpl; +import org.apache.zookeeper.server.ZooKeeperServer; /** * Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java Tue Jun 24 11:20:47 2008 @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; -import com.yahoo.zookeeper.ZooDefs; -import com.yahoo.zookeeper.server.Request; -import com.yahoo.zookeeper.server.RequestProcessor; -import com.yahoo.zookeeper.server.SyncRequestProcessor; +import org.apache.zookeeper.ZooDefs; +import org.apache.zookeeper.server.Request; +import org.apache.zookeeper.server.RequestProcessor; +import org.apache.zookeeper.server.SyncRequestProcessor; /** * This RequestProcessor simply forwards requests to an AckRequestProcessor and Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.io.IOException; import java.net.InetAddress;