Updated code/build to support the new package prefix of org.apache.zookeeper. See ZOOKEEPER-45

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

README.txt

@@ -11,7 +11,7 @@ Starting the server:
 
 2) start the server with the following comand line:
 
-java -cp zookeeper-dev.jar:java/lib/log4j-1.2.15.jar com.yahoo.zookeeper.server.quorum.QuorumPeer conf/zoo.cfg
+java -cp zookeeper-dev.jar:java/lib/log4j-1.2.15.jar org.apache.zookeeper.server.quorum.QuorumPeer conf/zoo.cfg
 
 Notice that the server is picking up the log4j.properties file from the conf directory (default).
 
@@ -21,7 +21,7 @@ Starting a client shell
 
 1) run the following command
 
-java -cp zookeeper-dev.jar:java/lib/log4j-1.2.15.jar com.yahoo.zookeeper.ZooKeeper <server>:<port>
+java -cp zookeeper-dev.jar:java/lib/log4j-1.2.15.jar org.apache.zookeeper.ZooKeeper <server>:<port>
 
 where server and port correspond to the ZooKeeper configuration.
 

bin/zkCleanup.sh

@@ -18,4 +18,4 @@ eval `grep -e "^dataDir=" $ZOOCFG`
 
 java "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
      -cp $CLASSPATH $JVMFLAGS \
-     com.yahoo.zookeeper.server.PurgeTxnLog $dataDir
+     org.apache.zookeeper.server.PurgeTxnLog $dataDir

bin/zkCli.sh

@@ -18,4 +18,4 @@ eval `grep -e "^dataDir=" $ZOOCFG`
 
 java "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
      -cp $CLASSPATH $JVMFLAGS \
-     com.yahoo.zookeeper.ZooKeeper $@
+     org.apache.zookeeper.ZooKeeper $@

bin/zkServer.sh

@@ -14,7 +14,7 @@ case $1 in
 start) 
     echo -n "Starting zookeeper ... "
     java  "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
-    -cp $CLASSPATH $JVMFLAGS com.yahoo.zookeeper.server.quorum.QuorumPeer $ZOOCFG &
+    -cp $CLASSPATH $JVMFLAGS org.apache.zookeeper.server.quorum.QuorumPeer $ZOOCFG &
     echo STARTED
     ;;
 stop) 

build.xml

@@ -1,42 +1,62 @@
+<?xml version="1.0"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
 <project name="ZooKeeper" default="jar">
 
     <property name="Name" value="ZooKeeper" />
     <property name="name" value="zookeeper" />
     
-    <property name="version" value="2.2.0" />
+    <property name="version" value="3.0.0" />
     <property name="revision.dir" value="${basedir}/.revision" />
     <property name="revision.properties" value="revision.properties" />
-    <property file="${basedir}/java/${revision.properties}" />
+    <property file="${basedir}/src/java/${revision.properties}" />
     
     <!-- Target JDK version to build for. Certain zookeeper features -->
     <!-- (for example, JMX) are only supported on JDK 1.6            -->
     <property name="target.jdk" value="${ant.java.version}" />
 
-    <property name="src.dir" value="${basedir}/java/src" />
-    <property name="jmx.src.dir" value="${basedir}/java/jmx" />
-    <property name="lib.dir" value="${basedir}/java/lib" />
+    <property name="src.dir" value="${basedir}/src" />
+    <property name="java.src.dir" value="${src.dir}/java/main" />
+    <property name="jmx.src.dir" value="${src.dir}/java/jmx" />
+    <property name="lib.dir" value="${src.dir}/java/lib" />
     <property name="build.dir" value="${basedir}/build" />
     <property name="distribution" value="${basedir}/distribution" />
-    <property name="src_generated.dir" value="${basedir}/java/generated" />
-    <property name="csrc_generated.dir" value="${basedir}/c/generated" />
+    <property name="src_generated.dir" value="${src.dir}/java/generated" />
+    <property name="csrc_generated.dir" value="${src.dir}/c/generated" />
     <property name="build.classes" value="${build.dir}/classes" />
     <property name="jar.name" value="zookeeper-dev.jar" />
 
-    <property name="jute.file" value="${basedir}/zookeeper.jute" />
+    <property name="jute.file" value="${src.dir}/zookeeper.jute" />
 
     <property name="build.testclasses" value="${build.dir}/testclasses"/>
     <property name="test.build.dir" value="${build.dir}/test" />
-    <property name="test.src.dir" value="${basedir}/test"/>
+    <property name="test.src.dir" value="${src.dir}/java/test"/>
     <property name="test.log.dir" value="${test.build.dir}/logs" />
     <property name="test.tmp.dir" value="${test.build.dir}/tmp" />
     <property name="test.output" value="no" />
     <property name="test.timeout" value="900000" />
     <property name="test.junit.output.format" value="plain" />
-    <property name="config.dir" value="${basedir}/test/config" />
+    <property name="config.dir" value="${src.dir}/java/test/config" />
     <property name="test.junit.maxmem" value="512m" />
     <property name="conf.dir" value="${basedir}/conf"/>
     <property name="javadoc.link.java" value="http://java.sun.com/j2se/${target.jdk}/docs/api/" />
-    <property name="javadoc.packages" value="com.yahoo.*" />
+    <property name="javadoc.packages" value="org.apache.*" />
     <property name="build.docs" value="${build.dir}/docs" />
     <property name="build.javadoc" value="${build.docs}/api" />
 
@@ -72,8 +92,8 @@
     </target>
     
     <target name="jute" depends="init">
