zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject [22/22] zookeeper git commit: ZOOKEEPER-3031: MAVEN MIGRATION - Step 1.4 - move client dir
Date Tue, 21 Aug 2018 05:31:22 GMT
ZOOKEEPER-3031: MAVEN MIGRATION - Step 1.4 - move client dir

Author: Norbert Kalmar <nkalmar@yahoo.com>

Reviewers: andor@apache.org

Closes #597 from nkalmar/ZOOKEEPER-3031


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/176bd682
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/176bd682
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/176bd682

Branch: refs/heads/master
Commit: 176bd68222f3a3bddac9deb412eee7f538cb01ca
Parents: 290f1fc
Author: Norbert Kalmar <nkalmar@yahoo.com>
Authored: Tue Aug 21 07:30:53 2018 +0200
Committer: Andor Molnar <andor@apache.org>
Committed: Tue Aug 21 07:30:53 2018 +0200

----------------------------------------------------------------------
 .gitignore                                      |   36 +-
 build.xml                                       |   27 +-
 docs/zookeeperProgrammers.html                  |   10 +-
 src/c/CMakeLists.txt                            |  250 -
 src/c/ChangeLog                                 |  116 -
 src/c/INSTALL                                   |  234 -
 src/c/LICENSE                                   |  202 -
 src/c/Makefile.am                               |  147 -
 src/c/NOTICE.txt                                |   41 -
 src/c/README                                    |  160 -
 src/c/acinclude.m4                              |  312 --
 src/c/aminclude.am                              |  186 -
 src/c/c-doc.Doxyfile                            | 1252 -----
 src/c/cmake_config.h.in                         |  157 -
 src/c/configure.ac                              |  213 -
 src/c/include/proto.h                           |   51 -
 src/c/include/recordio.h                        |   80 -
 src/c/include/winconfig.h                       |   15 -
 src/c/include/zookeeper.h                       | 2115 --------
 src/c/include/zookeeper_log.h                   |   50 -
 src/c/include/zookeeper_version.h               |   33 -
 src/c/src/addrvec.c                             |  253 -
 src/c/src/addrvec.h                             |  138 -
 src/c/src/cli.c                                 |  836 ---
 src/c/src/hashtable/LICENSE.txt                 |   30 -
 src/c/src/hashtable/hashtable.c                 |  274 -
 src/c/src/hashtable/hashtable.h                 |  209 -
 src/c/src/hashtable/hashtable_itr.c             |  176 -
 src/c/src/hashtable/hashtable_itr.h             |  119 -
 src/c/src/hashtable/hashtable_private.h         |   85 -
 src/c/src/load_gen.c                            |  282 -
 src/c/src/mt_adaptor.c                          |  551 --
 src/c/src/recordio.c                            |  372 --
 src/c/src/st_adaptor.c                          |  105 -
 src/c/src/winport.c                             |  307 --
 src/c/src/winport.h                             |  139 -
 src/c/src/zk_adaptor.h                          |  325 --
 src/c/src/zk_hashtable.c                        |  476 --
 src/c/src/zk_hashtable.h                        |   86 -
 src/c/src/zk_log.c                              |  203 -
 src/c/src/zookeeper.c                           | 4916 ------------------
 src/c/tests/CollectionUtil.h                    |  195 -
 src/c/tests/CppAssertHelper.h                   |   37 -
 src/c/tests/LibCMocks.cc                        |  347 --
 src/c/tests/LibCMocks.h                         |  408 --
 src/c/tests/LibCSymTable.cc                     |   87 -
 src/c/tests/LibCSymTable.h                      |  111 -
 src/c/tests/MocksBase.cc                        |   36 -
 src/c/tests/MocksBase.h                         |   36 -
 src/c/tests/PthreadMocks.cc                     |  106 -
 src/c/tests/PthreadMocks.h                      |  449 --
 src/c/tests/TestClient.cc                       | 1447 ------
 src/c/tests/TestClientRetry.cc                  |  147 -
 src/c/tests/TestDriver.cc                       |  173 -
 src/c/tests/TestLogClientEnv.cc                 |   59 -
 src/c/tests/TestMulti.cc                        |  703 ---
 src/c/tests/TestOperations.cc                   |  710 ---
 src/c/tests/TestReadOnlyClient.cc               |  110 -
 src/c/tests/TestReconfig.cc                     |  616 ---
 src/c/tests/TestReconfigServer.cc               |  420 --
 src/c/tests/TestWatchers.cc                     |  773 ---
 src/c/tests/TestZookeeperClose.cc               |  473 --
 src/c/tests/TestZookeeperInit.cc                |  301 --
 src/c/tests/ThreadingUtil.cc                    |   87 -
 src/c/tests/ThreadingUtil.h                     |  261 -
 src/c/tests/Util.cc                             |   51 -
 src/c/tests/Util.h                              |  137 -
 src/c/tests/Vector.h                            |   37 -
 src/c/tests/WatchUtil.h                         |  153 -
 src/c/tests/ZKMocks.cc                          |  544 --
 src/c/tests/ZKMocks.h                           |  511 --
 src/c/tests/ZooKeeperQuorumServer.cc            |  230 -
 src/c/tests/ZooKeeperQuorumServer.h             |   64 -
 src/c/tests/quorum.cfg                          |    8 -
 src/c/tests/wrappers-mt.opt                     |    3 -
 src/c/tests/wrappers.opt                        |    7 -
 src/c/tests/zkServer.sh                         |  181 -
 .../zookeeper-client-c/CMakeLists.txt           |  250 +
 zookeeper-client/zookeeper-client-c/ChangeLog   |  116 +
 zookeeper-client/zookeeper-client-c/INSTALL     |  234 +
 zookeeper-client/zookeeper-client-c/LICENSE     |  202 +
 zookeeper-client/zookeeper-client-c/Makefile.am |  147 +
 zookeeper-client/zookeeper-client-c/NOTICE.txt  |   41 +
 zookeeper-client/zookeeper-client-c/README      |  161 +
 .../zookeeper-client-c/acinclude.m4             |  312 ++
 .../zookeeper-client-c/aminclude.am             |  186 +
 .../zookeeper-client-c/c-doc.Doxyfile           | 1252 +++++
 .../zookeeper-client-c/cmake_config.h.in        |  157 +
 .../zookeeper-client-c/configure.ac             |  213 +
 .../zookeeper-client-c/include/proto.h          |   51 +
 .../zookeeper-client-c/include/recordio.h       |   80 +
 .../zookeeper-client-c/include/winconfig.h      |   15 +
 .../zookeeper-client-c/include/zookeeper.h      | 2115 ++++++++
 .../zookeeper-client-c/include/zookeeper_log.h  |   50 +
 .../include/zookeeper_version.h                 |   33 +
 .../zookeeper-client-c/src/addrvec.c            |  253 +
 .../zookeeper-client-c/src/addrvec.h            |  138 +
 zookeeper-client/zookeeper-client-c/src/cli.c   |  836 +++
 .../src/hashtable/LICENSE.txt                   |   30 +
 .../src/hashtable/hashtable.c                   |  274 +
 .../src/hashtable/hashtable.h                   |  209 +
 .../src/hashtable/hashtable_itr.c               |  176 +
 .../src/hashtable/hashtable_itr.h               |  119 +
 .../src/hashtable/hashtable_private.h           |   85 +
 .../zookeeper-client-c/src/load_gen.c           |  282 +
 .../zookeeper-client-c/src/mt_adaptor.c         |  551 ++
 .../zookeeper-client-c/src/recordio.c           |  372 ++
 .../zookeeper-client-c/src/st_adaptor.c         |  105 +
 .../zookeeper-client-c/src/winport.c            |  307 ++
 .../zookeeper-client-c/src/winport.h            |  139 +
 .../zookeeper-client-c/src/zk_adaptor.h         |  325 ++
 .../zookeeper-client-c/src/zk_hashtable.c       |  476 ++
 .../zookeeper-client-c/src/zk_hashtable.h       |   86 +
 .../zookeeper-client-c/src/zk_log.c             |  203 +
 .../zookeeper-client-c/src/zookeeper.c          | 4916 ++++++++++++++++++
 .../zookeeper-client-c/tests/CollectionUtil.h   |  195 +
 .../zookeeper-client-c/tests/CppAssertHelper.h  |   37 +
 .../zookeeper-client-c/tests/LibCMocks.cc       |  347 ++
 .../zookeeper-client-c/tests/LibCMocks.h        |  408 ++
 .../zookeeper-client-c/tests/LibCSymTable.cc    |   87 +
 .../zookeeper-client-c/tests/LibCSymTable.h     |  111 +
 .../zookeeper-client-c/tests/MocksBase.cc       |   36 +
 .../zookeeper-client-c/tests/MocksBase.h        |   36 +
 .../zookeeper-client-c/tests/PthreadMocks.cc    |  106 +
 .../zookeeper-client-c/tests/PthreadMocks.h     |  449 ++
 .../zookeeper-client-c/tests/TestClient.cc      | 1447 ++++++
 .../zookeeper-client-c/tests/TestClientRetry.cc |  147 +
 .../zookeeper-client-c/tests/TestDriver.cc      |  173 +
 .../tests/TestLogClientEnv.cc                   |   59 +
 .../zookeeper-client-c/tests/TestMulti.cc       |  703 +++
 .../zookeeper-client-c/tests/TestOperations.cc  |  710 +++
 .../tests/TestReadOnlyClient.cc                 |  110 +
 .../zookeeper-client-c/tests/TestReconfig.cc    |  616 +++
 .../tests/TestReconfigServer.cc                 |  420 ++
 .../zookeeper-client-c/tests/TestWatchers.cc    |  773 +++
 .../tests/TestZookeeperClose.cc                 |  473 ++
 .../tests/TestZookeeperInit.cc                  |  301 ++
 .../zookeeper-client-c/tests/ThreadingUtil.cc   |   87 +
 .../zookeeper-client-c/tests/ThreadingUtil.h    |  261 +
 .../zookeeper-client-c/tests/Util.cc            |   51 +
 .../zookeeper-client-c/tests/Util.h             |  137 +
 .../zookeeper-client-c/tests/Vector.h           |   37 +
 .../zookeeper-client-c/tests/WatchUtil.h        |  153 +
 .../zookeeper-client-c/tests/ZKMocks.cc         |  544 ++
 .../zookeeper-client-c/tests/ZKMocks.h          |  511 ++
 .../tests/ZooKeeperQuorumServer.cc              |  230 +
 .../tests/ZooKeeperQuorumServer.h               |   64 +
 .../zookeeper-client-c/tests/quorum.cfg         |    8 +
 .../zookeeper-client-c/tests/wrappers-mt.opt    |    3 +
 .../zookeeper-client-c/tests/wrappers.opt       |    7 +
 .../zookeeper-client-c/tests/zkServer.sh        |  181 +
 .../src/python/setup.py                         |    8 +-
 .../content/xdocs/zookeeperProgrammers.xml      |   10 +-
 .../src/main/c/configure.ac                     |    4 +-
 .../src/main/c/configure.ac                     |    4 +-
 155 files changed, 25565 insertions(+), 25563 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/176bd682/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index c5bd7f5..226df68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,24 +59,24 @@ tags
 .cproject
 .project
 obj
