zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject [16/51] [partial] zookeeper git commit: ZOOKEEPER-3032: MAVEN MIGRATION - move java server, client
Date Fri, 05 Oct 2018 12:26:09 GMT
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/bin/test-patch.sh
----------------------------------------------------------------------
diff --git a/src/java/test/bin/test-patch.sh b/src/java/test/bin/test-patch.sh
deleted file mode 100755
index c0b9853..0000000
--- a/src/java/test/bin/test-patch.sh
+++ /dev/null
@@ -1,649 +0,0 @@
-#!/usr/bin/env bash
-#   Licensed 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.
-
-
-#set -x
-
-### Setup some variables.  
-### GIT_COMMIT and BUILD_URL are set by Hudson if it is run by patch process
-### Read variables from properties file
-. `dirname $0`/test-patch.properties
-
-###############################################################################
-parseArgs() {
-  case "$1" in
-    HUDSON)
-      ### Set HUDSON to true to indicate that this script is being run by Hudson
-      HUDSON=true
-      if [[ $# != 15 ]] ; then
-        echo "ERROR: usage $0 HUDSON <PATCH_DIR> <PS_CMD> <WGET_CMD> <JIRACLI> <GIT_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <WORKSPACE_BASEDIR> <JIRA_PASSWD> <JAVA5_HOME> <CURL_CMD> <DEFECT> "
-        cleanupAndExit 0
-      fi
-      PATCH_DIR=$2
-      PS=$3
-      WGET=$4
-      JIRACLI=$5
-      GIT=$6
-      GREP=$7
-      PATCH=$8
-      FINDBUGS_HOME=$9
-      FORREST_HOME=${10}
-      BASEDIR=${11}
-      JIRA_PASSWD=${12}
-      JAVA5_HOME=${13}
-      CURL=${14}
-      defect=${15}
-		
-      ### Retrieve the defect number
-      if [ -z "$defect" ] ; then
-        echo "Could not determine the patch to test.  Exiting."
-        cleanupAndExit 0
-      fi
-
-      if [ ! -e "$PATCH_DIR" ] ; then
-        mkdir -p $PATCH_DIR 
-      fi
-
-      ;;
-    DEVELOPER)
-      ### Set HUDSON to false to indicate that this script is being run by a developer
-      HUDSON=false
-      if [[ $# != 10 ]] ; then
-        echo "ERROR: usage $0 DEVELOPER <PATCH_FILE> <SCRATCH_DIR> <GIT_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <WORKSPACE_BASEDIR> <JAVA5_HOME>"
-        cleanupAndExit 0
-      fi
-      ### PATCH_FILE contains the location of the patchfile
-      PATCH_FILE=$2 
-      if [[ ! -e "$PATCH_FILE" ]] ; then
-        echo "Unable to locate the patch file $PATCH_FILE"
-        cleanupAndExit 0
-      fi
-      PATCH_DIR=$3
-      ### Check if $PATCH_DIR exists. If it does not exist, create a new directory
-      if [[ ! -e "$PATCH_DIR" ]] ; then
-	mkdir "$PATCH_DIR"
-	if [[ $? == 0 ]] ; then 
-	  echo "$PATCH_DIR has been created"
-	else
-	  echo "Unable to create $PATCH_DIR"
-	  cleanupAndExit 0
-	fi
-      fi
-      GIT=$4
-      GREP=$5
-      PATCH=$6
-      FINDBUGS_HOME=$7
-      FORREST_HOME=$8
-      BASEDIR=$9
-      JAVA5_HOME=${10}
-      ### Obtain the patch filename to append it to the version number
-      defect=`basename $PATCH_FILE` 
-      ;;
-    *)
-      echo "ERROR: usage $0 HUDSON [args] | DEVELOPER [args]"
-      cleanupAndExit 0
-      ;;
-  esac
-}
-
-###############################################################################
-checkout () {
-  echo ""
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo "    Testing patch for ${defect}."
-  echo "======================================================================"
-  echo "======================================================================"
-  echo ""
-  echo ""
-  ### When run by a developer, if the workspace contains modifications, do not continue
-  # Ref http://stackoverflow.com/a/2659808 for details on checking dirty status
-  ${GIT} diff-index --quiet HEAD
-  if [[ $? -ne 0 ]] ; then
-    uncommitted=`${GIT} diff --name-only HEAD`
-    uncommitted="You have the following files with uncommitted changes:${NEWLINE}${uncommitted}"
-  fi
-  untracked="$(${GIT} ls-files --exclude-standard --others)" && test -z "${untracked}"
-  if [[ $? -ne 0 ]] ; then
-    untracked="You have untracked and unignored files:${NEWLINE}${untracked}"
-  fi
-
-  if [[ $HUDSON == "false" ]] ; then
-    if [[ $uncommitted || $untracked ]] ; then
-      echo "ERROR: can't run in a workspace that contains the following modifications"
-      echo ""
-      echo "${uncommitted}"
-      echo ""
-      echo "${untracked}"
-      cleanupAndExit 1
-    fi
-  else   
-    # I don't believe we need to do anything here - the jenkins job will
-    # cleanup the environment for us ("cleanup before checkout" action)
-    # on the precommit jenkins job
-    echo
-  fi
-  return $?
-}
-
-###############################################################################
-setup () {
-  ### Download latest patch file (ignoring .htm and .html) when run from patch process
-  if [[ $HUDSON == "true" ]] ; then
-    $WGET -q -O $PATCH_DIR/jira http://issues.apache.org/jira/browse/$defect
-    if [[ `$GREP -c 'Patch Available' $PATCH_DIR/jira` == 0 ]] ; then
-      echo "$defect is not \"Patch Available\".  Exiting."
-      cleanupAndExit 0
-    fi
-    relativePatchURL=`$GREP -o '"/jira/secure/attachment/[0-9]*/[^"]*' $PATCH_DIR/jira | $GREP -v -e 'htm[l]*$' | sort | tail -1 | $GREP -o '/jira/secure/attachment/[0-9]*/[^"]*'`
-    patchURL="http://issues.apache.org${relativePatchURL}"
-    patchNum=`echo $patchURL | $GREP -o '[0-9]*/' | $GREP -o '[0-9]*'`
-    echo "$defect patch is being downloaded at `date` from"
-    echo "$patchURL"
-    $WGET -q -O $PATCH_DIR/patch $patchURL
-    JIRA_COMMENT="Here are the results of testing the latest attachment 
-  $patchURL
-  against trunk revision ${GIT_COMMIT}."
-
-  ### Copy the patch file to $PATCH_DIR
-  else
-    cp $PATCH_FILE $PATCH_DIR/patch
-    if [[ $? == 0 ]] ; then
-      echo "Patch file $PATCH_FILE copied to $PATCH_DIR"
-    else
-      echo "Could not copy $PATCH_FILE to $PATCH_DIR"
-      cleanupAndExit 0
-    fi
-  fi
-  ### exit if warnings are NOT defined in the properties file
-  if [ -z "$OK_FINDBUGS_WARNINGS" ] || [[ -z "$OK_JAVADOC_WARNINGS" ]] || [[ -z $OK_RELEASEAUDIT_WARNINGS ]]; then
-    echo "Please define the following properties in test-patch.properties file"
-	 echo  "OK_FINDBUGS_WARNINGS"
-	 echo  "OK_RELEASEAUDIT_WARNINGS"
-	 echo  "OK_JAVADOC_WARNINGS"
-    cleanupAndExit 1
-  fi
-  echo ""
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo " Pre-build trunk to verify trunk stability and javac warnings" 
-  echo "======================================================================"
-  echo "======================================================================"
-  echo ""
-  echo ""
-  echo "$ANT_HOME/bin/ant  -Djavac.args="-Xlint -Xmaxwarns 1000" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1"
- $ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1
-  if [[ $? != 0 ]] ; then
-    echo "Trunk compilation is broken?"
-    cleanupAndExit 1
-  fi
-}
-
-###############################################################################
-### Check for @author tags in the patch
-checkAuthor () {
-  echo ""
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo "    Checking there are no @author tags in the patch."
-  echo "======================================================================"
-  echo "======================================================================"
-  echo ""
-  echo ""
-  authorTags=`$GREP -c -i '@author' $PATCH_DIR/patch`
-  echo "There appear to be $authorTags @author tags in the patch."
-  if [[ $authorTags != 0 ]] ; then
-    JIRA_COMMENT="$JIRA_COMMENT
-
-    -1 @author.  The patch appears to contain $authorTags @author tags which the Zookeeper community has agreed to not allow in code contributions."
-    return 1
-  fi
-  JIRA_COMMENT="$JIRA_COMMENT
-
-    +1 @author.  The patch does not contain any @author tags."
-  return 0
-}
-
-###############################################################################
-### Check for tests in the patch
-checkTests () {
-  echo ""
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo "    Checking there are new or changed tests in the patch."
-  echo "======================================================================"
-  echo "======================================================================"
-  echo ""
-  echo ""
-  testReferences=`$GREP -c -i '/test' $PATCH_DIR/patch`
-  echo "There appear to be $testReferences test files referenced in the patch."
-  if [[ $testReferences == 0 ]] ; then
-    if [[ $HUDSON == "true" ]] ; then
-      patchIsDoc=`$GREP -c -i 'title="documentation' $PATCH_DIR/jira`
-      if [[ $patchIsDoc != 0 ]] ; then
-        echo "The patch appears to be a documentation patch that doesn't require tests."
-        JIRA_COMMENT="$JIRA_COMMENT
-
-    +0 tests included.  The patch appears to be a documentation patch that doesn't require tests."
-        return 0
-      fi
-    fi
-    JIRA_COMMENT="$JIRA_COMMENT
-
-    -1 tests included.  The patch doesn't appear to include any new or modified tests.
-                        Please justify why no new tests are needed for this patch.
-                        Also please list what manual steps were performed to verify this patch."
-    return 1
-  fi
-  JIRA_COMMENT="$JIRA_COMMENT
-
-    +1 tests included.  The patch appears to include $testReferences new or modified tests."
-  return 0
-}
-
-###############################################################################
-### Attempt to apply the patch
-applyPatch () {
-  echo ""
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo "    Applying patch."
-  echo "======================================================================"
-  echo "======================================================================"
-  echo ""
-  echo ""
-  $PATCH -E -p0 < $PATCH_DIR/patch
-  if [[ $? != 0 ]] ; then
-    echo "PATCH APPLICATION FAILED"
-    JIRA_COMMENT="$JIRA_COMMENT
-
-    -1 patch.  The patch command could not apply the patch."
-    return 1
-  fi
-  return 0
-}
-
-###############################################################################
-### Check there are no javadoc warnings
-checkJavadocWarnings () {
-  echo ""
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo "    Determining number of patched javadoc warnings."
-  echo "======================================================================"
-  echo "======================================================================"
-  echo ""
-  echo ""
-  echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess= clean javadoc | tee $PATCH_DIR/patchJavadocWarnings.txt"
-  $ANT_HOME/bin/ant -DZookeeperPatchProcess= clean javadoc | tee $PATCH_DIR/patchJavadocWarnings.txt
-  javadocWarnings=`$GREP -o '\[javadoc\] [0-9]* warning' $PATCH_DIR/patchJavadocWarnings.txt | awk '{total += $2} END {print total}'`
-  echo ""
-  echo ""
-  echo "There appear to be $javadocWarnings javadoc warnings generated by the patched build."
-
-  ### if current warnings greater than OK_JAVADOC_WARNINGS
-  if [[ $javadocWarnings > $OK_JAVADOC_WARNINGS ]] ; then
-    JIRA_COMMENT="$JIRA_COMMENT
-
-    -1 javadoc.  The javadoc tool appears to have generated `expr $(($javadocWarnings-$OK_JAVADOC_WARNINGS))` warning messages."
-    return 1
-  fi
-  JIRA_COMMENT="$JIRA_COMMENT
-
-    +1 javadoc.  The javadoc tool did not generate any warning messages."
-  return 0
-}
-
-###############################################################################
-### Check there are no changes in the number of Javac warnings
-checkJavacWarnings () {
-  echo ""
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo "    Determining number of patched javac warnings."
-  echo "======================================================================"
-  echo "======================================================================"
-  echo ""
-  echo ""
-  echo "$ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= clean tar > $PATCH_DIR/patchJavacWarnings.txt 2>&1"
-  $ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= clean tar > $PATCH_DIR/patchJavacWarnings.txt 2>&1
-  if [[ $? != 0 ]] ; then
-    JIRA_COMMENT="$JIRA_COMMENT
-
-    -1 javac.  The patch appears to cause tar ant target to fail."
-    return 1
-  fi
-  ### Compare trunk and patch javac warning numbers
-  if [[ -f $PATCH_DIR/patchJavacWarnings.txt ]] ; then
-    trunkJavacWarnings=`$GREP -o '\[javac\] [0-9]* warning' $PATCH_DIR/trunkJavacWarnings.txt | awk '{total += $2} END {print total}'`
-    patchJavacWarnings=`$GREP -o '\[javac\] [0-9]* warning' $PATCH_DIR/patchJavacWarnings.txt | awk '{total += $2} END {print total}'`
-    echo "There appear to be $trunkJavacWarnings javac compiler warnings before the patch and $patchJavacWarnings javac compiler warnings after applying the patch."
-    if [[ $patchJavacWarnings != "" && $trunkJavacWarnings != "" ]] ; then
-      if [[ $patchJavacWarnings -gt $trunkJavacWarnings ]] ; then
-        JIRA_COMMENT="$JIRA_COMMENT
-
-    -1 javac.  The applied patch generated $patchJavacWarnings javac compiler warnings (more than the trunk's current $trunkJavacWarnings warnings)."
-        return 1
-      fi
-    fi
-  fi
-  JIRA_COMMENT="$JIRA_COMMENT
-
-    +1 javac.  The applied patch does not increase the total number of javac compiler warnings."
-  return 0
-}
-
-###############################################################################
-### Check there are no changes in the number of release audit (RAT) warnings
-checkReleaseAuditWarnings () {
-  echo ""
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo "    Determining number of patched release audit warnings."
-  echo "======================================================================"
-  echo "======================================================================"
-  echo ""
-  echo ""
-  echo "$ANT_HOME/bin/ant -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1"
-  $ANT_HOME/bin/ant -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1
-
-  ### Compare trunk and patch release audit warning numbers
-  if [[ -f $PATCH_DIR/patchReleaseAuditWarnings.txt ]] ; then
-    patchReleaseAuditWarnings=`$GREP -c '\!?????' $PATCH_DIR/patchReleaseAuditWarnings.txt`
-    echo ""
-    echo ""
-    echo "There appear to be $OK_RELEASEAUDIT_WARNINGS release audit warnings before the patch and $patchReleaseAuditWarnings release audit warnings after applying the patch."
-    if [[ $patchReleaseAuditWarnings != "" && $OK_RELEASEAUDIT_WARNINGS != "" ]] ; then
-      if [[ $patchReleaseAuditWarnings -gt $OK_RELEASEAUDIT_WARNINGS ]] ; then
-        JIRA_COMMENT="$JIRA_COMMENT
-
-    -1 release audit.  The applied patch generated $patchReleaseAuditWarnings release audit warnings (more than the trunk's current $OK_RELEASEAUDIT_WARNINGS warnings)."
-        $GREP '\!?????' $PATCH_DIR/patchReleaseAuditWarnings.txt > $PATCH_DIR/patchReleaseAuditProblems.txt
-        echo "Lines that start with ????? in the release audit report indicate files that do not have an Apache license header." >> $PATCH_DIR/patchReleaseAuditProblems.txt
-        JIRA_COMMENT_FOOTER="Release audit warnings: $BUILD_URL/artifact/trunk/patchprocess/patchReleaseAuditProblems.txt
-$JIRA_COMMENT_FOOTER"
-        return 1
-      fi
-    fi
-  fi
-  JIRA_COMMENT="$JIRA_COMMENT
-
-    +1 release audit.  The applied patch does not increase the total number of release audit warnings."
-  return 0
-}
-
-###############################################################################
-### Check there are no changes in the number of Checkstyle warnings
-checkStyle () {
-  echo ""
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo "    Determining number of patched checkstyle warnings."
-  echo "======================================================================"
-  echo "======================================================================"
-  echo ""
-  echo ""
-  echo "THIS IS NOT IMPLEMENTED YET"
-  echo ""
-  echo ""
-  echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess= checkstyle"
-  $ANT_HOME/bin/ant -DZookeeperPatchProcess= checkstyle
-  JIRA_COMMENT_FOOTER="Checkstyle results: $BUILD_URL/artifact/trunk/build/test/checkstyle-errors.html
-$JIRA_COMMENT_FOOTER"
-  ### TODO: calculate actual patchStyleErrors
-#  patchStyleErrors=0
-#  if [[ $patchStyleErrors != 0 ]] ; then
-#    JIRA_COMMENT="$JIRA_COMMENT
-#
-#    -1 checkstyle.  The patch generated $patchStyleErrors code style errors."
-#    return 1
-#  fi
-#  JIRA_COMMENT="$JIRA_COMMENT
-#
-#    +1 checkstyle.  The patch generated 0 code style errors."
-  return 0
-}
-
-###############################################################################
-### Check there are no changes in the number of Findbugs warnings
-checkFindbugsWarnings () {
-  findbugs_version=`${FINDBUGS_HOME}/bin/findbugs -version`
-  echo ""
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo "    Determining number of patched Findbugs warnings."
-  echo "======================================================================"
-  echo "======================================================================"
-  echo ""
-  echo ""
-  echo "$ANT_HOME/bin/ant -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= findbugs"
-  $ANT_HOME/bin/ant -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= findbugs
-  if [ $? != 0 ] ; then
-    JIRA_COMMENT="$JIRA_COMMENT
-
-    -1 findbugs.  The patch appears to cause Findbugs (version ${findbugs_version}) to fail."
-    return 1
-  fi
-JIRA_COMMENT_FOOTER="Findbugs warnings: $BUILD_URL/artifact/trunk/build/test/findbugs/newPatchFindbugsWarnings.html
-$JIRA_COMMENT_FOOTER"
-  cp $BASEDIR/build/test/findbugs/*.xml $PATCH_DIR/patchFindbugsWarnings.xml
-  $FINDBUGS_HOME/bin/setBugDatabaseInfo -timestamp "01/01/2000" \
-    $PATCH_DIR/patchFindbugsWarnings.xml \
-    $PATCH_DIR/patchFindbugsWarnings.xml
-  findbugsWarnings=`$FINDBUGS_HOME/bin/filterBugs -first "01/01/2000" $PATCH_DIR/patchFindbugsWarnings.xml \
-    $BASEDIR/build/test/findbugs/newPatchFindbugsWarnings.xml | /usr/bin/awk '{print $1}'`
-  $FINDBUGS_HOME/bin/convertXmlToText -html \
-    $BASEDIR/build/test/findbugs/newPatchFindbugsWarnings.xml \
-    $BASEDIR/build/test/findbugs/newPatchFindbugsWarnings.html
-  cp $BASEDIR/build/test/findbugs/newPatchFindbugsWarnings.html $PATCH_DIR/newPatchFindbugsWarnings.html
-  cp $BASEDIR/build/test/findbugs/newPatchFindbugsWarnings.xml $PATCH_DIR/newPatchFindbugsWarnings.xml
-
-  ### if current warnings greater than OK_FINDBUGS_WARNINGS
-  if [[ $findbugsWarnings > $OK_FINDBUGS_WARNINGS ]] ; then
-    JIRA_COMMENT="$JIRA_COMMENT
-
-    -1 findbugs.  The patch appears to introduce `expr $(($findbugsWarnings-$OK_FINDBUGS_WARNINGS))` new Findbugs (version ${findbugs_version}) warnings."
-    return 1
-  fi
-  JIRA_COMMENT="$JIRA_COMMENT
-
-    +1 findbugs.  The patch does not introduce any new Findbugs (version ${findbugs_version}) warnings."
-  return 0
-}
-
-###############################################################################
-### Run the test-core target
-runCoreTests () {
-  echo ""
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo "    Running core tests."
-  echo "======================================================================"
-  echo "======================================================================"
-  echo ""
-  echo ""
-  
-  ### Kill any rogue build processes from the last attempt
-  $PS auxwww | $GREP ZookeeperPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
-
-  echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dtest.junit.threads=8 -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME test-core"
-  $ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dtest.junit.threads=8 -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME test-core
-  if [[ $? != 0 ]] ; then
-    JIRA_COMMENT="$JIRA_COMMENT
-
-    -1 core tests.  The patch failed core unit tests."
-    return 1
-  fi
-  JIRA_COMMENT="$JIRA_COMMENT
-
-    +1 core tests.  The patch passed core unit tests."
-  return 0
-}
-
-###############################################################################
-### Run the test-contrib target
-runContribTests () {
-  echo ""
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo "    Running contrib tests."
-  echo "======================================================================"
-  echo "======================================================================"
-  echo ""
-  echo ""
-
-  ### Kill any rogue build processes from the last attempt
-  $PS auxwww | $GREP ZookeeperPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
-
-  echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes test-contrib"
-  $ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes test-contrib
-  if [[ $? != 0 ]] ; then
-    JIRA_COMMENT="$JIRA_COMMENT
-
-    -1 contrib tests.  The patch failed contrib unit tests."
-    return 1
-  fi
-  JIRA_COMMENT="$JIRA_COMMENT
-
-    +1 contrib tests.  The patch passed contrib unit tests."
-  return 0
-}
-
-###############################################################################
-### Submit a comment to the defect's Jira
-submitJiraComment () {
-  local result=$1
-  ### Do not output the value of JIRA_COMMENT_FOOTER when run by a developer
-  if [[  $HUDSON == "false" ]] ; then
-    JIRA_COMMENT_FOOTER=""
-  fi
-  if [[ $result == 0 ]] ; then
-    comment="+1 overall.  $JIRA_COMMENT
-
-$JIRA_COMMENT_FOOTER"
-  else
-    comment="-1 overall.  $JIRA_COMMENT
-
-$JIRA_COMMENT_FOOTER"
-  fi
-  ### Output the test result to the console
-  echo "
-
-
-
-$comment"  
-
-  if [[ $HUDSON == "true" ]] ; then
-    echo ""
-    echo ""
-    echo "======================================================================"
-    echo "======================================================================"
-    echo "    Adding comment to Jira."
-    echo "======================================================================"
-    echo "======================================================================"
-    echo ""
-    echo ""
-    ### Update Jira with a comment
-    export USER=jenkins
-    $JIRACLI -s https://issues.apache.org/jira -a addcomment -u hadoopqa -p $JIRA_PASSWD --comment "$comment" --issue $defect
-    $JIRACLI -s https://issues.apache.org/jira -a logout -u hadoopqa -p $JIRA_PASSWD
-  fi
-}
-
-###############################################################################
-### Cleanup files
-cleanupAndExit () {
-  local result=$1
-  if [[ $HUDSON == "true" ]] ; then
-    if [ -e "$PATCH_DIR" ] ; then
-      mv $PATCH_DIR $BASEDIR
-    fi
-  fi
-  echo ""
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo "    Finished build."
-  echo "======================================================================"
-  echo "======================================================================"
-  echo ""
-  echo ""
-  exit $result
-}
-
-###############################################################################
-###############################################################################
-###############################################################################
-
-JIRA_COMMENT=""
-JIRA_COMMENT_FOOTER="Console output: $BUILD_URL/console
-
-This message is automatically generated."
-
-### Check if arguments to the script have been specified properly or not
-parseArgs $@
-cd $BASEDIR
-
-checkout
-RESULT=$?
-if [[ $HUDSON == "true" ]] ; then
-  if [[ $RESULT != 0 ]] ; then
-    exit 100
-  fi
-fi
-setup
-checkAuthor
-RESULT=$?
-
-checkTests
-(( RESULT = RESULT + $? ))
-applyPatch
-if [[ $? != 0 ]] ; then
-  submitJiraComment 1
-  cleanupAndExit 1
-fi
-checkJavadocWarnings
-(( RESULT = RESULT + $? ))
-checkJavacWarnings
-(( RESULT = RESULT + $? ))
-### Checkstyle not implemented yet
-#checkStyle
-#(( RESULT = RESULT + $? ))
-checkFindbugsWarnings
-(( RESULT = RESULT + $? ))
-checkReleaseAuditWarnings
-(( RESULT = RESULT + $? ))
-### Do not call these when run by a developer 
-if [[ $HUDSON == "true" ]] ; then
-  runCoreTests
-  (( RESULT = RESULT + $? ))
-  runContribTests
-  (( RESULT = RESULT + $? ))
-fi
-JIRA_COMMENT_FOOTER="Test results: $BUILD_URL/testReport/
-$JIRA_COMMENT_FOOTER"
-
-submitJiraComment $RESULT
-cleanupAndExit $RESULT

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/bin/test-scripts.sh
----------------------------------------------------------------------
diff --git a/src/java/test/bin/test-scripts.sh b/src/java/test/bin/test-scripts.sh
deleted file mode 100755
index ad175ba..0000000
--- a/src/java/test/bin/test-scripts.sh
+++ /dev/null
@@ -1,223 +0,0 @@
-#!/usr/bin/env bash
-
-# 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.
-
-ZKS=bin/zkServer.sh
-ZKSI=bin/zkServer-initialize.sh
-
-if [ ! -d "conf" ]; then
-    echo "run this from the toplevel directory"
-    exit 1
-fi
-
-if [ ! `ls build/zookeeper*.jar` ]; then
-    echo "first compile the zk jar file"
-    exit 1
-fi
-
-DATADIR=test-scripts_datadir
-DATALOGDIR=test-scripts_datalogdir
-
-case "`uname`" in
-    CYGWIN*) cygwin=true ;;
-    *) cygwin=false ;;
-esac
-
-if $cygwin
-then
-    ZOOCFG=`cygpath -wp "$ZOOCFG"`
-    # cygwin has a "kill" in the shell itself, gets confused
-    KILL=/bin/kill
-else
-    KILL=kill
-fi
-
-fail() {
-    # don't run clear_tmp to allow debugging
-    echo "FAIL $1"
-    $KILL -9 $(cat "$ZOOPIDFILE")
-    $KILL -9 $$
-}
-
-#generate a minimal config
-genconfig1() {
-    cat > test-scripts.cfg <<EOF
-tickTime=2000
-initLimit=10
-syncLimit=5
-dataDir=$DATADIR
-clientPort=19181
-EOF
-}
-
-genconfig2() {
-    genconfig1
-    cat >> test-scripts.cfg <<EOF
-dataLogDir=$DATALOGDIR
-EOF
-}
-
-export ZOOCFGDIR=`pwd`
-export ZOOCFG="test-scripts.cfg"
-export CLASSPATH=$ZOOCFGDIR/conf
-
-#clear out the clutter generated by scripts
-clear_tmp() {
-    rm -f test-scripts.cfg
-    rm -fr $DATADIR
-    rm -fr $DATALOGDIR
-    rm -f zookeeper.out
-}
-
-start() {
-    $CONFIG
-    #ensure not already running
-    $ZKS status && (echo "already running"; fail $LINENO)
-    export ZOOPIDFILE="$DATADIR/zookeeper_server.pid"
-
-    $ZKS start
-}
-
-stop() {
-    $ZKS stop
-}
-
-CONFIG=genconfig1
-
-clear_tmp
-start
-ls $DATADIR || fail $LINENO
-ls $DATALOGDIR && fail $LINENO
-stop
-
-CONFIG=genconfig2
-
-clear_tmp
-start
-ls $DATADIR || fail $LINENO
-
-# zk actually checks for this to exist, but doesn't create
-ls $DATALOGDIR && fail $LINENO
-
-clear_tmp
-mkdir -p "$DATALOGDIR"
-start
-ls $DATADIR || fail $LINENO
-ls $DATALOGDIR || fail $LINENO
-stop
-
-#
-# verify autocreate diabled
-#
-export ZOO_DATADIR_AUTOCREATE_DISABLE=1
-
-CONFIG=genconfig1
-
-clear_tmp
-start
-[ $? -eq 1 ] || fail $LINENO
-ls $DATADIR && fail $LINENO
-ls $DATALOGDIR && fail $LINENO
-
-CONFIG=genconfig2
-
-clear_tmp
-mkdir -p "$DATADIR/version-2"
-start
-[ $? -eq 1 ] || fail $LINENO
-ls $DATALOGDIR && fail $LINENO
-
-CONFIG=genconfig1
-
-clear_tmp
-mkdir -p "$DATADIR/version-2"
-start
-[ $? -eq 0 ] || fail $LINENO
-stop
-
-CONFIG=genconfig2
-
-clear_tmp
-mkdir -p "$DATADIR/version-2"
-mkdir -p "$DATALOGDIR/version-2"
-start
-[ $? -eq 0 ] || fail $LINENO
-stop
-
-#
-# validate the initialize script
-#
-
-CONFIG=genconfig1
-
-clear_tmp
-$CONFIG
-
-$ZKSI --configfile "$ZOOCFGDIR/$ZOOCFG"
-ls $DATADIR || fail $LINENO
-
-#ensure not already running
-$ZKS status && (echo "already running"; fail $LINENO)
-export ZOOPIDFILE="$DATADIR/zookeeper_server.pid"
-
-$ZKS start
-[ $? -eq 0 ] || fail $LINENO
-stop
-
-
-CONFIG=genconfig2
-
-clear_tmp
-$CONFIG
-
-$ZKSI --configfile "$ZOOCFGDIR/$ZOOCFG"
-ls $DATADIR || fail $LINENO
-ls $DATALOGDIR || fail $LINENO
-
-#ensure not already running
-$ZKS status && (echo "already running"; fail $LINENO)
-export ZOOPIDFILE="$DATADIR/zookeeper_server.pid"
-
-$ZKS start
-[ $? -eq 0 ] || fail $LINENO
-stop
-
-
-## validate force
-CONFIG=genconfig1
-
-clear_tmp
-$CONFIG
-
-$ZKSI --configfile "$ZOOCFGDIR/$ZOOCFG" || fail $LINENO
-ls $DATADIR || fail $LINENO
-$ZKSI --configfile "$ZOOCFGDIR/$ZOOCFG" && fail $LINENO
-$ZKSI --force --configfile "$ZOOCFGDIR/$ZOOCFG" || fail $LINENO
-
-#ensure not already running
-$ZKS status && (echo "already running"; fail $LINENO)
-export ZOOPIDFILE="$DATADIR/zookeeper_server.pid"
-
-$ZKS start
-[ $? -eq 0 ] || fail $LINENO
-stop
-
-$ZKSI --force --myid=1 --configfile "$ZOOCFGDIR/$ZOOCFG" || fail $LINENO
-
-
-#done, cleanup and exit
-clear_tmp
-echo "SUCCESS"

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/checkstyle-noframes-sorted.xsl
----------------------------------------------------------------------
diff --git a/src/java/test/checkstyle-noframes-sorted.xsl b/src/java/test/checkstyle-noframes-sorted.xsl
deleted file mode 100644
index 5f9e93b..0000000
--- a/src/java/test/checkstyle-noframes-sorted.xsl
+++ /dev/null
@@ -1,178 +0,0 @@
-<xsl:stylesheet	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:output method="html" indent="yes"/>
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
-
-<xsl:key name="files" match="file" use="@name" />
-
-<!-- Checkstyle XML Style Sheet by Stephane Bailliez <sbailliez@apache.org>         -->
-<!-- Part of the Checkstyle distribution found at http://checkstyle.sourceforge.net -->
-<!-- Usage (generates checkstyle_report.html):                                      -->
-<!--    <checkstyle failonviolation="false" config="${check.config}">               -->
-<!--      <fileset dir="${src.dir}" includes="**/*.java"/>                          -->
-<!--      <formatter type="xml" toFile="${doc.dir}/checkstyle_report.xml"/>         -->
-<!--    </checkstyle>                                                               -->
-<!--    <style basedir="${doc.dir}" destdir="${doc.dir}"                            -->
-<!--            includes="checkstyle_report.xml"                                    -->
-<!--            style="${doc.dir}/checkstyle-noframes-sorted.xsl"/>                 -->
-
-<xsl:template match="checkstyle">
-	<html>
-		<head>
-		<style type="text/css">
-    .bannercell {
-      border: 0px;
-      padding: 0px;
-    }
-    body {
-      margin-left: 10;
-      margin-right: 10;
-      font:normal 80% arial,helvetica,sanserif;
-      background-color:#FFFFFF;
-      color:#000000;
-    }
-    .a td {
-      background: #efefef;
-    }
-    .b td {
-      background: #fff;
-    }
-    th, td {
-      text-align: left;
-      vertical-align: top;
-    }
-    th {
-      font-weight:bold;
-      background: #ccc;
-      color: black;
-    }
-    table, th, td {
-      font-size:100%;
-      border: none
-    }
-    table.log tr td, tr th {
-
-    }
-    h2 {
-      font-weight:bold;
-      font-size:140%;
-      margin-bottom: 5;
-    }
-    h3 {
-      font-size:100%;
-      font-weight:bold;
-      background: #525D76;
-      color: white;
-      text-decoration: none;
-      padding: 5px;
-      margin-right: 2px;
-      margin-left: 2px;
-      margin-bottom: 0;
-    }
-		</style>
-		</head>
-		<body>
-			<a name="top"></a>
-      <!-- jakarta logo -->
-      <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <tr>
-        <td class="bannercell" rowspan="2">
-          <!--a href="http://jakarta.apache.org/">
-          <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
-          </a-->
-        </td>
-    		<td class="text-align:right"><h2>CheckStyle Audit</h2></td>
-    		</tr>
-    		<tr>
-    		<td class="text-align:right">Designed for use with <a href='http://checkstyle.sourceforge.net/'>CheckStyle</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td>
-    		</tr>
-      </table>
-    	<hr size="1"/>
-
-			<!-- Summary part -->
-			<xsl:apply-templates select="." mode="summary"/>
-			<hr size="1" width="100%" align="left"/>
-
-			<!-- Package List part -->
-			<xsl:apply-templates select="." mode="filelist"/>
-			<hr size="1" width="100%" align="left"/>
-
-			<!-- For each package create its part -->
-            <xsl:apply-templates select="file[@name and generate-id(.) = generate-id(key('files', @name))]" />
-
-			<hr size="1" width="100%" align="left"/>
-
-
-		</body>
-	</html>
-</xsl:template>
-
-
-
-	<xsl:template match="checkstyle" mode="filelist">
-		<h3>Files</h3>
-		<table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-      <tr>
-        <th>Name</th>
-        <th>Errors</th>
-      </tr>
-          <xsl:for-each select="file[@name and generate-id(.) = generate-id(key('files', @name))]">
-                <xsl:sort data-type="number" order="descending" select="count(key('files', @name)/error)"/>
-				<xsl:variable name="errorCount" select="count(error)"/>
-				<tr>
-          <xsl:call-template name="alternated-row"/>
-					<td><a href="#f-{@name}"><xsl:value-of select="@name"/></a></td>
-					<td><xsl:value-of select="$errorCount"/></td>
-				</tr>
-			</xsl:for-each>
-		</table>
-	</xsl:template>
-
-
-	<xsl:template match="file">
-    <a name="f-{@name}"></a>
-    <h3>File <xsl:value-of select="@name"/></h3>
-
-    <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-    	<tr>
-    	  <th>Error Description</th>
-    	  <th>Line</th>
-      </tr>
-        <xsl:for-each select="key('files', @name)/error">
-          <xsl:sort data-type="number" order="ascending" select="@line"/>
-    	<tr>
-        <xsl:call-template name="alternated-row"/>
-    	  <td><xsl:value-of select="@message"/></td>
-    	  <td><xsl:value-of select="@line"/></td>
-    	</tr>
-    	</xsl:for-each>
-    </table>
-    <a href="#top">Back to top</a>
-	</xsl:template>
-
-
-	<xsl:template match="checkstyle" mode="summary">
-		<h3>Summary</h3>
-        <xsl:variable name="fileCount" select="count(file[@name and generate-id(.) = generate-id(key('files', @name))])"/>
-		<xsl:variable name="errorCount" select="count(file/error)"/>
-		<table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
-		<tr>
-			<th>Files</th>
-			<th>Errors</th>
-		</tr>
-		<tr>
-		  <xsl:call-template name="alternated-row"/>
-			<td><xsl:value-of select="$fileCount"/></td>
-			<td><xsl:value-of select="$errorCount"/></td>
-		</tr>
-		</table>
-	</xsl:template>
-
-  <xsl:template name="alternated-row">
-    <xsl:attribute name="class">
-      <xsl:if test="position() mod 2 = 1">a</xsl:if>
-      <xsl:if test="position() mod 2 = 0">b</xsl:if>
-    </xsl:attribute>
-  </xsl:template>
-</xsl:stylesheet>
-
-

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/checkstyle.xml
----------------------------------------------------------------------
diff --git a/src/java/test/checkstyle.xml b/src/java/test/checkstyle.xml
deleted file mode 100644
index a5d5182..0000000
--- a/src/java/test/checkstyle.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
-   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.
--->
-<!--
-  [Forked from Hadoop@2d7363b27360e36fdd62546c0f9d0b1d78133f29]
-
-  Checkstyle configuration for Zookeeper that is based on the sun_checks.xml file
-  that is bundled with Checkstyle and includes checks for:
-
-    - the Java Language Specification at
-      http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
-    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
-    - the Javadoc guidelines at
-      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
-    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
-    - some best practices
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  http://checkstyle.sf.net (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-
-  Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-
-    <!-- Checks that a package.html file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <module name="JavadocPackage"/>
-
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <!-- module name="NewlineAtEndOfFile"/-->
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-    <module name="FileLength"/>
-    <module name="FileTabCharacter"/>
-
-    <module name="TreeWalker">
-
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <module name="JavadocType">
-          <property name="scope" value="public"/>
-          <property name="allowMissingParamTags" value="true"/>
-        </module>
-        <module name="JavadocStyle"/>
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName"/>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-
-        <!-- Checks for Headers                                -->
-        <!-- See http://checkstyle.sf.net/config_header.html   -->
-        <!-- <module name="Header">                            -->
-            <!-- The follow property value demonstrates the ability     -->
-            <!-- to have access to ANT properties. In this case it uses -->
-            <!-- the ${basedir} property to allow Checkstyle to be run  -->
-            <!-- from any directory within a project. See property      -->
-            <!-- expansion,                                             -->
-            <!-- http://checkstyle.sf.net/config.html#properties        -->
-            <!-- <property                                              -->
-            <!--     name="headerFile"                                  -->
-            <!--     value="${basedir}/java.header"/>                   -->
-        <!-- </module> -->
-
-        <!-- Following interprets the header file as regular expressions. -->
-        <!-- <module name="RegexpHeader"/>                                -->
-
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-          <property name="ignorePattern" value="^import"/>
-        </module>
-        <module name="MethodLength"/>
-        <module name="ParameterNumber"/>
-
-
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter">
-	    	<property name="tokens" value="COMMA, SEMI"/>
-		</module>
-
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock"/>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <!-- module name="AvoidInlineConditionals"/-->
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-        <module name="HiddenField">
-          <property name="ignoreConstructorParameter" value="true"/>
-        </module>
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-        <module name="MissingSwitchDefault"/>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
-        <module name="InterfaceIsType"/>
-        <module name="VisibilityModifier"/>
-
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-        <module name="Indentation">
-            <property name="basicOffset" value="4" />
-            <property name="caseIndent" value="0" />
-        </module> 
-        <module name="TodoComment"/>
-        <module name="UpperEll"/>
-
-    </module>
-
-</module>

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/config/findbugsExcludeFile.xml
----------------------------------------------------------------------
diff --git a/src/java/test/config/findbugsExcludeFile.xml b/src/java/test/config/findbugsExcludeFile.xml
deleted file mode 100644
index a3f45a6..0000000
--- a/src/java/test/config/findbugsExcludeFile.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<FindBugsFilter>
-  <!-- Allow command line utilities, which follow pattern *Main.java, to call
-       system exit -->
-  <Match>
-    <Class name="~org\.apache\.zookeeper\..*Main" />
-    <Bug pattern="DM_EXIT" />
-  </Match>
-
-  <!-- This is too complicated to resolve/ingrained into the architecture
-       In particular we want to make sure we exit if this occurs
-       Also notice logged as fatal error -->
-  <Match>
-    <Class name="org.apache.zookeeper.server.ZooKeeperCriticalThread" />
-    <Method name="handleException" />
-    <Bug pattern="DM_EXIT" />
-  </Match>
-
-  <!-- In particular we want to make sure we exit if this occurs, unrecoverable.
-       Also notice logged as fatal error -->
-  <Match>
-    <Class name="org.apache.zookeeper.server.ZooKeeperServer" />
-    <Method name="takeSnapshot" />
-    <Bug pattern="DM_EXIT" />
-  </Match>
-
-
-  <!-- We want to catch all exceptions and cleanup, regardless of source
-       (incl runtime) -->
-  <Match>
-    <Class name="org.apache.zookeeper.ClientCnxn$SendThread" />
-    <Method name="run" />
-    <Bug pattern="REC_CATCH_EXCEPTION" />
-  </Match>
-
-    <!-- Committing out of order is an unrecoverable error, so we should
-              really exit  -->
-   <Match>
-     <Class name="org.apache.zookeeper.server.quorum.FollowerZooKeeperServer" />
-       <Method name="commit" />
-       <Bug pattern="DM_EXIT" />
-     </Match>
-
-   <!-- Two unrecoverable errors while following the leader  -->
-   <Match>
-     <Class name="org.apache.zookeeper.server.quorum.Learner" />
-       <Method name="syncWithLeader" />
-       <Bug pattern="DM_EXIT" />
-   </Match>
-
-  <!-- QuorumCnxManager Listener thread fails to bind election port -->
-  <Match>
-    <Class name="org.apache.zookeeper.server.quorum.QuorumCnxManager$Listener"/>
-    <Method name="run" />
-    <Bug pattern="DM_EXIT" />
-  </Match>
-
-   <!-- Failed to create watch manager is a unrecoverable error -->
-   <Match>
-     <Class name="org.apache.zookeeper.server.DataTree" />
-     <Bug pattern="DM_EXIT" />
-   </Match>
-
-  <Match>
-    <Package name="org.apache.jute.compiler.generated" />
-  </Match>
-
-  <Match>
-    <Package name="~org\.apache\.zookeeper\.(proto|data|txn)" />
-    <Bug code="EI, EI2" />
-  </Match>
-
-  <Match>
-    <Class name="org.apache.zookeeper.server.DataNode" />
-      <Bug code="EI2"/>
-  </Match>
-
-  <Match>
-    <Class name="org.apache.zookeeper.server.quorum.QuorumPacket" />
-       <Bug code="EI2, EI" />
-  </Match>
-
-  <Match>
-      <Class name="org.apache.zookeeper.server.quorum.QuorumAuthPacket" />
-      <Bug code="EI2, EI" />
-  </Match>
-
-  <Match>
-    <Class name="org.apache.zookeeper.ClientCnxn"/>
-      <Bug code="EI, EI2" />
-  </Match>
-
-  <Match>
-    <Class name="org.apache.zookeeper.server.DataNode"/>
-      <Field name="children"/>
-      <Bug code="IS"/>
-  </Match>
- <Match>
-   <Class name="org.apache.zookeeper.server.quorum.Leader"/>
-     <Field name="lastProposed"/>
-     <Bug code="IS"/>
-  </Match>
-  <Match>
-    <Class name="org.apache.zookeeper.server.persistence.FileTxnLog"/>
-    <Field name="serverStats"/>
-    <Bug code="IS"/>
-  </Match>
-
-  <!-- The iterate function is non-thread safe, the caller will synchronize
-       on the BitHHashSet object -->
-  <Match>
-    <Class name="org.apache.zookeeper.server.util.BitHashSet" />
-    <Field name="elementCount" />
-    <Bug code="IS" />
-  </Match>
-
-  <Match>
-     <Class name="org.apache.zookeeper.server.quorum.LearnerSessionTracker"/>
-       <Bug code="UrF"/>
-  </Match>
-  <Match>
-    <Class name="org.apache.zookeeper.server.quorum.AuthFastLeaderElection$Messenger$WorkerSender"/>
-    <Method name="process"/>
-    <Bug code="RV"/>
-  </Match>
-
-  <!-- these are old classes just for upgrading and should go away -->
-  <Match>
-    <Class name="org.apache.zookeeper.server.upgrade.DataNodeV1"/>
-  </Match>
-
-  <Match>
-    <Class name="org.apache.zookeeper.server.upgrade.DataTreeV1"/>
-  </Match>
-
-  <!-- References code in a generated file that may or maynot be null -->
-  <Match>
-    <Class name="org.apache.zookeeper.Version" />
-    <Method name="getVersion" />
-    <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE" />
-  </Match>
-
-  <!-- sync'd object is also being used to protect the isrunning flag, this is ok -->
-  <Match>
-    <Class name="org.apache.zookeeper.ClientCnxn$EventThread"/>
-    <Bug code="JLM"/>
-    <Or>
-      <Method name="queuePacket" />
-      <Method name="run" />
-    </Or>
-  </Match>
-
-  <!-- Synchronize on the AtomicInteger to do wait/notify, but not relying
-       on the synchronization to control the AtomicInteger value update,
-       so it's not a problem -->
-  <Match>
-    <Class name="org.apache.zookeeper.server.watch.WatcherCleaner" />
-    <Bug code="JLM" />
-    <Method name="addDeadWatcher" />
-  </Match>
-
-  <Match>
-    <Class name="org.apache.zookeeper.server.watch.WatcherCleaner$1" />
-    <Bug code="JLM" />
-    <Method name="doWork" />
-  </Match>
-
-
-
-  <Match>
-    <Class name="org.apache.zookeeper.server.quorum.QuorumPeer"/>
-    <Bug pattern="OS_OPEN_STREAM" />
-    <Method name="writeLongToFile" />
-  </Match>
-
-  <!-- this is a helper routine to wakeup the main thread with the
-  state change happening in the routines that call it -->
-  <Match>
-    <Class name="org.apache.zookeeper.server.quorum.CommitProcessor"/>
-    <Bug pattern="NN_NAKED_NOTIFY" />
-    <Method name="wakeup" />
-  </Match>
-
-  <!-- Disable encoding warnings -->
-  <Match>
-    <Bug pattern="DM_DEFAULT_ENCODING" />
-  </Match>
-
-  <!-- Disable 'Malicious code vulnerability warnings' due to mutable collection types in interface.
-       Undo this when ZOOKEEPER-1362 is done. -->
-  <Match>
-    <Class name="org.apache.zookeeper.ZooDefs$Ids"/>
-      <Bug pattern="MS_MUTABLE_COLLECTION" />
-  </Match>
-
-  <!-- Disable 'Return value of method without side effect is ignored' for EphemeralType. The default
-       version just returns 0 which triggers the warning. Findbugs can't seem to find the override in
-       the TTL value of the enum however -->
-  <Match>
-    <Class name="org.apache.zookeeper.server.EphemeralType"/>
-      <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT" />
-  </Match>
-</FindBugsFilter>

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/buffersize/create/version-2/log.1
----------------------------------------------------------------------
diff --git a/src/java/test/data/buffersize/create/version-2/log.1 b/src/java/test/data/buffersize/create/version-2/log.1
deleted file mode 100644
index 4f05bc1..0000000
Binary files a/src/java/test/data/buffersize/create/version-2/log.1 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/buffersize/create/version-2/snapshot.0
----------------------------------------------------------------------
diff --git a/src/java/test/data/buffersize/create/version-2/snapshot.0 b/src/java/test/data/buffersize/create/version-2/snapshot.0
deleted file mode 100644
index 49b512e..0000000
Binary files a/src/java/test/data/buffersize/create/version-2/snapshot.0 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/buffersize/set/version-2/log.1
----------------------------------------------------------------------
diff --git a/src/java/test/data/buffersize/set/version-2/log.1 b/src/java/test/data/buffersize/set/version-2/log.1
deleted file mode 100644
index 8586f16..0000000
Binary files a/src/java/test/data/buffersize/set/version-2/log.1 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/buffersize/set/version-2/snapshot.0
----------------------------------------------------------------------
diff --git a/src/java/test/data/buffersize/set/version-2/snapshot.0 b/src/java/test/data/buffersize/set/version-2/snapshot.0
deleted file mode 100644
index 49b512e..0000000
Binary files a/src/java/test/data/buffersize/set/version-2/snapshot.0 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/buffersize/snapshot/version-2/log.1
----------------------------------------------------------------------
diff --git a/src/java/test/data/buffersize/snapshot/version-2/log.1 b/src/java/test/data/buffersize/snapshot/version-2/log.1
deleted file mode 100644
index 2f145a6..0000000
Binary files a/src/java/test/data/buffersize/snapshot/version-2/log.1 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/buffersize/snapshot/version-2/snapshot.0
----------------------------------------------------------------------
diff --git a/src/java/test/data/buffersize/snapshot/version-2/snapshot.0 b/src/java/test/data/buffersize/snapshot/version-2/snapshot.0
deleted file mode 100644
index 49b512e..0000000
Binary files a/src/java/test/data/buffersize/snapshot/version-2/snapshot.0 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/buffersize/snapshot/version-2/snapshot.2
----------------------------------------------------------------------
diff --git a/src/java/test/data/buffersize/snapshot/version-2/snapshot.2 b/src/java/test/data/buffersize/snapshot/version-2/snapshot.2
deleted file mode 100644
index 59dfa70..0000000
Binary files a/src/java/test/data/buffersize/snapshot/version-2/snapshot.2 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/invalidsnap/version-2/log.1
----------------------------------------------------------------------
diff --git a/src/java/test/data/invalidsnap/version-2/log.1 b/src/java/test/data/invalidsnap/version-2/log.1
deleted file mode 100644
index 9dc15ae..0000000
Binary files a/src/java/test/data/invalidsnap/version-2/log.1 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/invalidsnap/version-2/log.274
----------------------------------------------------------------------
diff --git a/src/java/test/data/invalidsnap/version-2/log.274 b/src/java/test/data/invalidsnap/version-2/log.274
deleted file mode 100644
index 3bb868e..0000000
Binary files a/src/java/test/data/invalidsnap/version-2/log.274 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/invalidsnap/version-2/log.42
----------------------------------------------------------------------
diff --git a/src/java/test/data/invalidsnap/version-2/log.42 b/src/java/test/data/invalidsnap/version-2/log.42
deleted file mode 100644
index 5385be5..0000000
Binary files a/src/java/test/data/invalidsnap/version-2/log.42 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/invalidsnap/version-2/log.63b
----------------------------------------------------------------------
diff --git a/src/java/test/data/invalidsnap/version-2/log.63b b/src/java/test/data/invalidsnap/version-2/log.63b
deleted file mode 100644
index 4ee0a98..0000000
Binary files a/src/java/test/data/invalidsnap/version-2/log.63b and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/invalidsnap/version-2/snapshot.0
----------------------------------------------------------------------
diff --git a/src/java/test/data/invalidsnap/version-2/snapshot.0 b/src/java/test/data/invalidsnap/version-2/snapshot.0
deleted file mode 100644
index 49b512e..0000000
Binary files a/src/java/test/data/invalidsnap/version-2/snapshot.0 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/invalidsnap/version-2/snapshot.272
----------------------------------------------------------------------
diff --git a/src/java/test/data/invalidsnap/version-2/snapshot.272 b/src/java/test/data/invalidsnap/version-2/snapshot.272
deleted file mode 100644
index 71f32a5..0000000
Binary files a/src/java/test/data/invalidsnap/version-2/snapshot.272 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/invalidsnap/version-2/snapshot.273
----------------------------------------------------------------------
diff --git a/src/java/test/data/invalidsnap/version-2/snapshot.273 b/src/java/test/data/invalidsnap/version-2/snapshot.273
deleted file mode 100644
index 3146f56..0000000
Binary files a/src/java/test/data/invalidsnap/version-2/snapshot.273 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/invalidsnap/version-2/snapshot.639
----------------------------------------------------------------------
diff --git a/src/java/test/data/invalidsnap/version-2/snapshot.639 b/src/java/test/data/invalidsnap/version-2/snapshot.639
deleted file mode 100644
index cf9e389..0000000
Binary files a/src/java/test/data/invalidsnap/version-2/snapshot.639 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/invalidsnap/version-2/snapshot.83f
----------------------------------------------------------------------
diff --git a/src/java/test/data/invalidsnap/version-2/snapshot.83f b/src/java/test/data/invalidsnap/version-2/snapshot.83f
deleted file mode 100644
index 26dc5f6..0000000
Binary files a/src/java/test/data/invalidsnap/version-2/snapshot.83f and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/kerberos/minikdc-krb5.conf
----------------------------------------------------------------------
diff --git a/src/java/test/data/kerberos/minikdc-krb5.conf b/src/java/test/data/kerberos/minikdc-krb5.conf
deleted file mode 100644
index 43ec7c4..0000000
--- a/src/java/test/data/kerberos/minikdc-krb5.conf
+++ /dev/null
@@ -1,30 +0,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.
-#
-# This resource is originally from HDFS, see the similarly named files there
-# in case of bug fixing, history, etc.
-# Branch : trunk
-# Github Revision: 1d1ab587e4e92ce3aea4cb144811f69145cb3b33
-#
-[libdefaults]
-    default_realm = {0}
-    udp_preference_limit = 1
-
-[realms]
-    {0} = '{'
-        kdc = {1}:{2}
-    '}'
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/kerberos/minikdc.ldiff
----------------------------------------------------------------------
diff --git a/src/java/test/data/kerberos/minikdc.ldiff b/src/java/test/data/kerberos/minikdc.ldiff
deleted file mode 100644
index 20c8d77..0000000
--- a/src/java/test/data/kerberos/minikdc.ldiff
+++ /dev/null
@@ -1,52 +0,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.
-#
-# This resource is originally from HDFS, see the similarly named files there
-# in case of bug fixing, history, etc.
-# Branch : trunk
-# Github Revision: 1d1ab587e4e92ce3aea4cb144811f69145cb3b33
-#
-dn: ou=users,dc=${0},dc=${1}
-objectClass: organizationalUnit
-objectClass: top
-ou: users
-
-dn: uid=krbtgt,ou=users,dc=${0},dc=${1}
-objectClass: top
-objectClass: person
-objectClass: inetOrgPerson
-objectClass: krb5principal
-objectClass: krb5kdcentry
-cn: KDC Service
-sn: Service
-uid: krbtgt
-userPassword: secret
-krb5PrincipalName: krbtgt/${2}.${3}@${2}.${3}
-krb5KeyVersionNumber: 0
-
-dn: uid=ldap,ou=users,dc=${0},dc=${1}
-objectClass: top
-objectClass: person
-objectClass: inetOrgPerson
-objectClass: krb5principal
-objectClass: krb5kdcentry
-cn: LDAP
-sn: Service
-uid: ldap
-userPassword: secret
-krb5PrincipalName: ldap/${4}@${2}.${3}
-krb5KeyVersionNumber: 0
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/ssl/README.md
----------------------------------------------------------------------
diff --git a/src/java/test/data/ssl/README.md b/src/java/test/data/ssl/README.md
deleted file mode 100644
index b8823d8..0000000
--- a/src/java/test/data/ssl/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-SSL test data
-===================
-
-testKeyStore.jks
----
-Testing keystore, password is "testpass".
-
-testTrustStore.jks
----
-Testing truststore, password is "testpass".

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/ssl/testKeyStore.jks
----------------------------------------------------------------------
diff --git a/src/java/test/data/ssl/testKeyStore.jks b/src/java/test/data/ssl/testKeyStore.jks
deleted file mode 100644
index 40a7d0b..0000000
Binary files a/src/java/test/data/ssl/testKeyStore.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/ssl/testTrustStore.jks
----------------------------------------------------------------------
diff --git a/src/java/test/data/ssl/testTrustStore.jks b/src/java/test/data/ssl/testTrustStore.jks
deleted file mode 100644
index 33f09c1..0000000
Binary files a/src/java/test/data/ssl/testTrustStore.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/upgrade/log.100000001
----------------------------------------------------------------------
diff --git a/src/java/test/data/upgrade/log.100000001 b/src/java/test/data/upgrade/log.100000001
deleted file mode 100644
index 00655f1..0000000
Binary files a/src/java/test/data/upgrade/log.100000001 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/upgrade/log.100001bf0
----------------------------------------------------------------------
diff --git a/src/java/test/data/upgrade/log.100001bf0 b/src/java/test/data/upgrade/log.100001bf0
deleted file mode 100644
index 83fa697..0000000
Binary files a/src/java/test/data/upgrade/log.100001bf0 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/upgrade/snapshot.100000000
----------------------------------------------------------------------
diff --git a/src/java/test/data/upgrade/snapshot.100000000 b/src/java/test/data/upgrade/snapshot.100000000
deleted file mode 100644
index 56f9015..0000000
Binary files a/src/java/test/data/upgrade/snapshot.100000000 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/data/upgrade/snapshot.100001bec
----------------------------------------------------------------------
diff --git a/src/java/test/data/upgrade/snapshot.100001bec b/src/java/test/data/upgrade/snapshot.100001bec
deleted file mode 100644
index 0010d1e..0000000
Binary files a/src/java/test/data/upgrade/snapshot.100001bec and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/org/apache/zookeeper/ClientCnxnSocketTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/ClientCnxnSocketTest.java b/src/java/test/org/apache/zookeeper/ClientCnxnSocketTest.java
deleted file mode 100644
index 054e1ed..0000000
--- a/src/java/test/org/apache/zookeeper/ClientCnxnSocketTest.java
+++ /dev/null
@@ -1,53 +0,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.
- */
-package org.apache.zookeeper;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.zookeeper.client.ZKClientConfig;
-import org.apache.zookeeper.common.ZKConfig;
-import org.junit.Test;
-
-public class ClientCnxnSocketTest {
-
-    @Test
-    public void testWhenInvalidJuteMaxBufferIsConfiguredIOExceptionIsThrown() {
-        ZKClientConfig clientConfig = new ZKClientConfig();
-        String value = "SomeInvalidInt";
-        clientConfig.setProperty(ZKConfig.JUTE_MAXBUFFER, value);
-        // verify ClientCnxnSocketNIO creation
-        try {
-            new ClientCnxnSocketNIO(clientConfig);
-            fail("IOException is expected.");
-        } catch (IOException e) {
-            assertTrue(e.getMessage().contains(value));
-        }
-        // verify ClientCnxnSocketNetty creation
-        try {
-            new ClientCnxnSocketNetty(clientConfig);
-            fail("IOException is expected.");
-        } catch (IOException e) {
-            assertTrue(e.getMessage().contains(value));
-        }
-
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/org/apache/zookeeper/ClientReconnectTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/ClientReconnectTest.java b/src/java/test/org/apache/zookeeper/ClientReconnectTest.java
deleted file mode 100644
index 566b915..0000000
--- a/src/java/test/org/apache/zookeeper/ClientReconnectTest.java
+++ /dev/null
@@ -1,78 +0,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.
- */
-package org.apache.zookeeper;
-
-
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.channels.SocketChannel;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.zookeeper.client.ZKClientConfig;
-import org.apache.zookeeper.client.HostProvider;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class ClientReconnectTest extends ZKTestCase {
-    private SocketChannel sc;
-    private CountDownLatch countDownLatch = new CountDownLatch(3);
-    
-    class MockCnxn extends ClientCnxnSocketNIO {
-        MockCnxn() throws IOException {
-            super(new ZKClientConfig());
-        }
-
-        @Override
-        void registerAndConnect(SocketChannel sock, InetSocketAddress addr) throws
-        IOException {
-            countDownLatch.countDown();
-            throw new IOException("failed to register");
-        }
-
-        @Override
-        SocketChannel createSock() {
-            return sc;
-        }
-    }
-
-    @Test
-    public void testClientReconnect() throws IOException, InterruptedException {
-        HostProvider hostProvider = mock(HostProvider.class);
-        when(hostProvider.size()).thenReturn(1);
-        InetSocketAddress inaddr = new InetSocketAddress("127.0.0.1", 1111);
-        when(hostProvider.next(anyLong())).thenReturn(inaddr);
-        ZooKeeper zk = mock(ZooKeeper.class);
-        when(zk.getClientConfig()).thenReturn(new ZKClientConfig());
-        sc =  SocketChannel.open();
-
-        ClientCnxnSocketNIO nioCnxn = new MockCnxn();
-        ClientWatchManager watcher = mock(ClientWatchManager.class);
-        ClientCnxn clientCnxn = new ClientCnxn(
-                "tmp", hostProvider, 5000,
-                zk, watcher, nioCnxn, false);
-        clientCnxn.start();
-        countDownLatch.await(5000, TimeUnit.MILLISECONDS);
-        Assert.assertTrue(countDownLatch.getCount() == 0);
-        clientCnxn.close();
-    }
-}

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/org/apache/zookeeper/ClientRequestTimeoutTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/ClientRequestTimeoutTest.java b/src/java/test/org/apache/zookeeper/ClientRequestTimeoutTest.java
deleted file mode 100644
index 4f5548d..0000000
--- a/src/java/test/org/apache/zookeeper/ClientRequestTimeoutTest.java
+++ /dev/null
@@ -1,165 +0,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.
- */
-
-package org.apache.zookeeper;
-
-import static org.apache.zookeeper.test.ClientBase.CONNECTION_TIMEOUT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.zookeeper.ZooDefs.Ids;
-import org.apache.zookeeper.client.HostProvider;
-import org.apache.zookeeper.server.quorum.QuorumPeerTestBase;
-import org.apache.zookeeper.test.ClientBase;
-import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class ClientRequestTimeoutTest extends QuorumPeerTestBase {
-    private static final int SERVER_COUNT = 3;
-    private boolean dropPacket = false;
-    private int dropPacketType = ZooDefs.OpCode.create;
-
-    @Test(timeout = 120000)
-    public void testClientRequestTimeout() throws Exception {
-        int requestTimeOut = 15000;
-        System.setProperty("zookeeper.request.timeout",
-                Integer.toString(requestTimeOut));
-        final int clientPorts[] = new int[SERVER_COUNT];
-        StringBuilder sb = new StringBuilder();
-        String server;
-
-        for (int i = 0; i < SERVER_COUNT; i++) {
-            clientPorts[i] = PortAssignment.unique();
-            server = "server." + i + "=127.0.0.1:" + PortAssignment.unique()
-                    + ":" + PortAssignment.unique() + ":participant;127.0.0.1:"
-                    + clientPorts[i];
-            sb.append(server + "\n");
-        }
-        String currentQuorumCfgSection = sb.toString();
-        MainThread mt[] = new MainThread[SERVER_COUNT];
-
-        for (int i = 0; i < SERVER_COUNT; i++) {
-            mt[i] = new MainThread(i, clientPorts[i], currentQuorumCfgSection,
-                    false);
-            mt[i].start();
-        }
-
-        // ensure server started
-        for (int i = 0; i < SERVER_COUNT; i++) {
-            Assert.assertTrue("waiting for server " + i + " being up",
-                    ClientBase.waitForServerUp("127.0.0.1:" + clientPorts[i],
-                            CONNECTION_TIMEOUT));
-        }
-
-        CountdownWatcher watch1 = new CountdownWatcher();
-        CustomZooKeeper zk = new CustomZooKeeper(getCxnString(clientPorts),
-                ClientBase.CONNECTION_TIMEOUT, watch1);
-        watch1.waitForConnected(ClientBase.CONNECTION_TIMEOUT);
-
-        String data = "originalData";
-        // lets see one successful operation
-        zk.create("/clientHang1", data.getBytes(), Ids.OPEN_ACL_UNSAFE,
-                CreateMode.PERSISTENT_SEQUENTIAL);
-
-        // now make environment for client hang
-        dropPacket = true;
-        dropPacketType = ZooDefs.OpCode.create;
-
-        // Test synchronous API
-        try {
-            zk.create("/clientHang2", data.getBytes(), Ids.OPEN_ACL_UNSAFE,
-                    CreateMode.PERSISTENT);
-            fail("KeeperException is expected.");
-        } catch (KeeperException exception) {
-            assertEquals(KeeperException.Code.REQUESTTIMEOUT.intValue(),
-                    exception.code().intValue());
-        }
-        // reset the error behavior
-        dropPacket = false;
-        watch1.waitForConnected(ClientBase.CONNECTION_TIMEOUT);
-
-        String path = "/clientHang3";
-        String create = zk.create(path, data.getBytes(), Ids.OPEN_ACL_UNSAFE,
-                CreateMode.PERSISTENT);
-        assertEquals(path, create);
-
-        // do cleanup
-        zk.close();
-        for (int i = 0; i < SERVER_COUNT; i++) {
-            mt[i].shutdown();
-        }
-    }
-
-    /**
-     * @return connection string in the form of
-     *         127.0.0.1:port1,127.0.0.1:port2,127.0.0.1:port3
-     */
-    private String getCxnString(int[] clientPorts) {
-        StringBuffer hostPortBuffer = new StringBuffer();
-        for (int i = 0; i < clientPorts.length; i++) {
-            hostPortBuffer.append("127.0.0.1:");
-            hostPortBuffer.append(clientPorts[i]);
-            if (i != (clientPorts.length - 1)) {
-                hostPortBuffer.append(',');
-            }
-        }
-        return hostPortBuffer.toString();
-    }
-
-    class CustomClientCnxn extends ClientCnxn {
-
-        public CustomClientCnxn(String chrootPath, HostProvider hostProvider,
-                int sessionTimeout, ZooKeeper zooKeeper,
-                ClientWatchManager watcher, ClientCnxnSocket clientCnxnSocket,
-                boolean canBeReadOnly) throws IOException {
-            super(chrootPath, hostProvider, sessionTimeout, zooKeeper, watcher,
-                    clientCnxnSocket, canBeReadOnly);
-        }
-
-        @Override
-        public void finishPacket(Packet p) {
-            if (dropPacket && p.requestHeader.getType() == dropPacketType) {
-                // do nothing, just return, it is the same as packet is dropped
-                // by the network
-                return;
-            }
-            super.finishPacket(p);
-        }
-    }
-
-    class CustomZooKeeper extends ZooKeeper {
-        public CustomZooKeeper(String connectString, int sessionTimeout,
-                Watcher watcher) throws IOException {
-            super(connectString, sessionTimeout, watcher);
-        }
-
-        @Override
-        protected ClientCnxn createConnection(String chrootPath,
-                HostProvider hostProvider, int sessionTimeout,
-                ZooKeeper zooKeeper, ClientWatchManager watcher,
-                ClientCnxnSocket clientCnxnSocket, boolean canBeReadOnly)
-                        throws IOException {
-            return new CustomClientCnxn(chrootPath, hostProvider,
-                    sessionTimeout, zooKeeper, watcher, clientCnxnSocket,
-                    canBeReadOnly);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/org/apache/zookeeper/CustomHostProviderTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/CustomHostProviderTest.java b/src/java/test/org/apache/zookeeper/CustomHostProviderTest.java
deleted file mode 100644
index f9762d2..0000000
--- a/src/java/test/org/apache/zookeeper/CustomHostProviderTest.java
+++ /dev/null
@@ -1,79 +0,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.
- */
-package org.apache.zookeeper;
-
-import org.apache.zookeeper.client.HostProvider;
-import org.apache.zookeeper.test.ClientBase;
-import org.junit.Assert;
-import org.junit.Test;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.Collection;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class CustomHostProviderTest extends ZKTestCase implements Watcher {
-    private AtomicInteger counter = new AtomicInteger(3);
-
-    private class SpecialHostProvider implements HostProvider {
-        // ignores its connectstring, and next() always returns localhost:2181
-        // it will count down when updateServerList() is called
-        @Override
-        public int size() {
-            return 1;
-        }
-        @Override
-        public InetSocketAddress next(long spinDelay) {
-            return new InetSocketAddress("127.0.0.1", 2181);
-        }
-        @Override
-        public void onConnected() {
-        }
-        @Override
-        public boolean updateServerList(Collection<InetSocketAddress>
-                serverAddresses, InetSocketAddress currentHost) {
-            counter.decrementAndGet();
-            return false;
-        }
-    }
-    @Override
-    public void process(WatchedEvent event) {
-    }
-
-    @Test
-    public void testZooKeeperWithCustomHostProvider() throws IOException,
-            InterruptedException {
-        final int CLIENT_PORT = PortAssignment.unique();
-        final HostProvider specialHostProvider = new SpecialHostProvider();
-        int expectedCounter = 3;
-        counter.set(expectedCounter);
-
-        ZooKeeper zkDefaults = new ZooKeeper("127.0.0.1:" + CLIENT_PORT,
-                ClientBase.CONNECTION_TIMEOUT, this, false);
-
-        ZooKeeper zkSpecial = new ZooKeeper("127.0.0.1:" + CLIENT_PORT,
-                ClientBase.CONNECTION_TIMEOUT, this, false, specialHostProvider);
-
-        Assert.assertTrue(counter.get() == expectedCounter);
-        zkDefaults.updateServerList("127.0.0.1:" + PortAssignment.unique());
-        Assert.assertTrue(counter.get() == expectedCounter);
-
-        zkSpecial.updateServerList("127.0.0.1:" + PortAssignment.unique());
-        expectedCounter--;
-        Assert.assertTrue(counter.get() == expectedCounter);
-    }
-}

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/test/org/apache/zookeeper/JUnit4ZKTestRunner.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/JUnit4ZKTestRunner.java b/src/java/test/org/apache/zookeeper/JUnit4ZKTestRunner.java
deleted file mode 100644
index 3456a15..0000000
--- a/src/java/test/org/apache/zookeeper/JUnit4ZKTestRunner.java
+++ /dev/null
@@ -1,110 +0,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.
- */
-
-package org.apache.zookeeper;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.junit.Test;
-import org.junit.internal.runners.statements.InvokeMethod;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.InitializationError;
-import org.junit.runners.model.Statement;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * The sole responsibility of this class is to print to the log when a test
- * starts and when it finishes.
- */
-public class JUnit4ZKTestRunner extends BlockJUnit4ClassRunner {
-    private static final Logger LOG = LoggerFactory.getLogger(JUnit4ZKTestRunner.class);
-
-    public JUnit4ZKTestRunner(Class<?> klass) throws InitializationError {
-        super(klass);
-    }
-
-    public static List<FrameworkMethod> computeTestMethodsForClass(final Class klass, final List<FrameworkMethod> defaultMethods) {
-        List<FrameworkMethod> list = defaultMethods;
-        String methodName = System.getProperty("test.method");
-        if (methodName == null) {
-            LOG.info("No test.method specified. using default methods.");
-        } else {
-            LOG.info("Picked up test.method={}", methodName);
-            try {
-                list = Arrays.asList(new FrameworkMethod(klass.getMethod(methodName)));
-            } catch (NoSuchMethodException nsme) {
-                LOG.warn("{} does not have test.method={}. failing to default methods.", klass.getName(), methodName);
-            }
-        }
-        return list;
-    }
-
-
-    @Override
-    protected List<FrameworkMethod> computeTestMethods() {
-        return computeTestMethodsForClass(getTestClass().getJavaClass(), super.computeTestMethods());
-    }
-
-    public static class LoggedInvokeMethod extends InvokeMethod {
-        private final FrameworkMethod method;
-        private final String name;
-
-        public LoggedInvokeMethod(FrameworkMethod method, Object target) {
-            super(method, target);
-            this.method = method;
-            name = method.getName();
-        }
-
-        @Override
-        public void evaluate() throws Throwable {
-            LOG.info("RUNNING TEST METHOD {}", name);
-            try {
-                super.evaluate();
-                Runtime rt = Runtime.getRuntime();
-                long usedKB = (rt.totalMemory() - rt.freeMemory()) / 1024;
-                LOG.info("Memory used {}", usedKB);
-                ThreadGroup tg = Thread.currentThread().getThreadGroup();
-                while (tg.getParent() != null) {
-                    tg = tg.getParent();
-                }
-                LOG.info("Number of threads {}", tg.activeCount());
-            } catch (Throwable t) {
-                // The test method threw an exception, but it might be an
-                // expected exception as defined in the @Test annotation.
-                // Check the annotation and log an appropriate message.
-                Test annotation = this.method.getAnnotation(Test.class);
-                if (annotation != null && annotation.expected() != null &&
-                        annotation.expected().isAssignableFrom(t.getClass())) {
-                    LOG.info("TEST METHOD {} THREW EXPECTED EXCEPTION {}", name,
-                        annotation.expected());
-                } else {
-                    LOG.info("TEST METHOD FAILED {}", name, t);
-                }
-                throw t;
-            }
-            LOG.info("FINISHED TEST METHOD {}", name);
-        }
-    }
-
-    @Override
-    protected Statement methodInvoker(FrameworkMethod method, Object test) {
-        return new LoggedInvokeMethod(method, test);
-    }
-}


Mime
View raw message