-        <javac srcdir="${src.dir}" destdir="${build.classes}" target="${target.jdk}" 
-            includes="com/yahoo/jute/**" debug="on" />
+        <javac srcdir="${java.src.dir}" destdir="${build.classes}" target="${target.jdk}" 
+            includes="org/apache/jute/**" debug="on" />
     </target>
 
     <target name="compile_jute_uptodate">
@@ -85,7 +105,7 @@
     <target name="compile_jute" depends="jute,compile_jute_uptodate" unless="juteBuild.notRequired">
         <mkdir dir="${src_generated.dir}" />
         <mkdir dir="${csrc_generated.dir}" />
-        <java classname="com.yahoo.jute.compiler.generated.Rcc" fork="true" dir="${src_generated.dir}">
+        <java classname="org.apache.jute.compiler.generated.Rcc" fork="true" dir="${src_generated.dir}">
             <arg value="-l" />
             <arg value="java" />
             <arg value="../../zookeeper.jute" /> 
@@ -94,7 +114,7 @@
             </classpath>
         </java>
         
-        <java classname="com.yahoo.jute.compiler.generated.Rcc" fork="true" dir="${csrc_generated.dir}">
+        <java classname="org.apache.jute.compiler.generated.Rcc" fork="true" dir="${csrc_generated.dir}">
             <arg value="-l" />
             <arg value="c" />
             <arg value="../../zookeeper.jute" />
@@ -107,13 +127,13 @@
     </target>
 
     <target name="ver-gen" depends="init">
-        <javac srcdir="${src.dir}" destdir="${build.classes}" target="${target.jdk}" 
-            includes="com/yahoo/zookeeper/version/util/**" debug="on" />
+        <javac srcdir="${java.src.dir}" destdir="${build.classes}" target="${target.jdk}" 
+            includes="org/apache/zookeeper/version/util/**" debug="on" />
     </target>
     
     <target name="svn-revision" unless="lastRevision">
         <svn>
-            <status path="${basedir}/java" lastChangedRevisionProperty="lastRevision" />
+            <status path="${java.src.dir}/java" lastChangedRevisionProperty="lastRevision" />
         </svn>
         <mkdir dir="${revision.dir}" />
         <echo file="${revision.dir}/${revision.properties}" 
@@ -122,10 +142,11 @@
     
     <target name="version-info" depends="ver-gen,svn-revision">
         <mkdir dir="${src_generated.dir}" />
-        <java classname="com.yahoo.zookeeper.version.util.VerGen" fork="true" 
+        <java classname="org.apache.zookeeper.version.util.VerGen" fork="true" 
                 dir="${src_generated.dir}">
             <arg value="${version}" />
-            <arg value="${lastRevision}" />
+            <!--PDH fixme - <arg value="${lastRevision}" />-->
+            <arg value="1" />
             <arg value="${build.time}" />
             <classpath>
                 <pathelement path="${build.classes}" />
@@ -149,12 +170,12 @@
    </target>
     
     <target name="compile-main" depends="build-generated">
-        <javac srcdir="${src.dir}" destdir="${build.classes}" 
+        <javac srcdir="${java.src.dir}" destdir="${build.classes}" 
                target="${target.jdk}" debug="on">
             <classpath refid="project.classpath"/>
         </javac>
         <copy todir="${build.classes}">
-            <fileset dir="${src.dir}"/>
+            <fileset dir="${java.src.dir}"/>
             <fileset dir="${src_generated.dir}"/>
         </copy>
     </target>
@@ -185,10 +206,10 @@
     <!-- ====================================================== -->
     <target name="javadoc" depends="jar">
         <mkdir dir="${build.javadoc}" />
-        <javadoc packagenames="com.yahoo.*" destdir="${build.javadoc}" author="true" version="true" 
+        <javadoc packagenames="org.apache.*" destdir="${build.javadoc}" author="true" version="true" 
                 use="true" windowtitle="${Name} ${version} API" doctitle="${Name} ${version} API" 
-                bottom="Copyright &amp;copy; ${year} Yahoo Inc.">
-            <packageset dir="${src.dir}" />
+                bottom="Copyright &amp;copy; ${year} The Apache Software Foundation">
+            <packageset dir="${java.src.dir}" />
             <link href="${javadoc.link.java}" />
         </javadoc>
     </target>
@@ -197,7 +218,7 @@
     <!-- Make zookeeper.jar                                     -->
     <!-- ====================================================== -->
     <target name="jar" depends="compile">
-        <java classname="com.yahoo.zookeeper.Version" fork="true" outputproperty="revision" failonerror="true">
+        <java classname="org.apache.zookeeper.Version" fork="true" outputproperty="revision" failonerror="true">
             <arg value="--revision" />
             <classpath>
                 <pathelement path="${build.classes}" />
@@ -208,13 +229,13 @@
             <fileset file="LICENSE" />
             <fileset dir="${build.classes}" excludes="**/.generated"/>
             <manifest>
-                <attribute name="Main-Class" value="com.yahoo.zookeeper.server.quorum.QuorumPeer" />
+                <attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeer" />
                 <attribute name="Built-By" value="${user.name}"/>
                 <attribute name="Built-At" value="${build.time}"/>
                 <attribute name="Built-On" value="${host.name}" />
-                <attribute name="Implementation-Title" value="com.yahoo.zookeeper"/>
+                <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
                 <attribute name="Implementation-Version" value="${revision}"/> 
-                <attribute name="Implementation-Vendor" value="Yahoo! Inc."/>
+                <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
             </manifest>
         </jar>
     </target>
@@ -351,7 +372,7 @@
         <mkdir dir="${findbugs.out.dir}" />
         <findbugs home="${findbugs.home}" output="xml:withMessages" excludeFilter="${findbugs.exclude.file}" 
                 outputFile="${findbugs.report.xmlfile}" effort="max" jvmargs="-Xmx512M">