-src/c/core.*
-src/c/TEST-*.txt
-src/c/*.la
-src/c/*.lo
-src/c/*.o
-src/c/generated/
+zookeeper-client/zookeeper-client-c/core.*
+zookeeper-client/zookeeper-client-c/TEST-*.txt
+zookeeper-client/zookeeper-client-c/*.la
+zookeeper-client/zookeeper-client-c/*.lo
+zookeeper-client/zookeeper-client-c/*.o
+zookeeper-client/zookeeper-client-c/generated/
 src/java/generated/
 src/java/lib/ant-eclipse-*
 src/java/lib/ivy-*
-src/c/Makefile.in
-src/c/aclocal.m4
-src/c/autom4te.cache/
-src/c/compile
-src/c/config.guess
-src/c/config.h.in
-src/c/config.sub
-src/c/configure
-src/c/depcomp
-src/c/install-sh
-src/c/ltmain.sh
-src/c/missing
+zookeeper-client/zookeeper-client-c/Makefile.in
+zookeeper-client/zookeeper-client-c/aclocal.m4
+zookeeper-client/zookeeper-client-c/autom4te.cache/
+zookeeper-client/zookeeper-client-c/compile
+zookeeper-client/zookeeper-client-c/config.guess
+zookeeper-client/zookeeper-client-c/config.h.in
+zookeeper-client/zookeeper-client-c/config.sub
+zookeeper-client/zookeeper-client-c/configure
+zookeeper-client/zookeeper-client-c/depcomp
+zookeeper-client/zookeeper-client-c/install-sh
+zookeeper-client/zookeeper-client-c/ltmain.sh
+zookeeper-client/zookeeper-client-c/missing

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/176bd682/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index e73b047..0d72472 100644
--- a/build.xml
+++ b/build.xml
@@ -105,7 +105,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <property name="build.dir" value="${basedir}/build" />
     <property name="distribution" value="${basedir}/distribution" />
     <property name="src_generated.dir" value="${src.dir}/java/generated" />
-    <property name="c.src.dir" value="${src.dir}/c" />    
+    <property name="c.src.dir" value="${basedir}/zookeeper-client/zookeeper-client-c" />
     <property name="csrc_generated.dir" value="${c.src.dir}/generated" />
 
     <property name="jute.file" value="${src.dir}/zookeeper.jute" />
@@ -346,7 +346,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
         <java classname="org.apache.jute.compiler.generated.Rcc" fork="true" dir="${csrc_generated.dir}">
             <arg value="-l" />
             <arg value="c" />
-            <arg value="../../zookeeper.jute" />
+            <arg value="../../../src/zookeeper.jute" />
             <classpath>
                 <pathelement path="${build.classes}" />
             </classpath>
@@ -876,6 +876,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
           <include name="zookeeper-recipes/**"/>
           <include name="zookeeper-docs/**"/>
           <include name="zookeeper-contrib/**"/>
+          <include name="zookeeper-client/**"/>
         </fileset>
         <fileset file="src/pom.template"/>
       </copy>
@@ -1058,8 +1059,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
       <macro_tar param.destfile="${build.dir}/${final.name}-bin.tar.gz">
         <param.listofitems>
           <tarfileset dir="${build.dir}" mode="664">
-            <include name="${final.name}/src/c/**" />
-            <exclude name="${final.name}/src/c/generated/**" />
+            <include name="${final.name}/zookeeper-client/zookeeper-client-c/**" />
+            <exclude name="${final.name}/zookeeper-client/zookeeper-client-c/generated/**" />
           </tarfileset>
           <tarfileset dir="${build.dir}" mode="664">
             <exclude name="${final.name}/bin/*" />
@@ -1732,15 +1733,15 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
           <exclude name="**/zookeeper-docs/"/>
           <exclude name="**/lib/jdiff/"/>
           <exclude name="contrib/ZooInspector/src/main/java/com/nitido/utils/toaster/Toaster.java"/>