-            <sourcePath path="${src.dir}" />
+            <sourcePath path="${java.src.dir}" />
             <class location="${basedir}/${jar.name}" />
         </findbugs>
         <xslt style="${findbugs.home}/src/xsl/default.xsl" in="${findbugs.report.xmlfile}" 
@@ -378,7 +399,7 @@
     <target name="cobertura-instrument" depends="compile-test">
         <cobertura-instrument todir="${build.dir}/cobertura">
             <fileset dir="${build.classes}">
-                <include name="com/yahoo/zookeeper/**/*.class"/>
+                <include name="org/apache/zookeeper/**/*.class"/>
             </fileset>
         </cobertura-instrument>
     </target>
@@ -421,7 +442,7 @@
     <target name="cobertura-report" depends="cobertura-test">
         <cobertura-report format="${test.cobertura.output.format}"
                           destdir="${coveragereport.dir}" > 
-            <fileset dir="${src.dir}">
+            <fileset dir="${java.src.dir}">
                 <include name="**/*.java" />
             </fileset>
             <fileset dir="${src_generated.dir}">

src/java/jmx/org/apache/zookeeper/jmx/CommonNames.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx;
+package org.apache.zookeeper.jmx;
 
 /**
  * A bunch of constants.
  * TODO: will get rid of it eventually.
  */
 public class CommonNames {
-    public static final String DOMAIN="com.yahoo.ZookeeperService";
+    public static final String DOMAIN="org.apache.ZookeeperService";
     public static final String DATA_TREE_KEY="DataTree";
     public static final String STANDALONE_SERVER_KEY="StandaloneServer";
 }

src/java/jmx/org/apache/zookeeper/jmx/MBeanRegistry.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx;
+package org.apache.zookeeper.jmx;
 
 import java.lang.management.ManagementFactory;
 import java.util.Map;

src/java/jmx/org/apache/zookeeper/jmx/ZKMBeanInfo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx;
+package org.apache.zookeeper.jmx;
 
 /**
  * Zookeeper MBean info interface. MBeanRegistry uses the interface to generate

src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionBean.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server;
+package org.apache.zookeeper.jmx.server;
 
 import java.util.Arrays;
 import java.util.Date;
 
 import org.apache.log4j.Logger;
 
-import com.yahoo.zookeeper.jmx.MBeanRegistry;
-import com.yahoo.zookeeper.jmx.ZKMBeanInfo;
-import com.yahoo.zookeeper.server.ServerCnxn;
-import com.yahoo.zookeeper.server.ZooKeeperServer;
+import org.apache.zookeeper.jmx.MBeanRegistry;
+import org.apache.zookeeper.jmx.ZKMBeanInfo;
+import org.apache.zookeeper.server.ServerCnxn;
+import org.apache.zookeeper.server.ZooKeeperServer;
 
 /**
  * Implementation of connection MBean interface.

src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionMXBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server;
+package org.apache.zookeeper.jmx.server;
 
 /**
  * This MBean represents a client connection.

src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeBean.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server;
+package org.apache.zookeeper.jmx.server;
 
 import java.io.ByteArrayOutputStream;
 
 import org.apache.log4j.Logger;
 
-import com.yahoo.jute.BinaryOutputArchive;
-import com.yahoo.zookeeper.jmx.ZKMBeanInfo;
+import org.apache.jute.BinaryOutputArchive;
+import org.apache.zookeeper.jmx.ZKMBeanInfo;
 
 /**
  * This class implements the data tree MBean.
@@ -29,12 +29,12 @@ import com.yahoo.zookeeper.jmx.ZKMBeanInfo;
 public class DataTreeBean implements DataTreeMXBean, ZKMBeanInfo {
     private static final Logger LOG = Logger.getLogger(DataTreeBean.class);
 
-    com.yahoo.zookeeper.server.DataTree dataTree;
+    org.apache.zookeeper.server.DataTree dataTree;
     
     public DataTreeBean(){
     }
 
-    public DataTreeBean(com.yahoo.zookeeper.server.DataTree dataTree){
+    public DataTreeBean(org.apache.zookeeper.server.DataTree dataTree){
         this.dataTree=dataTree;
     }
     
@@ -43,7 +43,7 @@ public class DataTreeBean implements DataTreeMXBean, ZKMBeanInfo {
     }
 
     /* (non-Javadoc)
-     * @see com.yahoo.zookeeper.jmx.server.DataTreeMBean#getDataSize()
+     * @see org.apache.zookeeper.jmx.server.DataTreeMBean#getDataSize()
      */
     //TODO: it's useful info but can be expensive to get
     public long getDataSize() {
@@ -61,14 +61,14 @@ public class DataTreeBean implements DataTreeMXBean, ZKMBeanInfo {
     }
 
     /* (non-Javadoc)
-     * @see com.yahoo.zookeeper.jmx.server.DataTreeMBean#getEphemeralCount()
+     * @see org.apache.zookeeper.jmx.server.DataTreeMBean#getEphemeralCount()
      */
     public int getEphemeralCount() {
         return dataTree.getSessions().size();
     }
 
     /* (non-Javadoc)
-     * @see com.yahoo.zookeeper.jmx.server.DataTreeMBean#getWatchCount()
+     * @see org.apache.zookeeper.jmx.server.DataTreeMBean#getWatchCount()
      */
     public int getWatchCount() {
         return dataTree.getWatchCount();

src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeMXBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server;
+package org.apache.zookeeper.jmx.server;
 
 /**
  * Zookeeper data tree MBean.

src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerBean.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server;
+package org.apache.zookeeper.jmx.server;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Date;
 
-import com.yahoo.zookeeper.Version;
-import com.yahoo.zookeeper.jmx.ZKMBeanInfo;
-import com.yahoo.zookeeper.server.ServerConfig;
-import com.yahoo.zookeeper.server.ServerStats;
+import org.apache.zookeeper.Version;
+import org.apache.zookeeper.jmx.ZKMBeanInfo;
+import org.apache.zookeeper.server.ServerConfig;
+import org.apache.zookeeper.server.ServerStats;
 
 /**
  * This class implements the zookeeper server MBean interface.

src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerMXBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server;
+package org.apache.zookeeper.jmx.server;
 
 /**
  * Zookeeper server MBean.

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.jmx.server.quorum;
 
 /**
  * Follower MBean inteface implementation

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerMXBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.jmx.server.quorum;
 
 /**
  * Follower MBean

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.jmx.server.quorum;
 
 /**
  * Leader MBean interface implementation.

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionBean.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.jmx.server.quorum;
 
 import java.util.Date;
 
-import com.yahoo.zookeeper.jmx.ZKMBeanInfo;
+import org.apache.zookeeper.jmx.ZKMBeanInfo;
 
 /**
  * Leader election MBean interface implementation

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionMXBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.jmx.server.quorum;
 
 /**
  * Leader election protocol MBean. 

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderMXBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.jmx.server.quorum;
 
 /**
  * Leader MBean.

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerBean.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.jmx.server.quorum;
 
-import com.yahoo.zookeeper.jmx.server.ZooKeeperServerBean;
-import com.yahoo.zookeeper.server.quorum.QuorumPeer;
+import org.apache.zookeeper.jmx.server.ZooKeeperServerBean;
+import org.apache.zookeeper.server.quorum.QuorumPeer;
 
 /**
  * Implementation of the local peer MBean interface.

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerMXBean.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.jmx.server.quorum;
 
-import com.yahoo.zookeeper.jmx.server.ZooKeeperServerMXBean;
+import org.apache.zookeeper.jmx.server.ZooKeeperServerMXBean;
 
 /**
  * A local zookeeper server MBean interface. Unlike the remote peer, the local

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumBean.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.jmx.server.quorum;
 
-import com.yahoo.zookeeper.jmx.ZKMBeanInfo;
-import com.yahoo.zookeeper.server.quorum.QuorumPeer;
+import org.apache.zookeeper.jmx.ZKMBeanInfo;
+import org.apache.zookeeper.server.quorum.QuorumPeer;
 
 public class QuorumBean implements QuorumMXBean,ZKMBeanInfo {
 

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumMXBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.jmx.server.quorum;
 
 /**
  * An MBean representing a zookeeper cluster nodes (aka quorum peers)

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerBean.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.jmx.server.quorum;
 
-import com.yahoo.zookeeper.jmx.ZKMBeanInfo;
-import com.yahoo.zookeeper.server.quorum.QuorumPeer;
+import org.apache.zookeeper.jmx.ZKMBeanInfo;
+import org.apache.zookeeper.server.quorum.QuorumPeer;
 
 /**
  * A remote peer bean only provides limited information about the remote peer,

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerMXBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.jmx.server.quorum;
 
 /**
  * A proxy for a remote quorum peer.

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerBean.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.jmx.server.quorum;
 
 import java.util.Date;
 
-import com.yahoo.zookeeper.jmx.ZKMBeanInfo;
+import org.apache.zookeeper.jmx.ZKMBeanInfo;
 
 /**
  * An abstract base class for the leader and follower MBeans.

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerMXBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.jmx.server.quorum;
 
 /**
  * A quorum server MBean.

src/java/jmx/org/apache/zookeeper/server/ManagedZooKeeperServer.java

@@ -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.IOException;
@@ -22,16 +22,16 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.log4j.Logger;
 
-import com.yahoo.zookeeper.jmx.MBeanRegistry;
-import com.yahoo.zookeeper.jmx.server.ConnectionBean;
-import com.yahoo.zookeeper.jmx.server.DataTreeBean;
-import com.yahoo.zookeeper.jmx.server.ZooKeeperServerBean;
-import com.yahoo.zookeeper.server.util.ConnectionObserver;
-import com.yahoo.zookeeper.server.util.ObserverManager;
-import com.yahoo.zookeeper.server.util.ServerObserver;
-import com.yahoo.zookeeper.server.util.ZooKeeperObserverManager;
+import org.apache.zookeeper.jmx.MBeanRegistry;
+import org.apache.zookeeper.jmx.server.ConnectionBean;
+import org.apache.zookeeper.jmx.server.DataTreeBean;
+import org.apache.zookeeper.jmx.server.ZooKeeperServerBean;
+import org.apache.zookeeper.server.util.ConnectionObserver;
+import org.apache.zookeeper.server.util.ObserverManager;
+import org.apache.zookeeper.server.util.ServerObserver;
+import org.apache.zookeeper.server.util.ZooKeeperObserverManager;
 
-import static com.yahoo.zookeeper.server.ServerConfig.getClientPort;
+import static org.apache.zookeeper.server.ServerConfig.getClientPort;
 
 /**
  * This class launches a standalone zookeeper server with JMX support

src/java/jmx/org/apache/zookeeper/server/ObservableDataTree.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.server;
+package org.apache.zookeeper.server;
 
 import java.util.ArrayList;
 
-import com.yahoo.zookeeper.KeeperException;
-import com.yahoo.zookeeper.data.ACL;
-import com.yahoo.zookeeper.data.Stat;
-import com.yahoo.zookeeper.server.util.DataTreeObserver;
-import com.yahoo.zookeeper.server.util.EventInfo;
-import com.yahoo.zookeeper.server.util.ObservableComponent;
-import com.yahoo.zookeeper.server.util.ObserverManager;
+import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.data.ACL;
+import org.apache.zookeeper.data.Stat;
+import org.apache.zookeeper.server.util.DataTreeObserver;
+import org.apache.zookeeper.server.util.EventInfo;
+import org.apache.zookeeper.server.util.ObservableComponent;
+import org.apache.zookeeper.server.util.ObserverManager;
 
 /**
  * An observable data tree notifies its observers about any data modification

src/java/jmx/org/apache/zookeeper/server/ObservableNIOServerCnxn.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.server;
+package org.apache.zookeeper.server;
 
 import java.io.IOException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
 
-import com.yahoo.zookeeper.server.util.ConnectionObserver;
-import com.yahoo.zookeeper.server.util.ObservableComponent;
-import com.yahoo.zookeeper.server.util.ObserverManager;
+import org.apache.zookeeper.server.util.ConnectionObserver;
+import org.apache.zookeeper.server.util.ObservableComponent;
+import org.apache.zookeeper.server.util.ObserverManager;
 
 /**
  * This class implements an observable server connection. It supports two

src/java/jmx/org/apache/zookeeper/server/ObservableZooKeeperServer.java

@@ -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.IOException;

src/java/jmx/org/apache/zookeeper/server/ZooKeeperObserverNotifier.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.server;
+package org.apache.zookeeper.server;
 
-import com.yahoo.zookeeper.server.util.ObservableComponent;
-import com.yahoo.zookeeper.server.util.ObserverManager;
-import com.yahoo.zookeeper.server.util.ServerObserver;
+import org.apache.zookeeper.server.util.ObservableComponent;
+import org.apache.zookeeper.server.util.ObserverManager;
+import org.apache.zookeeper.server.util.ServerObserver;
 
 /**
  * The class is responsible for triggering and dispatching of server life cycle events.

src/java/jmx/org/apache/zookeeper/server/quorum/ManagedQuorumPeer.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.server.quorum;
+package org.apache.zookeeper.server.quorum;
 
-import static com.yahoo.zookeeper.server.ServerConfig.getClientPort;
+import static org.apache.zookeeper.server.ServerConfig.getClientPort;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,28 +25,28 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.log4j.Logger;
 
-import com.yahoo.zookeeper.jmx.MBeanRegistry;
-import com.yahoo.zookeeper.jmx.ZKMBeanInfo;
-import com.yahoo.zookeeper.jmx.server.ConnectionBean;
-import com.yahoo.zookeeper.jmx.server.DataTreeBean;
-import com.yahoo.zookeeper.jmx.server.quorum.FollowerBean;
-import com.yahoo.zookeeper.jmx.server.quorum.LeaderBean;
-import com.yahoo.zookeeper.jmx.server.quorum.LeaderElectionBean;
-import com.yahoo.zookeeper.jmx.server.quorum.LocalPeerBean;
-import com.yahoo.zookeeper.jmx.server.quorum.QuorumBean;
-import com.yahoo.zookeeper.jmx.server.quorum.RemotePeerBean;
-import com.yahoo.zookeeper.jmx.server.quorum.ServerBean;
-import com.yahoo.zookeeper.server.ManagedZooKeeperServer;
-import com.yahoo.zookeeper.server.NIOServerCnxn;
-import com.yahoo.zookeeper.server.ObservableNIOServerCnxn;
-import com.yahoo.zookeeper.server.ServerCnxn;
-import com.yahoo.zookeeper.server.ZooKeeperServer;
-import com.yahoo.zookeeper.server.ZooTrace;
-import com.yahoo.zookeeper.server.util.ConnectionObserver;
-import com.yahoo.zookeeper.server.util.ObserverManager;
-import com.yahoo.zookeeper.server.util.QuorumPeerObserver;
-import com.yahoo.zookeeper.server.util.ServerObserver;
-import com.yahoo.zookeeper.server.util.ZooKeeperObserverManager;
+import org.apache.zookeeper.jmx.MBeanRegistry;
+import org.apache.zookeeper.jmx.ZKMBeanInfo;
+import org.apache.zookeeper.jmx.server.ConnectionBean;
+import org.apache.zookeeper.jmx.server.DataTreeBean;
+import org.apache.zookeeper.jmx.server.quorum.FollowerBean;
+import org.apache.zookeeper.jmx.server.quorum.LeaderBean;
+import org.apache.zookeeper.jmx.server.quorum.LeaderElectionBean;
+import org.apache.zookeeper.jmx.server.quorum.LocalPeerBean;
+import org.apache.zookeeper.jmx.server.quorum.QuorumBean;
+import org.apache.zookeeper.jmx.server.quorum.RemotePeerBean;
+import org.apache.zookeeper.jmx.server.quorum.ServerBean;
+import org.apache.zookeeper.server.ManagedZooKeeperServer;
+import org.apache.zookeeper.server.NIOServerCnxn;
+import org.apache.zookeeper.server.ObservableNIOServerCnxn;
+import org.apache.zookeeper.server.ServerCnxn;
+import org.apache.zookeeper.server.ZooKeeperServer;
+import org.apache.zookeeper.server.ZooTrace;
+import org.apache.zookeeper.server.util.ConnectionObserver;
+import org.apache.zookeeper.server.util.ObserverManager;
+import org.apache.zookeeper.server.util.QuorumPeerObserver;
+import org.apache.zookeeper.server.util.ServerObserver;
+import org.apache.zookeeper.server.util.ZooKeeperObserverManager;
 
 /**
  * This class launches a replicated zookeeper server with JMX support

src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollower.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.server.quorum;
+package org.apache.zookeeper.server.quorum;
 
-import com.yahoo.zookeeper.server.util.EventInfo;
-import com.yahoo.zookeeper.server.util.ObserverManager;
-import com.yahoo.zookeeper.server.util.QuorumPeerObserver;
+import org.apache.zookeeper.server.util.EventInfo;
+import org.apache.zookeeper.server.util.ObserverManager;
+import org.apache.zookeeper.server.util.QuorumPeerObserver;
 
 /**
  * This observable follower implementation notifies its registered observers

src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollowerZooKeeperServer.java

@@ -14,14 +14,14 @@
  * 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.ZooKeeperObserverNotifier;
-import com.yahoo.zookeeper.server.util.ObserverManager;
-import com.yahoo.zookeeper.server.util.ServerObserver;
+import org.apache.zookeeper.server.ZooKeeperObserverNotifier;
+import org.apache.zookeeper.server.util.ObserverManager;
+import org.apache.zookeeper.server.util.ServerObserver;
 
 /**
  * This observable follower server class notifies the registered observers

src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeader.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.server.quorum;
+package org.apache.zookeeper.server.quorum;
 
 import java.io.IOException;
 
-import com.yahoo.zookeeper.server.util.EventInfo;
-import com.yahoo.zookeeper.server.util.ObserverManager;
-import com.yahoo.zookeeper.server.util.QuorumPeerObserver;
+import org.apache.zookeeper.server.util.EventInfo;
+import org.apache.zookeeper.server.util.ObserverManager;
+import org.apache.zookeeper.server.util.QuorumPeerObserver;
 
 /**
  * This observable leader implementation notifies its registered observers

src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeaderZooKeeperServer.java

@@ -14,14 +14,14 @@
  * 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.ZooKeeperObserverNotifier;
-import com.yahoo.zookeeper.server.util.ObserverManager;
-import com.yahoo.zookeeper.server.util.ServerObserver;
+import org.apache.zookeeper.server.ZooKeeperObserverNotifier;
+import org.apache.zookeeper.server.util.ObserverManager;
+import org.apache.zookeeper.server.util.ServerObserver;
 
 /**
  * This observable leader server class notifies the registered observers

src/java/jmx/org/apache/zookeeper/server/quorum/ObservableQuorumPeer.java

@@ -14,18 +14,18 @@
  * 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 java.util.ArrayList;
 
-import com.yahoo.zookeeper.server.NIOServerCnxn;
-import com.yahoo.zookeeper.server.ZooKeeperServer;
-import com.yahoo.zookeeper.server.util.EventInfo;
-import com.yahoo.zookeeper.server.util.ObservableComponent;
-import com.yahoo.zookeeper.server.util.ObserverManager;
-import com.yahoo.zookeeper.server.util.QuorumPeerObserver;
+import org.apache.zookeeper.server.NIOServerCnxn;
+import org.apache.zookeeper.server.ZooKeeperServer;
+import org.apache.zookeeper.server.util.EventInfo;
+import org.apache.zookeeper.server.util.ObservableComponent;
+import org.apache.zookeeper.server.util.ObserverManager;
+import org.apache.zookeeper.server.util.QuorumPeerObserver;
 
 /**
  * The observable quorum peer sends notifications to all registered observers

src/java/jmx/org/apache/zookeeper/server/util/ConnectionObserver.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.server.util;
+package org.apache.zookeeper.server.util;
 
-import com.yahoo.zookeeper.server.ServerCnxn;
+import org.apache.zookeeper.server.ServerCnxn;
 
 /**
  * Application must implement this interface and register its instance with

src/java/jmx/org/apache/zookeeper/server/util/DataTreeObserver.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.server.util;
+package org.apache.zookeeper.server.util;
 
-import com.yahoo.zookeeper.server.DataNode;
-import com.yahoo.zookeeper.server.DataTree;
+import org.apache.zookeeper.server.DataNode;
+import org.apache.zookeeper.server.DataTree;
 
 /**
  * Application must implement this interface and register its instance with

src/java/jmx/org/apache/zookeeper/server/util/EventInfo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.server.util;
+package org.apache.zookeeper.server.util;
 
 /**
  * A helper interface used to make event generation and dispatching more 

src/java/jmx/org/apache/zookeeper/server/util/ObservableComponent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.server.util;
+package org.apache.zookeeper.server.util;
 
 /**
  * An observable component is responsible for decoding and dispatching its events

src/java/jmx/org/apache/zookeeper/server/util/ObserverManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.server.util;
+package org.apache.zookeeper.server.util;
 
 import java.util.Collections;
 import java.util.Map;

src/java/jmx/org/apache/zookeeper/server/util/QuorumPeerObserver.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.server.util;
+package org.apache.zookeeper.server.util;
 
-import com.yahoo.zookeeper.server.quorum.Follower;
-import com.yahoo.zookeeper.server.quorum.Leader;
-import com.yahoo.zookeeper.server.quorum.QuorumPeer;
+import org.apache.zookeeper.server.quorum.Follower;
+import org.apache.zookeeper.server.quorum.Leader;
+import org.apache.zookeeper.server.quorum.QuorumPeer;
 
 /**
 * Application must implement this interface and register its instance with

src/java/jmx/org/apache/zookeeper/server/util/ServerObserver.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.server.util;
+package org.apache.zookeeper.server.util;
 
-import com.yahoo.zookeeper.server.ZooKeeperServer;
+import org.apache.zookeeper.server.ZooKeeperServer;
 
 /**
  * Application must implement this interface and register its instance with

src/java/jmx/org/apache/zookeeper/server/util/ZooKeeperObserverManager.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper.server.util;
+package org.apache.zookeeper.server.util;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import com.yahoo.zookeeper.server.DataTree;
-import com.yahoo.zookeeper.server.ServerCnxn;
-import com.yahoo.zookeeper.server.ZooKeeperObserverNotifier;
-import com.yahoo.zookeeper.server.quorum.QuorumPeer;
+import org.apache.zookeeper.server.DataTree;
+import org.apache.zookeeper.server.ServerCnxn;
+import org.apache.zookeeper.server.ZooKeeperObserverNotifier;
+import org.apache.zookeeper.server.quorum.QuorumPeer;
 
 /**
  * Zookeeper specific implementation of ObserverManager. It implements a mapping

src/java/main/org/apache/jute/BinaryInputArchive.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute;
+package org.apache.jute;
 
 import java.io.DataInput;
 import java.io.IOException;

src/java/main/org/apache/jute/BinaryOutputArchive.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute;
+package org.apache.jute;
 
 import java.io.IOException;
 import java.io.ByteArrayOutputStream;

src/java/main/org/apache/jute/CsvInputArchive.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute;
+package org.apache.jute;
 
 import java.io.InputStreamReader;
 import java.io.InputStream;

src/java/main/org/apache/jute/CsvOutputArchive.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute;
+package org.apache.jute;
 
 import java.io.IOException;
 import java.util.List;

src/java/main/org/apache/jute/Index.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute;
+package org.apache.jute;
 
 /**
  * Interface that acts as an iterator for deserializing maps.

src/java/main/org/apache/jute/InputArchive.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute;
+package org.apache.jute;
 
 import java.io.IOException;
 import java.io.ByteArrayOutputStream;

src/java/main/org/apache/jute/OutputArchive.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute;
+package org.apache.jute;
 
 import java.io.IOException;
 import java.util.List;

src/java/main/org/apache/jute/Record.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute;
+package org.apache.jute;
 
 import java.io.IOException;
 

src/java/main/org/apache/jute/RecordReader.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute;
+package org.apache.jute;
 
 import java.io.IOException;
 import java.io.InputStream;

src/java/main/org/apache/jute/RecordWriter.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute;
+package org.apache.jute;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/java/main/org/apache/jute/Utils.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute;
+package org.apache.jute;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInput;

src/java/main/org/apache/jute/XmlInputArchive.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute;
+package org.apache.jute;
 
 import java.io.InputStream;
 import java.io.IOException;

src/java/main/org/apache/jute/XmlOutputArchive.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute;
+package org.apache.jute;
 
 import java.io.IOException;
 import java.util.List;

src/java/main/org/apache/jute/compiler/CGenerator.java

@@ -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;

src/java/main/org/apache/jute/compiler/CppGenerator.java

@@ -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;

src/java/main/org/apache/jute/compiler/JBoolean.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute.compiler;
+package org.apache.jute.compiler;
 
 /**
  *

src/java/main/org/apache/jute/compiler/JBuffer.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute.compiler;
+package org.apache.jute.compiler;
 
 /**
  *
@@ -60,7 +60,7 @@ public class JBuffer extends JCompType {
       sb.append("    {\n");
       sb.append("      byte[] my = "+fname+";\n");
       sb.append("      byte[] ur = "+other+";\n");
-      sb.append("      ret = com.yahoo.jute.Utils.compareBytes(my,0,my.length,ur,0,ur.length);\n");
+      sb.append("      ret = org.apache.jute.Utils.compareBytes(my,0,my.length,ur,0,ur.length);\n");
       sb.append("    }\n");
       return sb.toString();
     }
@@ -73,7 +73,7 @@ public class JBuffer extends JCompType {
     }
     
     public String genJavaEquals(String fname, String peer) {
-        return "    ret = com.yahoo.jute.Utils.bufEquals("+fname+","+peer+");\n";
+        return "    ret = org.apache.jute.Utils.bufEquals("+fname+","+peer+");\n";
     }
     
     public String genJavaHashCode(String fname) {
@@ -83,7 +83,7 @@ public class JBuffer extends JCompType {
     public String genJavaSlurpBytes(String b, String s, String l) {
       StringBuffer sb = new StringBuffer();
       sb.append("        {\n");
-      sb.append("           int i = com.yahoo.jute.Utils.readVInt("+b+", "+s+");\n");
+      sb.append("           int i = org.apache.jute.Utils.readVInt("+b+", "+s+");\n");
       sb.append("           int z = WritableUtils.getVIntSize(i);\n");
       sb.append("           "+s+" += z+i; "+l+" -= (z+i);\n");
       sb.append("        }\n");
@@ -93,12 +93,12 @@ public class JBuffer extends JCompType {
     public String genJavaCompareBytes() {
       StringBuffer sb = new StringBuffer();
       sb.append("        {\n");
-      sb.append("           int i1 = com.yahoo.jute.Utils.readVInt(b1, s1);\n");
-      sb.append("           int i2 = com.yahoo.jute.Utils.readVInt(b2, s2);\n");
+      sb.append("           int i1 = org.apache.jute.Utils.readVInt(b1, s1);\n");
+      sb.append("           int i2 = org.apache.jute.Utils.readVInt(b2, s2);\n");
       sb.append("           int z1 = WritableUtils.getVIntSize(i1);\n");
       sb.append("           int z2 = WritableUtils.getVIntSize(i2);\n");
       sb.append("           s1+=z1; s2+=z2; l1-=z1; l2-=z2;\n");
-      sb.append("           int r1 = com.yahoo.jute.Utils.compareBytes(b1,s1,l1,b2,s2,l2);\n");
+      sb.append("           int r1 = org.apache.jute.Utils.compareBytes(b1,s1,l1,b2,s2,l2);\n");
       sb.append("           if (r1 != 0) { return (r1<0)?-1:0; }\n");
       sb.append("           s1+=i1; s2+=i2; l1-=i1; l1-=i2;\n");
       sb.append("        }\n");

src/java/main/org/apache/jute/compiler/JByte.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute.compiler;
+package org.apache.jute.compiler;
 
 /**
  *

src/java/main/org/apache/jute/compiler/JCompType.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute.compiler;
+package org.apache.jute.compiler;
 
 /**
  * Abstract base class for all the "compound" types such as ustring,

src/java/main/org/apache/jute/compiler/JDouble.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute.compiler;
+package org.apache.jute.compiler;
 
 /**
  *

src/java/main/org/apache/jute/compiler/JField.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute.compiler;
+package org.apache.jute.compiler;
 
 /**
  *

src/java/main/org/apache/jute/compiler/JFile.java

@@ -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;

src/java/main/org/apache/jute/compiler/JFloat.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute.compiler;
+package org.apache.jute.compiler;
 
 /**
  *

src/java/main/org/apache/jute/compiler/JInt.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute.compiler;
+package org.apache.jute.compiler;
 
 /**
  *

src/java/main/org/apache/jute/compiler/JLong.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute.compiler;
+package org.apache.jute.compiler;
 
 /**
  *

src/java/main/org/apache/jute/compiler/JMap.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute.compiler;
+package org.apache.jute.compiler;
 
 /**
  *
@@ -60,7 +60,7 @@ public class JMap extends JCompType {
         }
         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));

src/java/main/org/apache/jute/compiler/JRecord.java

@@ -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 @@ public class JRecord extends JCompType {
         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();

src/java/main/org/apache/jute/compiler/JString.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute.compiler;
+package org.apache.jute.compiler;
 
 /**
  *

src/java/main/org/apache/jute/compiler/JType.java

@@ -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.

src/java/main/org/apache/jute/compiler/JVector.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute.compiler;
+package org.apache.jute.compiler;
 
 /**
  *

src/java/main/org/apache/jute/compiler/JavaGenerator.java

@@ -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;

src/java/main/org/apache/jute/compiler/generated/ParseException.java

@@ -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.

src/java/main/org/apache/jute/compiler/generated/Rcc.java

@@ -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;

src/java/main/org/apache/jute/compiler/generated/RccConstants.java

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.jute.compiler.generated;
+package org.apache.jute.compiler.generated;
 
 public interface RccConstants {
 

src/java/main/org/apache/jute/compiler/generated/RccTokenManager.java

@@ -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;

src/java/main/org/apache/jute/compiler/generated/SimpleCharStream.java

@@ -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

src/java/main/org/apache/jute/compiler/generated/Token.java

@@ -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.

src/java/main/org/apache/jute/compiler/generated/TokenMgrError.java

@@ -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
 {

src/java/main/org/apache/jute/compiler/generated/rcc.jj

@@ -21,9 +21,9 @@ PARSER_BEGIN(Rcc)
  * 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;

src/java/main/org/apache/zookeeper/AsyncCallback.java

@@ -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 {

src/java/main/org/apache/zookeeper/ClientCnxn.java

@@ -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 java.util.concurrent.LinkedBlockingQueue;
 
 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

src/java/main/org/apache/zookeeper/KeeperException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.yahoo.zookeeper;
+package org.apache.zookeeper;
 
 @SuppressWarnings("serial")
 public abstract class KeeperException extends Exception {

src/java/main/org/apache/zookeeper/ServerAdminClient.java

@@ -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 java.util.StringTokenizer;
 
 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 @@ public class ServerAdminClient {
 
     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]");
 
     }

src/java/main/org/apache/zookeeper/Version.java

@@ -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 class Version implements com.yahoo.zookeeper.version.Info{
 
     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);

src/java/main/org/apache/zookeeper/Watcher.java

@@ -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

src/java/main/org/apache/zookeeper/ZooDefs.java

@@ -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 {

src/java/main/org/apache/zookeeper/ZooKeeper.java

@@ -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 java.util.Set;
 
 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 @@ public class ZooKeeper {
      *                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> acl, int flags)
@@ -777,7 +777,7 @@ public class ZooKeeper {
      * @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> acl, int version)
             throws KeeperException, InterruptedException {

src/java/main/org/apache/zookeeper/server/ByteBufferInputStream.java

@@ -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;

src/java/main/org/apache/zookeeper/server/DataNode.java

@@ -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.

src/java/main/org/apache/zookeeper/server/DataTree.java

@@ -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 java.util.concurrent.ConcurrentHashMap;
 
 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 @@ public class DataTree {
         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 @@ public class DataTree {
     }
 
     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<String> list = ephemerals.remove(session);

src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java

@@ -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 java.util.List;
 
 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

src/java/main/org/apache/zookeeper/server/LogFormatter.java

@@ -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 java.util.Date;
 
 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);

src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java

@@ -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 java.util.concurrent.LinkedBlockingQueue;
 
 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 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
     /*
      * (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 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
     /*
      * (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 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
     /*
      * (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 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
     /*
      * (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 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
     /*
      * (non-Javadoc)
      *
-     * @see com.yahoo.zookeeper.server.ServerCnxnIface#getSessionId()
+     * @see org.apache.zookeeper.server.ServerCnxnIface#getSessionId()
      */
     public long getSessionId() {
         return sessionId;