-          <exclude name="src/c/*.la"/>
-          <exclude name="src/c/*.lo"/>
-          <exclude name="src/c/.libs/"/>
-          <exclude name="src/c/autom4te.cache/**"/>
-          <exclude name="src/c/config**"/>
-          <exclude name="src/c/include/winstdint.h"/>
-          <exclude name="src/c/src/hashtable/"/>
-          <exclude name="src/c/test-driver"/>
-          <exclude name="src/c/tests/quorum.cfg"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/*.la"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/*.lo"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/.libs/"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/autom4te.cache/**"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/config**"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/include/winstdint.h"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/src/hashtable/"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/test-driver"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/tests/quorum.cfg"/>
           <exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/date.format.js"/>
           <exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.bar.js"/>
           <exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.dot.js"/>

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/176bd682/docs/zookeeperProgrammers.html
----------------------------------------------------------------------
diff --git a/docs/zookeeperProgrammers.html b/docs/zookeeperProgrammers.html
index 45d8b2f..c6e614e 100644
--- a/docs/zookeeperProgrammers.html
+++ b/docs/zookeeperProgrammers.html
@@ -1602,7 +1602,7 @@ document.write("Last Published: " + document.lastModified);
 <div class="content">
 <p>This is a very simple example which is intended to show
         how to interact with ZooKeeper ACLs
-        specifically. See <span class="codefrag filename">.../trunk/src/c/src/cli.c</span>
+        specifically. See <span class="codefrag filename">.../trunk/zookeeper-client/zookeeper-client-c/src/cli.c</span>
         for an example of a C client implementation</p>
       
 </div>
@@ -2182,14 +2182,14 @@ public abstract class ServerAuthenticationProvider implements AuthenticationProv
 <p>Run <span class="codefrag command">ant compile_jute</span> from the ZooKeeper
             top level directory (<span class="codefrag filename">.../trunk</span>).
             This will create a directory named "generated" under
-            <span class="codefrag filename">.../trunk/src/c</span>.</p>
+            <span class="codefrag filename">.../trunk/zookeeper-client/zookeeper-client-c</span>.</p>
           
 </li>
 
           
 <li>
             
-<p>Change directory to the<span class="codefrag filename">.../trunk/src/c</span>
+<p>Change directory to the<span class="codefrag filename">.../trunk/zookeeper-client/zookeeper-client-c</span>
             and run <span class="codefrag command">autoreconf -if</span> to bootstrap <strong>autoconf</strong>, <strong>automake</strong> and <strong>libtool</strong>. Make sure you have <strong>autoconf version 2.59</strong> or greater installed.
             Skip to step<strong> 4</strong>.</p>
           
@@ -2200,7 +2200,7 @@ public abstract class ServerAuthenticationProvider implements AuthenticationProv
             
 <p>If you are building from a project source package,
             unzip/untar the source tarball and cd to the<span class="codefrag filename">
-            zookeeper-x.x.x/src/c</span> directory.</p>
+            zookeeper-x.x.x/zookeeper-client/zookeeper-client-c</span> directory.</p>
           
 </li>
 
@@ -2331,7 +2331,7 @@ public abstract class ServerAuthenticationProvider implements AuthenticationProv
 <div class="note">
 <div class="label">Note</div>
 <div class="content">
-<p>See <span class="codefrag filename">.../trunk/src/c/src/cli.c</span>
+<p>See <span class="codefrag filename">.../trunk/zookeeper-client/zookeeper-client-c/src/cli.c</span>
           for an example of a C client implementation</p>
         
 </div>

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/176bd682/src/c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/c/CMakeLists.txt b/src/c/CMakeLists.txt
deleted file mode 100644
index af023e7..0000000
--- a/src/c/CMakeLists.txt
+++ /dev/null
@@ -1,250 +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.
-
-cmake_minimum_required(VERSION 3.5)
-
-project(zookeeper VERSION 3.6.0)
-set(email user@zookeeper.apache.org)
-set(description "zookeeper C client")
-
-# general options
-if(UNIX)
-  add_compile_options(-Wall -fPIC)
-elseif(WIN32)
-  add_compile_options(/W3)
-endif()
-add_definitions(-DUSE_STATIC_LIB)
-
-# TODO: Enable /WX and /W4 on Windows. Currently there are ~1000 warnings.
-# TODO: Add Solaris support.
-# TODO: Add a shared library option.
-# TODO: Specify symbols to export.
-# TODO: Generate doxygen documentation.
-
-# Sync API option
-option(WANT_SYNCAPI "Enables Sync API support" ON)
-if(WANT_SYNCAPI)
-  add_definitions(-DTHREADED)
-endif()
-
-# CppUnit option
-if(WIN32 OR APPLE)
-  # The tests do not yet compile on Windows or macOS,
-  # so we set this to off by default.
-  #
-  # Note that CMake does not have expressions except in conditionals,
-  # so we're left with this if/else/endif pattern.
-  set(DEFAULT_WANT_CPPUNIT OFF)
-else()
-  set(DEFAULT_WANT_CPPUNIT ON)
-endif()
-option(WANT_CPPUNIT "Enables CppUnit and tests" ${DEFAULT_WANT_CPPUNIT})
-
-# SOCK_CLOEXEC
-option(WANT_SOCK_CLOEXEC "Enables SOCK_CLOEXEC on sockets" OFF)
-include(CheckSymbolExists)
-check_symbol_exists(SOCK_CLOEXEC sys/socket.h HAVE_SOCK_CLOEXEC)
-if(WANT_SOCK_CLOEXEC AND HAVE_SOCK_CLOEXEC)
-  set(SOCK_CLOEXEC_ENABLED 1)
-endif()
-
-
-# The function `to_have(in out)` converts a header name like `arpa/inet.h`
-# into an Autotools style preprocessor definition `HAVE_ARPA_INET_H`.
-# This is then set or unset in `configure_file()` step.
-#
-# Note that CMake functions do not have return values; instead an "out"
-# variable must be passed, and explicitly set with parent scope.
-function(to_have in out)
-  string(TOUPPER ${in} str)
-  string(REGEX REPLACE "/|\\." "_" str ${str})
-  set(${out} "HAVE_${str}" PARENT_SCOPE)
-endfunction()
-
-# include file checks
-foreach(f generated/zookeeper.jute.h generated/zookeeper.jute.c)
-  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${f}")
-    to_have(${f} name)
-    set(${name} 1)
-  else()
-    message(FATAL_ERROR
-      "jute files are missing!\n"
-      "Please run 'ant compile_jute' while in the ZooKeeper top level directory.")
-  endif()
-endforeach()
-
-# header checks
-include(CheckIncludeFile)
-set(check_headers
-  arpa/inet.h
-  dlfcn.h
-  fcntl.h
-  inttypes.h
-  memory.h
-  netdb.h
-  netinet/in.h
-  stdint.h
-  stdlib.h
-  string.h
-  strings.h
-  sys/socket.h
-  sys/stat.h
-  sys/time.h
-  sys/types.h
-  unistd.h
-  sys/utsname.h)
-
-foreach(f ${check_headers})
-  to_have(${f} name)
-  check_include_file(${f} ${name})
-endforeach()
-
-# function checks
-include(CheckFunctionExists)
-set(check_functions
-  getcwd
-  gethostbyname
-  gethostname
-  getlogin
-  getpwuid_r
-  gettimeofday
-  getuid
-  memmove
-  memset
-  poll
-  socket
-  strchr
-  strdup
-  strerror
-  strtol)
-
-foreach(fn ${check_functions})
-  to_have(${fn} name)
-  check_function_exists(${fn} ${name})
-endforeach()
-
-# library checks
-set(check_libraries rt m pthread)
-foreach(lib ${check_libraries})
-  to_have("lib${lib}" name)
-  find_library(${name} ${lib})
-endforeach()
-
-# IPv6 check
-include(CheckStructHasMember)
-check_struct_has_member("struct sockaddr_in6" sin6_addr "netinet/in.h" ZOO_IPV6_ENABLED)
-
-# configure
-configure_file(cmake_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
-
-# hashtable library
-set(hashtable_sources src/hashtable/hashtable_itr.c src/hashtable/hashtable.c)
-add_library(hashtable STATIC ${hashtable_sources})
-target_include_directories(hashtable PUBLIC include)
-target_link_libraries(hashtable PUBLIC $<$<OR:$<PLATFORM_ID:Linux>,$<PLATFORM_ID:FreeBSD>>:m>)
-
-# zookeeper library
-set(zookeeper_sources
-  src/zookeeper.c
-  src/recordio.c
-  generated/zookeeper.jute.c
-  src/zk_log.c
-  src/zk_hashtable.c
-  src/addrvec.c)
-
-if(WANT_SYNCAPI)
-  list(APPEND zookeeper_sources src/mt_adaptor.c)
-else()
-  list(APPEND zookeeper_sources src/st_adaptor.c)
-endif()
-
-if(WIN32)
-  list(APPEND zookeeper_sources src/winport.c)
-endif()
-
-add_library(zookeeper STATIC ${zookeeper_sources})
-target_include_directories(zookeeper PUBLIC include ${CMAKE_CURRENT_BINARY_DIR}/include generated)
-target_link_libraries(zookeeper PUBLIC
-  hashtable
-  $<$<PLATFORM_ID:Linux>:rt> # clock_gettime
-  $<$<PLATFORM_ID:Windows>:ws2_32>) # Winsock 2.0
-
-if(WANT_SYNCAPI AND NOT WIN32)
-  find_package(Threads REQUIRED)
-  target_link_libraries(zookeeper PUBLIC Threads::Threads)
-endif()
-
-# cli executable
-add_executable(cli src/cli.c)
-target_link_libraries(cli zookeeper)
-
-# load_gen executable
-if(WANT_SYNCAPI AND NOT WIN32)
-  add_executable(load_gen src/load_gen.c)
-  target_link_libraries(load_gen zookeeper)
-endif()
-
-# tests
-set(test_sources
-  tests/TestDriver.cc
-  tests/LibCMocks.cc
-  tests/LibCSymTable.cc
-  tests/MocksBase.cc
-  tests/ZKMocks.cc
-  tests/Util.cc
-  tests/ThreadingUtil.cc
-  tests/TestZookeeperInit.cc
-  tests/TestZookeeperClose.cc
-  tests/TestReconfig.cc
-  tests/TestReconfigServer.cc
-  tests/TestClientRetry.cc
-  tests/TestOperations.cc
-  tests/TestMulti.cc
-  tests/TestWatchers.cc
-  tests/TestClient.cc
-  tests/ZooKeeperQuorumServer.cc
-  tests/TestReadOnlyClient.cc
-  tests/TestLogClientEnv.cc)
-
-if(WANT_SYNCAPI)
-  list(APPEND test_sources tests/PthreadMocks.cc)
-endif()
-
-if(WANT_CPPUNIT)
-  add_executable(zktest ${test_sources})
-  target_include_directories(zktest PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-
-  target_compile_definitions(zktest
-    PRIVATE -DZKSERVER_CMD="${CMAKE_CURRENT_SOURCE_DIR}/tests/zkServer.sh")
-  # TODO: Use `find_library()` for `cppunit`.
-  target_link_libraries(zktest zookeeper cppunit dl)
-
-  # This reads the link flags from the file `tests/wrappers.opt` into
-  # the variable `symbol_wrappers` for use in `target_link_libraries`.
-  # It is a holdover from the original build system.
-  file(STRINGS tests/wrappers.opt symbol_wrappers)
-  if(WANT_SYNCAPI)
-    file(STRINGS tests/wrappers-mt.opt symbol_wrappers_mt)
-  endif()
-
-  target_link_libraries(zktest ${symbol_wrappers} ${symbol_wrappers_mt})
-
-  enable_testing()
-  add_test(NAME zktest_runner COMMAND zktest)
-  set_property(TEST zktest_runner PROPERTY ENVIRONMENT
-    "ZKROOT=${CMAKE_CURRENT_SOURCE_DIR}/../.."
-    "CLASSPATH=$CLASSPATH:$CLOVER_HOME/lib/clover.jar")
-endif()

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/176bd682/src/c/ChangeLog
----------------------------------------------------------------------
diff --git a/src/c/ChangeLog b/src/c/ChangeLog
deleted file mode 100644
index c85a6c0..0000000
--- a/src/c/ChangeLog
+++ /dev/null
@@ -1,116 +0,0 @@
-Release 2.1.1
-2008-04-30 Andrew Kornev <akornev@users.sourceforge.net>
-
-    * changed the distributino package name to "c-client-src"
-    
-Release 2.1.0
-2008-04-30 Andrew Kornev <akornev@users.sourceforge.net>
-
-    * added the client latency diagnostics; the client prints a warning when the
-      reponse latency exceeds 20ms
-
-    * modified logging format to report the znode path for which the zookeeper 
-      operation is called
-
-    * fixed a minor bug where error messages were missing for some of the newer 
-      zookeeper error codes (ZCLOSING and ZNOTHING).
-
-    * improved logging by adding the XID to the message to make it easy to match
-      requests to responses
-
-    * fixed the bug causing sporadic session termination and timeouts
-
-    * added a new return code to zookeeper_process() -- ZNOTHING -- 
-      that indicates that the socket has no more data to read
-
-    * more unit tests added    
-
-Release 1.1.3
-2008-02-07 Andrew Kornev <akornev@users.sourceforge.net>
-
-    * get_xid() is not thread-safe (xid initialization race condition 
-      in the multi-threaded mode).
-    
-    * the I/O thread doesn�t automatically terminate on AUTH_FAILURE and 
-      SESSION_EXPIRED events.
-      
-    * all session events should be processed on the completion thread. 
-    
-    * PING operation doesn�t atomically enqueue the completion and 
-      send buffers like other operations do.
-      
-    * corrected zookeeper_init() doxygen docs.
-    
-    * new unit tests added.
-      
-
-Release 1.1.2
-2008-01-24 Andrew Kornev <akornev@users.sourceforge.net>
-
-    * fixed a race condition caused by the code in zookeeper_process()
-      and free_completions() setting sc->complete to 1 without proper
-      synchronization;
-
-    * fixed zoo_get() not updating buffer_len value with the actual
-      buffer length on return; added missing enter_critical/leave_critical
-      calls to the async ZK operations.
-
-    * Replaced select() with poll() to fix the problem with the FD_SET
-      macro causing stack corruption for FDs higher than 1024
-
-    * Added zoo_set_log_stream() to the public API. The function allows
-      applications to specify a different log file.
-
-    * Removed unused declarations from zookeeper.h (ACL related)
-
-    * changed zoo_get() signature to take a pointer to buffer length.
-      The function sets the parameter to the actual data length upon return.
-
-    * the watcher callback now takes the zhandle as its first parameter. This
-      is to avoid a race condition in the multi-threaded client when a watcher
-      is called before zookeeper_init() has returned.
-
-    * fixed zookeeper_close() resource leaks and race conditions,
-      fixed the race condition causing xid mismatch.
-
-    * added support for cppunit, added new targets: "check" and "run-check"
-      to build and run unit tests.
-
-    * Changed the signature of zookeeper_init(): it now takes a context pointer
-      as a parameter. This is to avoid a race condition in the multi-threaded client.
-
-    * Using a self-pipe rather than SIGUSR1 to wake up select() in the I/O thread
-
-    * Added the doxygen target to the autoconf scripts
-
-    * Pulled out the logging functionality from zookeeper.c to zk_log.c/.h.
-      Fixed a minor issue with PING responses being unnecessarily put on
-      the completion queue rather than simply dropped. Make use of DLL_EXPORT
-      symbol for building shared lib on cygwin.
-
-    * Implemented new Zookeeper operation sync() to flush the leader channel
-      to ensure that all updates have reached the followers.
-
-    * Synchronous methods not being handled properly on disconnect
-
-    * breed: fixed an incorrect parameter passed to zookeeper API by
-      the Sync API wrapper functions
-
-    * breed: the set and delete commands now support both Sync and Async API.
-      Prefix the command name with an 'a' to call the Async API: aset, adelete
-
-    * Make sure mutexes and condition variables are properly initialized
-      and destroyed
-
-    * Fixed zookeeper_close() causing core dumps with mt_adaptor
-
-
-Release 1.0.0
-2007-11-27 Andrew Kornev <akornev@users.sourceforge.net>
-
-    * configure.ac and Makefile.am added support for GNU autotools
-
-    * recordio.c/.h updated jute IO routines to use bit-explicit integer types
-      (int32_t vs. int, and int64_t vs. long long)
-
-    * README rough draft
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/176bd682/src/c/INSTALL
----------------------------------------------------------------------
diff --git a/src/c/INSTALL b/src/c/INSTALL
deleted file mode 100644
index 5458714..0000000
--- a/src/c/INSTALL
+++ /dev/null
@@ -1,234 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/176bd682/src/c/LICENSE
----------------------------------------------------------------------
diff --git a/src/c/LICENSE b/src/c/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/src/c/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/176bd682/src/c/Makefile.am
----------------------------------------------------------------------
diff --git a/src/c/Makefile.am b/src/c/Makefile.am
deleted file mode 100644
index a81e3da..0000000
--- a/src/c/Makefile.am
+++ /dev/null
@@ -1,147 +0,0 @@
-# need this for Doxygen integration
-include $(top_srcdir)/aminclude.am
-
-AUTOMAKE_OPTIONS = serial-tests
-if SOLARIS
-  SOLARIS_CPPFLAGS = -D_POSIX_PTHREAD_SEMANTICS
-  SOLARIS_LIB_LDFLAGS = -lnsl -lsocket
-endif
-AM_CPPFLAGS = -I${srcdir}/include -I${srcdir}/tests -I${srcdir}/generated $(SOLARIS_CPPFLAGS)
-AM_CFLAGS = -Wall -Werror -Wdeclaration-after-statement
-AM_CXXFLAGS = -Wall $(USEIPV6)
-
-# Additional flags for coverage testing (if enabled)
-if ENABLEGCOV
-  AM_CFLAGS += -fprofile-arcs -ftest-coverage
-  AM_LDFLAGS = -lgcov
-endif
-
-LIB_LDFLAGS = -no-undefined -version-info 2 $(SOLARIS_LIB_LDFLAGS)
-
-pkginclude_HEADERS = include/zookeeper.h include/zookeeper_version.h include/zookeeper_log.h include/proto.h include/recordio.h generated/zookeeper.jute.h
-EXTRA_DIST=LICENSE
-
-HASHTABLE_SRC = src/hashtable/hashtable_itr.h src/hashtable/hashtable_itr.c \
-    src/hashtable/hashtable_private.h src/hashtable/hashtable.h src/hashtable/hashtable.c
-
-noinst_LTLIBRARIES = libhashtable.la
-libhashtable_la_SOURCES = $(HASHTABLE_SRC)
-
-COMMON_SRC = src/zookeeper.c include/zookeeper.h include/zookeeper_version.h include/zookeeper_log.h\
-    src/recordio.c include/recordio.h include/proto.h \
-    src/zk_adaptor.h generated/zookeeper.jute.c \
-    src/zk_log.c src/zk_hashtable.h src/zk_hashtable.c \
-	src/addrvec.h src/addrvec.c
-
-# These are the symbols (classes, mostly) we want to export from our library.
-EXPORT_SYMBOLS = '(zoo_|zookeeper_|zhandle|Z|format_log_message|log_message|logLevel|deallocate_|allocate_|zerror|is_unrecoverable)'
-noinst_LTLIBRARIES += libzkst.la
-libzkst_la_SOURCES =$(COMMON_SRC) src/st_adaptor.c
-libzkst_la_LIBADD = -lm $(CLOCK_GETTIME_LIBS)
-
-lib_LTLIBRARIES = libzookeeper_st.la
-libzookeeper_st_la_SOURCES =
-libzookeeper_st_la_LIBADD=libzkst.la libhashtable.la
-libzookeeper_st_la_DEPENDENCIES=libzkst.la libhashtable.la
-libzookeeper_st_la_LDFLAGS = $(LIB_LDFLAGS) -export-symbols-regex $(EXPORT_SYMBOLS)
-
-if WANT_SYNCAPI
-noinst_LTLIBRARIES += libzkmt.la
-libzkmt_la_SOURCES =$(COMMON_SRC) src/mt_adaptor.c
-libzkmt_la_CFLAGS = -DTHREADED
-libzkmt_la_LIBADD = -lm $(CLOCK_GETTIME_LIBS)
-
-lib_LTLIBRARIES += libzookeeper_mt.la
-libzookeeper_mt_la_SOURCES =
-libzookeeper_mt_la_LIBADD=libzkmt.la libhashtable.la -lpthread
-libzookeeper_mt_la_DEPENDENCIES=libzkmt.la libhashtable.la
-libzookeeper_mt_la_LDFLAGS = $(LIB_LDFLAGS) -export-symbols-regex $(EXPORT_SYMBOLS)
-endif
-
-bin_PROGRAMS = cli_st
-
-cli_st_SOURCES = src/cli.c
-cli_st_LDADD = libzookeeper_st.la
-
-if WANT_SYNCAPI
-bin_PROGRAMS += cli_mt load_gen
-
-cli_mt_SOURCES = src/cli.c
-cli_mt_LDADD = libzookeeper_mt.la
-cli_mt_CFLAGS = -DTHREADED
-
-load_gen_SOURCES = src/load_gen.c
-load_gen_LDADD = libzookeeper_mt.la
-load_gen_CFLAGS = -DTHREADED
-
-endif
-
-#########################################################################
-# build and run unit tests
-
-EXTRA_DIST+=$(wildcard ${srcdir}/tests/*.cc) $(wildcard ${srcdir}/tests/*.h) \
-    ${srcdir}/tests/wrappers.opt ${srcdir}/tests/wrappers-mt.opt
-
-# These tests are ordered in a logical manner such that each builds upon basic
-# functionality tested in prior tests. e.g. the most basic functionality is
-# tested in TestZookeeperInit and TestZookeeperClose and as such should be tested
-# first as a foundation with more complex test suites to follow.
-TEST_SOURCES = \
-	tests/TestDriver.cc \
-	tests/LibCMocks.cc \
-	tests/LibCSymTable.cc \
-	tests/MocksBase.cc \
-	tests/ZKMocks.cc \
-	tests/Util.cc \
-	tests/ThreadingUtil.cc \
-	tests/TestZookeeperInit.cc \
-	tests/TestZookeeperClose.cc \
-	tests/TestReconfig.cc \
-	tests/TestReconfigServer.cc \
-	tests/TestClientRetry.cc \
-	tests/TestOperations.cc \
-	tests/TestMulti.cc \
-	tests/TestWatchers.cc \
-	tests/TestClient.cc \
-	tests/ZooKeeperQuorumServer.cc \
-	tests/ZooKeeperQuorumServer.h \
-	tests/TestReadOnlyClient.cc \
-	tests/TestLogClientEnv.cc \
-	$(NULL)
-
-if SOLARIS
-  SHELL_SYMBOL_WRAPPERS = cat ${srcdir}/tests/wrappers.opt
-  SYMBOL_WRAPPERS=$(SHELL_SYMBOL_WRAPPERS:sh)
-else
-  SYMBOL_WRAPPERS=$(shell cat ${srcdir}/tests/wrappers.opt)
-endif
-
-check_PROGRAMS = zktest-st
-TESTS_ENVIRONMENT = ZKROOT=${srcdir}/../.. \
-                    CLASSPATH=$$CLASSPATH:$$CLOVER_HOME/lib/clover.jar
-nodist_zktest_st_SOURCES = $(TEST_SOURCES)
-zktest_st_LDADD = libzkst.la libhashtable.la $(CPPUNIT_LIBS)
-zktest_st_CXXFLAGS = -DUSE_STATIC_LIB $(CPPUNIT_CFLAGS) $(USEIPV6) $(SOLARIS_CPPFLAGS)
-zktest_st_LDFLAGS = -shared $(SYMBOL_WRAPPERS) $(SOLARIS_LIB_LDFLAGS)
-
-if WANT_SYNCAPI
-  check_PROGRAMS += zktest-mt
-  nodist_zktest_mt_SOURCES = $(TEST_SOURCES) tests/PthreadMocks.cc
-  zktest_mt_LDADD = libzkmt.la libhashtable.la -lpthread $(CPPUNIT_LIBS)
-  zktest_mt_CXXFLAGS = -DUSE_STATIC_LIB -DTHREADED $(CPPUNIT_CFLAGS) $(USEIPV6)
-if SOLARIS
-  SHELL_SYMBOL_WRAPPERS_MT = cat ${srcdir}/tests/wrappers-mt.opt
-  SYMBOL_WRAPPERS_MT=$(SYMBOL_WRAPPERS) $(SHELL_SYMBOL_WRAPPERS_MT:sh)
-else
-  SYMBOL_WRAPPERS_MT=$(SYMBOL_WRAPPERS) $(shell cat ${srcdir}/tests/wrappers-mt.opt)
-endif
-  zktest_mt_LDFLAGS = -shared $(SYMBOL_WRAPPERS_MT) $(SOLARIS_LIB_LDFLAGS)
-endif
-
-TESTS = $(check_PROGRAMS)
-
-clean-local: clean-check
-	$(RM) $(DX_CLEANFILES)
-
-clean-check:
-	$(RM) $(nodist_zktest_st_OBJECTS) $(nodist_zktest_mt_OBJECTS)

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/176bd682/src/c/NOTICE.txt
----------------------------------------------------------------------
diff --git a/src/c/NOTICE.txt b/src/c/NOTICE.txt
deleted file mode 100644
index 07ef1ad..0000000
--- a/src/c/NOTICE.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Apache ZooKeeper
-Copyright 2009-2011 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-----------
-include/winstdint.h is included only for Windows Client support, as follows:
-
-// ISO C9x  compliant stdint.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006-2008 Alexander Chemeris
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-// 
-//   3. The name of the author may be used to endorse or promote products
-//      derived from this software without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-----------

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/176bd682/src/c/README
----------------------------------------------------------------------
diff --git a/src/c/README b/src/c/README
deleted file mode 100644
index 995c963..0000000
--- a/src/c/README
+++ /dev/null
@@ -1,160 +0,0 @@
-                     Zookeeper C client library 
-
-
-This package provides a C client interface to Zookeeper server.
-
-For the latest information about ZooKeeper, please visit our website at:
-   http://zookeeper.apache.org/
-and our wiki, at:
-   https://cwiki.apache.org/confluence/display/ZOOKEEPER
-
-Full documentation for this release can also be found in ../../docs/index.html
-
-
-OVERVIEW
-
-The client supports two types of APIs -- synchronous and asynchronous.
-
-Asynchronous API provides non-blocking operations with completion callbacks and 
-relies on the application to implement event multiplexing on its behalf.
-
-On the other hand, Synchronous API provides a blocking flavor of
-zookeeper operations and runs its own event loop in a separate thread.
-
-Sync and Async APIs can be mixed and matched within the same application.
-
-The package includes two shared libraries: zookeeper_st and
-zookeeper_mt. The former only provides the Async API and is not
-thread-safe. The only reason this library exists is to support the
-platforms were pthread library is not available or unstable
-(i.e. FreeBSD 4.x). In all other cases the application developers are
-advised to link against zookeeper_mt as it includes support for both
-Sync and Async API.
-
-
-INSTALLATION
-
-If you're building the client from a source checkout you need to
-follow the steps outlined below. If you're building from a release
-tar downloaded from Apache please skip to step 2.
-
-1) do a "ant compile_jute" from the zookeeper top level directory (.../trunk).
-   This will create a directory named "generated" under src/c.  Skip to step 3.
-2) unzip/untar the source tarball and cd to the zookeeper-x.x.x/src/c directory
-3) change directory to src/c and do a "autoreconf -if" to bootstrap
-   autoconf, automake and libtool. Please make sure you have autoconf
-   version 2.59 or greater installed. If cppunit is installed in a non-standard
-   directory, you need to specify where to find cppunit.m4. For example, if
-   cppunit is installed under /usr/local, run:
-   
-       ACLOCAL="aclocal -I /usr/local/share/aclocal" autoreconf -if
-
-4) do a "./configure [OPTIONS]" to generate the makefile. See INSTALL
-   for general information about running configure. Additionally, the
-   configure supports the following options:
-   --enable-debug     enables optimization and enables debug info compiler
-                      options, disabled by default
-   --without-syncapi  disables Sync API support; zookeeper_mt library won't
-                      be built, enabled by default
-   --disable-static   do not build static libraries, enabled by default
-   --disable-shared   do not build shared libraries, enabled by default
-   --without-cppunit  do not build the test library, enabled by default.
-
-5) do a "make" or "make install" to build the libraries and install them. 
-   Alternatively, you can also build and run a unit test suite (and
-   you probably should).  Please make sure you have cppunit-1.10.x or
-   higher installed before you execute step 4.  Once ./configure has
-   finished, do a "make check". It will build the libraries, build
-   the tests and run them.
-6) to generate doxygen documentation do a "make doxygen-doc". All
-   documentations will be placed to a new subfolder named docs. By
-   default only HTML documentation is generated.  For information on
-   other document formats please use "./configure --help"
-
-Alternatively you can use the CMake build system. On Windows, this is required.
-Follow steps 1 and 2 above, and then continue here.
-
-1) do a "cmake [OPTIONS]" to generate the makefile or msbuild files (the correct
-   build system will be generated based on your platform). Some options from above
-   are supported:
-   -DCMAKE_BUILD_TYPE  Debug by default, Release enables optimzation etc.
-   -DWANT_SYNCAPI      ON by default, OFF disables the Sync API support
-   -DWANT_CPPUNIT      ON except on Windows, OFF disables the tests
-   -DBUILD_SHARED_LIBS not yet supported, only static libraries are built
-   other CMake options see "cmake --help" for generic options, such as generator
-
-2) do a "cmake --build ." to build the default targets. Alternatively you can
-   invoke "make" or "msbuild" manually. If the tests were enabled, use "ctest -V"
-   to run them.
-
-Current limitations of the CMake build system include lack of Solaris support,
-no shared library option, no explicitly exported symbols (all are exported by
-default), no versions on the libraries, and no documentation generation.
-Features of CMake include a single, easily consumed cross-platform build system
-to generate the ZooKeeper C Client libraries for any project, with little to no
-configuration.
-
-EXAMPLE/SAMPLE C CLIENT SHELL
-
-NOTE: the ZooKeeper C client shell (cli_st and cli_mt) is meant as a
-example/sample of ZooKeeper C client API usage. It is not a full
-fledged client and not meant for production usage - see the Java
-client shell for a fully featured shell.
-
-You can test your client by running a zookeeper server (see
-instructions on the project wiki page on how to run it) and connecting
-to it using the zookeeper shell application cli that is built as part
-of the installation procedure.
-
-cli_mt (multithreaded, built against zookeeper_mt library) is shown in
-this example, but you could also use cli_st (singlethreaded, built
-against zookeeper_st library):
-
-$ cli_mt zookeeper_host:9876
-
-To start a client with read-only mode enabled, use the -r flag:
-
-$ cli_mt -r zookeeper_host:9876
-
-This is a client application that gives you a shell for executing
-simple zookeeper commands. Once successfully started and connected to
-the server it displays a shell prompt.
-
-You can now enter zookeeper commands. For example, to create a node:
-
-> create /my_new_node
-
-To verify that the node's been created:
-
-> ls /
-
-You should see a list of nodes who are the children of the root node "/".
-
-Here's a list of command supported by the cli shell:
-
-ls <path>             -- list children of a znode identified by <path>. The
-                         command set a children watch on the znode.
-get <path>            -- get the value of a znode at <path>
-set <path> <value>    -- set the value of a znode at <path> to <value>
-create [+e|+s] <path> -- create a znode as a child of znode <path>; 
-                         use +e option to create an ephemeral znode,
-                         use +s option to create a znode with a sequence number 
-                         appended to the name. The operation will fail if 
-                         the parent znode (the one identified by <path>) doesn't
-                         exist.
-delete <path>         -- delete the znode at <path>. The command will fail if the znode
-                         has children.
-sync <path>           -- make sure all pending updates have been applied to znode at <path>
-exists <path>         -- returns a result code indicating whether the znode at <path>
-                         exists. The command also sets a znode watch.
-myid                  -- prints out the current zookeeper session id.
-quit                  -- exit the shell.
-
-In order to be able to use the zookeeper API in your application you have to
-1) remember to include the zookeeper header 
-   #include <zookeeper/zookeeper.h>
-2) use -DTHREADED compiler option to enable Sync API; in this case you should
-   be linking your code against zookeeper_mt library
-
-Please take a look at cli.c to understand how to use the two API types. 
-(TODO: some kind of short tutorial would be helpful, I guess)

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/176bd682/src/c/acinclude.m4
----------------------------------------------------------------------
diff --git a/src/c/acinclude.m4 b/src/c/acinclude.m4
deleted file mode 100644
index a4d405a..0000000
--- a/src/c/acinclude.m4
+++ /dev/null
@@ -1,312 +0,0 @@
-# This file is part of Autoconf.                       -*- Autoconf -*-
-
-# Copyright (C) 2004 Oren Ben-Kiki
-# This file is distributed under the same terms as the Autoconf macro files.
-
-# Generate automatic documentation using Doxygen. Works in concert with the
-# aminclude.m4 file and a compatible doxygen configuration file. Defines the
-# following public macros:
-#
-# DX_???_FEATURE(ON|OFF) - control the default setting of a Doxygen feature.
-# Supported features are 'DOXYGEN' itself, 'DOT' for generating graphics,
-# 'HTML' for plain HTML, 'CHM' for compressed HTML help (for MS users), 'CHI'
-# for generating a seperate .chi file by the .chm file, and 'MAN', 'RTF',
-# 'XML', 'PDF' and 'PS' for the appropriate output formats. The environment
-# variable DOXYGEN_PAPER_SIZE may be specified to override the default 'a4wide'
-# paper size.
-#
-# By default, HTML, PDF and PS documentation is generated as this seems to be
-# the most popular and portable combination. MAN pages created by Doxygen are
-# usually problematic, though by picking an appropriate subset and doing some
-# massaging they might be better than nothing. CHM and RTF are specific for MS
-# (note that you can't generate both HTML and CHM at the same time). The XML is
-# rather useless unless you apply specialized post-processing to it.
-#
-# The macro mainly controls the default state of the feature. The use can
-# override the default by specifying --enable or --disable. The macros ensure
-# that contradictory flags are not given (e.g., --enable-doxygen-html and
-# --enable-doxygen-chm, --enable-doxygen-anything with --disable-doxygen, etc.)
-# Finally, each feature will be automatically disabled (with a warning) if the
-# required programs are missing.
-#
-# Once all the feature defaults have been specified, call DX_INIT_DOXYGEN with
-# the following parameters: a one-word name for the project for use as a
-# filename base etc., an optional configuration file name (the default is
-# 'Doxyfile', the same as Doxygen's default), and an optional output directory
-# name (the default is 'doxygen-doc').
-
-## ----------##
-## Defaults. ##
-## ----------##
-
-DX_ENV=""
-AC_DEFUN([DX_FEATURE_doc],  ON)
-AC_DEFUN([DX_FEATURE_dot],  ON)
-AC_DEFUN([DX_FEATURE_man],  OFF)
-AC_DEFUN([DX_FEATURE_html], ON)
-AC_DEFUN([DX_FEATURE_chm],  OFF)
-AC_DEFUN([DX_FEATURE_chi],  OFF)
-AC_DEFUN([DX_FEATURE_rtf],  OFF)
-AC_DEFUN([DX_FEATURE_xml],  OFF)
-AC_DEFUN([DX_FEATURE_pdf],  ON)
-AC_DEFUN([DX_FEATURE_ps],   ON)
-
-## --------------- ##
-## Private macros. ##
-## --------------- ##
-
-# DX_ENV_APPEND(VARIABLE, VALUE)
-# ------------------------------
-# Append VARIABLE="VALUE" to DX_ENV for invoking doxygen.
-AC_DEFUN([DX_ENV_APPEND], [AC_SUBST([DX_ENV], ["$DX_ENV $1='$2'"])])
-
-# DX_DIRNAME_EXPR
-# ---------------
-# Expand into a shell expression prints the directory part of a path.
-AC_DEFUN([DX_DIRNAME_EXPR],
-         [[expr ".$1" : '\(\.\)[^/]*$' \| "x$1" : 'x\(.*\)/[^/]*$']])
-
-# DX_IF_FEATURE(FEATURE, IF-ON, IF-OFF)
-# -------------------------------------
-# Expands according to the M4 (static) status of the feature.
-AC_DEFUN([DX_IF_FEATURE], [ifelse(DX_FEATURE_$1, ON, [$2], [$3])])
-
-# DX_REQUIRE_PROG(VARIABLE, PROGRAM)
-# ----------------------------------
-# Require the specified program to be found for the DX_CURRENT_FEATURE to work.
-AC_DEFUN([DX_REQUIRE_PROG], [
-AC_PATH_TOOL([$1], [$2])
-if test "$DX_FLAG_$[DX_CURRENT_FEATURE$$1]" = 1; then
-    AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION])
-    AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
-fi
-])
-
-# DX_TEST_FEATURE(FEATURE)
-# ------------------------
-# Expand to a shell expression testing whether the feature is active.
-AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1])
-
-# DX_CHECK_DEPEND(REQUIRED_FEATURE, REQUIRED_STATE)
-# -------------------------------------------------
-# Verify that a required features has the right state before trying to turn on
-# the DX_CURRENT_FEATURE.
-AC_DEFUN([DX_CHECK_DEPEND], [
-test "$DX_FLAG_$1" = "$2" \
-|| AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1,
-                            requires, contradicts) doxygen-DX_CURRENT_FEATURE])
-])
-
-# DX_CLEAR_DEPEND(FEATURE, REQUIRED_FEATURE, REQUIRED_STATE)
-# ----------------------------------------------------------
-# Turn off the DX_CURRENT_FEATURE if the required feature is off.
-AC_DEFUN([DX_CLEAR_DEPEND], [
-test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
-])
-
-# DX_FEATURE_ARG(FEATURE, DESCRIPTION,
-#                CHECK_DEPEND, CLEAR_DEPEND,
-#                REQUIRE, DO-IF-ON, DO-IF-OFF)
-# --------------------------------------------
-# Parse the command-line option controlling a feature. CHECK_DEPEND is called
-# if the user explicitly turns the feature on (and invokes DX_CHECK_DEPEND),
-# otherwise CLEAR_DEPEND is called to turn off the default state if a required
-# feature is disabled (using DX_CLEAR_DEPEND). REQUIRE performs additional
-# requirement tests (DX_REQUIRE_PROG). Finally, an automake flag is set and
-# DO-IF-ON or DO-IF-OFF are called according to the final state of the feature.
-AC_DEFUN([DX_ARG_ABLE], [
-    AC_DEFUN([DX_CURRENT_FEATURE], [$1])
-    AC_DEFUN([DX_CURRENT_DESCRIPTION], [$2])
-    AC_ARG_ENABLE(doxygen-$1,
-                  [AS_HELP_STRING(DX_IF_FEATURE([$1], [--disable-doxygen-$1],
-                                                      [--enable-doxygen-$1]),
-                                  DX_IF_FEATURE([$1], [don't $2], [$2]))],
-                  [
-case "$enableval" in
-#(
-y|Y|yes|Yes|YES)
-    AC_SUBST([DX_FLAG_$1], 1)
-    $3
-;; #(
-n|N|no|No|NO)
-    AC_SUBST([DX_FLAG_$1], 0)
-;; #(
-*)
-    AC_MSG_ERROR([invalid value '$enableval' given to doxygen-$1])
-;;
-esac
-], [
-AC_SUBST([DX_FLAG_$1], [DX_IF_FEATURE([$1], 1, 0)])
-$4
-])
-if DX_TEST_FEATURE([$1]); then
-    $5
-    :
-fi
-if DX_TEST_FEATURE([$1]); then
-    AM_CONDITIONAL(DX_COND_$1, :)
-    $6
-    :
-else
-    AM_CONDITIONAL(DX_COND_$1, false)
-    $7
-    :
-fi
-])
-
-## -------------- ##
-## Public macros. ##
-## -------------- ##
-
-# DX_XXX_FEATURE(DEFAULT_STATE)
-# -----------------------------
-AC_DEFUN([DX_DOXYGEN_FEATURE], [AC_DEFUN([DX_FEATURE_doc],  [$1])])
-AC_DEFUN([DX_MAN_FEATURE],     [AC_DEFUN([DX_FEATURE_man],  [$1])])
-AC_DEFUN([DX_HTML_FEATURE],    [AC_DEFUN([DX_FEATURE_html], [$1])])
-AC_DEFUN([DX_CHM_FEATURE],     [AC_DEFUN([DX_FEATURE_chm],  [$1])])
-AC_DEFUN([DX_CHI_FEATURE],     [AC_DEFUN([DX_FEATURE_chi],  [$1])])
-AC_DEFUN([DX_RTF_FEATURE],     [AC_DEFUN([DX_FEATURE_rtf],  [$1])])
-AC_DEFUN([DX_XML_FEATURE],     [AC_DEFUN([DX_FEATURE_xml],  [$1])])
-AC_DEFUN([DX_XML_FEATURE],     [AC_DEFUN([DX_FEATURE_xml],  [$1])])
-AC_DEFUN([DX_PDF_FEATURE],     [AC_DEFUN([DX_FEATURE_pdf],  [$1])])
-AC_DEFUN([DX_PS_FEATURE],      [AC_DEFUN([DX_FEATURE_ps],   [$1])])
-
-# DX_INIT_DOXYGEN(PROJECT, [CONFIG-FILE], [OUTPUT-DOC-DIR])
-# ---------------------------------------------------------
-# PROJECT also serves as the base name for the documentation files.
-# The default CONFIG-FILE is "Doxyfile" and OUTPUT-DOC-DIR is "doxygen-doc".
-AC_DEFUN([DX_INIT_DOXYGEN], [
-
-# Files:
-AC_SUBST([DX_PROJECT], [$1])
-AC_SUBST([DX_CONFIG], [ifelse([$2], [], Doxyfile, [$2])])
-AC_SUBST([DX_DOCDIR], [ifelse([$3], [], doxygen-doc, [$3])])
-
-# Environment variables used inside doxygen.cfg:
-DX_ENV_APPEND(SRCDIR, $srcdir)
-DX_ENV_APPEND(PROJECT, $DX_PROJECT)
-DX_ENV_APPEND(DOCDIR, $DX_DOCDIR)
-DX_ENV_APPEND(VERSION, $PACKAGE_VERSION)
-
-# Doxygen itself:
-DX_ARG_ABLE(doc, [generate any doxygen documentation],
-            [],
-            [],
-            [DX_REQUIRE_PROG([DX_DOXYGEN], doxygen)
-             DX_REQUIRE_PROG([DX_PERL], perl)],
-            [DX_ENV_APPEND(PERL_PATH, $DX_PERL)])
-
-# Dot for graphics:
-DX_ARG_ABLE(dot, [generate graphics for doxygen documentation],
-            [DX_CHECK_DEPEND(doc, 1)],
-            [DX_CLEAR_DEPEND(doc, 1)],
-            [DX_REQUIRE_PROG([DX_DOT], dot)],
-            [DX_ENV_APPEND(HAVE_DOT, YES)
-             DX_ENV_APPEND(DOT_PATH, [`DX_DIRNAME_EXPR($DX_DOT)`])],
-            [DX_ENV_APPEND(HAVE_DOT, NO)])
-
-# Man pages generation:
-DX_ARG_ABLE(man, [generate doxygen manual pages],
-            [DX_CHECK_DEPEND(doc, 1)],
-            [DX_CLEAR_DEPEND(doc, 1)],
-            [],
-            [DX_ENV_APPEND(GENERATE_MAN, YES)],
-            [DX_ENV_APPEND(GENERATE_MAN, NO)])
-
-# RTF file generation:
-DX_ARG_ABLE(rtf, [generate doxygen RTF documentation],
-            [DX_CHECK_DEPEND(doc, 1)],
-            [DX_CLEAR_DEPEND(doc, 1)],
-            [],
-            [DX_ENV_APPEND(GENERATE_RTF, YES)],
-            [DX_ENV_APPEND(GENERATE_RTF, NO)])
-
-# XML file generation:
-DX_ARG_ABLE(xml, [generate doxygen XML documentation],
-            [DX_CHECK_DEPEND(doc, 1)],
-            [DX_CLEAR_DEPEND(doc, 1)],
-            [],
-            [DX_ENV_APPEND(GENERATE_XML, YES)],
-            [DX_ENV_APPEND(GENERATE_XML, NO)])
-
-# (Compressed) HTML help generation:
-DX_ARG_ABLE(chm, [generate doxygen compressed HTML help documentation],
-            [DX_CHECK_DEPEND(doc, 1)],
-            [DX_CLEAR_DEPEND(doc, 1)],
-            [DX_REQUIRE_PROG([DX_HHC], hhc)],
-            [DX_ENV_APPEND(HHC_PATH, $DX_HHC)
-             DX_ENV_APPEND(GENERATE_HTML, YES)
-             DX_ENV_APPEND(GENERATE_HTMLHELP, YES)],
-            [DX_ENV_APPEND(GENERATE_HTMLHELP, NO)])
-
-# Seperate CHI file generation.
-DX_ARG_ABLE(chi, [generate doxygen seperate compressed HTML help index file],
-            [DX_CHECK_DEPEND(chm, 1)],
-            [DX_CLEAR_DEPEND(chm, 1)],
-            [],
-            [DX_ENV_APPEND(GENERATE_CHI, YES)],
-            [DX_ENV_APPEND(GENERATE_CHI, NO)])
-
-# Plain HTML pages generation:
-DX_ARG_ABLE(html, [generate doxygen plain HTML documentation],
-            [DX_CHECK_DEPEND(doc, 1) DX_CHECK_DEPEND(chm, 0)],
-            [DX_CLEAR_DEPEND(doc, 1) DX_CLEAR_DEPEND(chm, 0)],
-            [],
-            [DX_ENV_APPEND(GENERATE_HTML, YES)],
-            [DX_TEST_FEATURE(chm) || DX_ENV_APPEND(GENERATE_HTML, NO)])
-
-# PostScript file generation:
-DX_ARG_ABLE(ps, [generate doxygen PostScript documentation],
-            [DX_CHECK_DEPEND(doc, 1)],
-            [DX_CLEAR_DEPEND(doc, 1)],
-            [DX_REQUIRE_PROG([DX_LATEX], latex)
-             DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex)
-             DX_REQUIRE_PROG([DX_DVIPS], dvips)
-             DX_REQUIRE_PROG([DX_EGREP], egrep)])
-
-# PDF file generation:
-DX_ARG_ABLE(pdf, [generate doxygen PDF documentation],
-            [DX_CHECK_DEPEND(doc, 1)],
-            [DX_CLEAR_DEPEND(doc, 1)],
-            [DX_REQUIRE_PROG([DX_PDFLATEX], pdflatex)
-             DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex)
-             DX_REQUIRE_PROG([DX_EGREP], egrep)])
-
-# LaTeX generation for PS and/or PDF:
-if DX_TEST_FEATURE(ps) || DX_TEST_FEATURE(pdf); then
-    AM_CONDITIONAL(DX_COND_latex, :)
-    DX_ENV_APPEND(GENERATE_LATEX, YES)
-else
-    AM_CONDITIONAL(DX_COND_latex, false)
-    DX_ENV_APPEND(GENERATE_LATEX, NO)
-fi
-
-# Paper size for PS and/or PDF:
-AC_ARG_VAR(DOXYGEN_PAPER_SIZE,
-           [a4wide (default), a4, letter, legal or executive])
-case "$DOXYGEN_PAPER_SIZE" in
-#(
-"")
-    AC_SUBST(DOXYGEN_PAPER_SIZE, "")
-;; #(
-a4wide|a4|letter|legal|executive)
-    DX_ENV_APPEND(PAPER_SIZE, $DOXYGEN_PAPER_SIZE)
-;; #(
-*)
-    AC_MSG_ERROR([unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE'])
-;;
-esac
-
-#For debugging:
-#echo DX_FLAG_doc=$DX_FLAG_doc
-#echo DX_FLAG_dot=$DX_FLAG_dot
-#echo DX_FLAG_man=$DX_FLAG_man
-#echo DX_FLAG_html=$DX_FLAG_html
-#echo DX_FLAG_chm=$DX_FLAG_chm
-#echo DX_FLAG_chi=$DX_FLAG_chi
-#echo DX_FLAG_rtf=$DX_FLAG_rtf
-#echo DX_FLAG_xml=$DX_FLAG_xml
-#echo DX_FLAG_pdf=$DX_FLAG_pdf
-#echo DX_FLAG_ps=$DX_FLAG_ps
-#echo DX_ENV=$DX_ENV
-])

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/176bd682/src/c/aminclude.am
----------------------------------------------------------------------
diff --git a/src/c/aminclude.am b/src/c/aminclude.am
deleted file mode 100644
index 420049e..0000000
--- a/src/c/aminclude.am
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright (C) 2004 Oren Ben-Kiki
-# This file is distributed under the same terms as the Automake macro files.
-
-# Generate automatic documentation using Doxygen. Goals and variables values
-# are controlled by the various DX_COND_??? conditionals set by autoconf.
-#
-# The provided goals are:
-# doxygen-doc: Generate all doxygen documentation.
-# doxygen-run: Run doxygen, which will generate some of the documentation
-#              (HTML, CHM, CHI, MAN, RTF, XML) but will not do the post
-#              processing required for the rest of it (PS, PDF, and some MAN).
-# doxygen-man: Rename some doxygen generated man pages.
-# doxygen-ps: Generate doxygen PostScript documentation.
-# doxygen-pdf: Generate doxygen PDF documentation.
-#
-# Note that by default these are not integrated into the automake goals. If
-# doxygen is used to generate man pages, you can achieve this integration by
-# setting man3_MANS to the list of man pages generated and then adding the
-# dependency:
-#
-#   $(man3_MANS): doxygen-doc
-#
-# This will cause make to run doxygen and generate all the documentation.
-#
-# The following variable is intended for use in Makefile.am:
-#
-# DX_CLEANFILES = everything to clean.
-#
-# This is usually added to MOSTLYCLEANFILES.
-
-## --------------------------------- ##
-## Format-independent Doxygen rules. ##
-## --------------------------------- ##
-
-if DX_COND_doc
-
-## ------------------------------- ##
-## Rules specific for HTML output. ##
-## ------------------------------- ##
-
-if DX_COND_html
-
-DX_CLEAN_HTML = @DX_DOCDIR@/html
-
-endif DX_COND_html
-
-## ------------------------------ ##
-## Rules specific for CHM output. ##
-## ------------------------------ ##
-
-if DX_COND_chm
-
-DX_CLEAN_CHM = @DX_DOCDIR@/chm
-
-if DX_COND_chi
-
-DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE@.chi
-
-endif DX_COND_chi
-
-endif DX_COND_chm
-
-## ------------------------------ ##
-## Rules specific for MAN output. ##
-## ------------------------------ ##
-
-if DX_COND_man
-
-DX_CLEAN_MAN = @DX_DOCDIR@/man
-
-endif DX_COND_man
-
-## ------------------------------ ##
-## Rules specific for RTF output. ##
-## ------------------------------ ##
-
-if DX_COND_rtf
-
-DX_CLEAN_RTF = @DX_DOCDIR@/rtf
-
-endif DX_COND_rtf
-
-## ------------------------------ ##
-## Rules specific for XML output. ##
-## ------------------------------ ##
-
-if DX_COND_xml
-
-DX_CLEAN_XML = @DX_DOCDIR@/xml
-
-endif DX_COND_xml
-
-## ----------------------------- ##
-## Rules specific for PS output. ##
-## ----------------------------- ##
-
-if DX_COND_ps
-
-DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE@.ps
-
-DX_PS_GOAL = doxygen-ps
-
-doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps
-
-@DX_DOCDIR@/@PACKAGE@.ps: @DX_DOCDIR@/@PACKAGE@.tag
-	cd @DX_DOCDIR@/latex; \
-	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
-	$(DX_LATEX) refman.tex; \
-	$(MAKEINDEX_PATH) refman.idx; \
-	$(DX_LATEX) refman.tex; \
-	countdown=5; \
-	while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
-	                  refman.log > /dev/null 2>&1 \
-	   && test $$countdown -gt 0; do \
-	    $(DX_LATEX) refman.tex; \
-	    countdown=`expr $$countdown - 1`; \
-	done; \
-	$(DX_DVIPS) -o ../@PACKAGE@.ps refman.dvi
-
-endif DX_COND_ps
-
-## ------------------------------ ##
-## Rules specific for PDF output. ##
-## ------------------------------ ##
-
-if DX_COND_pdf
-
-DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE@.pdf
-
-DX_PDF_GOAL = doxygen-pdf
-
-doxygen-pdf: @DX_DOCDIR@/@PACKAGE@.pdf
-
-@DX_DOCDIR@/@PACKAGE@.pdf: @DX_DOCDIR@/@PACKAGE@.tag
-	cd @DX_DOCDIR@/latex; \
-	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
-	$(DX_PDFLATEX) refman.tex; \
-	$(DX_MAKEINDEX) refman.idx; \
-	$(DX_PDFLATEX) refman.tex; \
-	countdown=5; \
-	while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
-	                  refman.log > /dev/null 2>&1 \
-	   && test $$countdown -gt 0; do \
-	    $(DX_PDFLATEX) refman.tex; \
-	    countdown=`expr $$countdown - 1`; \
-	done; \
-	mv refman.pdf ../@PACKAGE@.pdf
-
-endif DX_COND_pdf
-
-## ------------------------------------------------- ##
-## Rules specific for LaTeX (shared for PS and PDF). ##
-## ------------------------------------------------- ##
-
-if DX_COND_latex
-
-DX_CLEAN_LATEX = @DX_DOCDIR@/latex
-
-endif DX_COND_latex
-
-.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL)
-
-.INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
-
-doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag
-
-doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
-
-@DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS)
-	rm -rf @DX_DOCDIR@
-	$(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
-
-DX_CLEANFILES = \
-    @DX_DOCDIR@/@PACKAGE@.tag \
-    -r \
-    $(DX_CLEAN_HTML) \
-    $(DX_CLEAN_CHM) \
-    $(DX_CLEAN_CHI) \
-    $(DX_CLEAN_MAN) \
-    $(DX_CLEAN_RTF) \
-    $(DX_CLEAN_XML) \
-    $(DX_CLEAN_PS) \
-    $(DX_CLEAN_PDF) \
-    $(DX_CLEAN_LATEX)
-
-endif DX_COND_doc


Mime
View raw message