ZOOKEEPER-233: Provide separated zookeeper-client

Refs: ZOOKEEPER-233, ZOOKEEPER-835.

Author: kezhuw

.gitignore

@@ -69,35 +69,39 @@ tags
 obj
 zookeeper-server/src/main/resources/lib/ant-eclipse-*
 zookeeper-server/src/main/resources/lib/ivy-*
-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
-zookeeper-client/zookeeper-client-c/.deps/
-zookeeper-client/zookeeper-client-c/.libs/
-zookeeper-client/zookeeper-client-c/Makefile
-zookeeper-client/zookeeper-client-c/cli_mt
-zookeeper-client/zookeeper-client-c/cli_st
-zookeeper-client/zookeeper-client-c/config.h
-zookeeper-client/zookeeper-client-c/config.status
-zookeeper-client/zookeeper-client-c/libtool
-zookeeper-client/zookeeper-client-c/load_gen
-zookeeper-client/zookeeper-client-c/stamp-h1
-zookeeper-client/zookeeper-client-c/build
-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/
+
+zookeeper-client-c/Makefile.in
+zookeeper-client-c/aclocal.m4
+zookeeper-client-c/autom4te.cache/
+zookeeper-client-c/compile
+zookeeper-client-c/config.guess
+zookeeper-client-c/config.h.in
+zookeeper-client-c/config.sub
+zookeeper-client-c/configure
+zookeeper-client-c/depcomp
+zookeeper-client-c/install-sh
+zookeeper-client-c/ltmain.sh
+zookeeper-client-c/missing
+zookeeper-client-c/.deps/
+zookeeper-client-c/.libs/
+zookeeper-client-c/Makefile
+zookeeper-client-c/cli_mt
+zookeeper-client-c/cli_st
+zookeeper-client-c/config.h
+zookeeper-client-c/config.status
+zookeeper-client-c/libtool
+zookeeper-client-c/load_gen
+zookeeper-client-c/stamp-h1
+zookeeper-client-c/build
+zookeeper-client-c/core.*
+zookeeper-client-c/TEST-*.txt
+zookeeper-client-c/*.la
+zookeeper-client-c/*.lo
+zookeeper-client-c/*.o
+zookeeper-client-c/generated/
+
+# Old c client files
+zookeeper-client/zookeeper-client-c
 
 # Python
 *.py[cod]

.typos.toml

@@ -48,5 +48,5 @@
 
 [files]
 extend-exclude = [
-    "zookeeper-server/src/test/java/org/apache/zookeeper/common/CertificatesToPlayWith.java",
+    "zookeeper-client/src/test/java/org/apache/zookeeper/common/CertificatesToPlayWith.java",
 ]

checkstyleSuppressions.xml

@@ -24,11 +24,14 @@
     <suppress checks="LineLength" files=".+[\\/]jute[\\/].+\.java"/>
 
     <!-- TODO ZOOKEEPER-3508 -->
+    <suppress checks="LineLength" files=".+[\\/]zookeeper-client[\\/].+\.java"/>
     <suppress checks="LineLength" files=".+[\\/]zookeeper-server[\\/].+\.java"/>
 
     <!-- TODO ZOOKEEPER-3507 -->
+    <suppress checks=".*Name.*" files=".+[\\/]zookeeper-client[\\/].+\.java"/>
     <suppress checks=".*Name.*" files=".+[\\/]zookeeper-server[\\/].+\.java"/>
 
     <!-- TODO ZOOKEEPER-3469 -->
+    <suppress checks="Javadoc.+" files=".+[\\/]zookeeper-client[\\/].+\.java"/>
     <suppress checks="Javadoc.+" files=".+[\\/]zookeeper-server[\\/].+\.java"/>
 </suppressions>

pom.xml

@@ -62,6 +62,7 @@
     <module>zookeeper-server</module>
     <module>zookeeper-metrics-providers</module>
     <module>zookeeper-client</module>
+    <module>zookeeper-client-c</module>
     <module>zookeeper-recipes</module>
     <module>zookeeper-assembly</module>
     <module>zookeeper-compatibility-tests</module>
@@ -292,6 +293,7 @@
         <module>zookeeper-contrib</module>
         <!-- zookeeper-it needed by fatjar contrib -->
         <module>zookeeper-it</module>
+        <module>zookeeper-client-c</module>
       </modules>
     </profile>
     <profile>

zookeeper-assembly/pom.xml

@@ -68,7 +68,6 @@
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper-client</artifactId>
       <version>${project.version}</version>
-      <type>pom</type>
     </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>

zookeeper-assembly/src/main/assembly/bin-package.xml

@@ -36,7 +36,6 @@
       </includes>
       <excludes>
         <exclude>org.apache.zookeeper:zookeeper-recipes</exclude>
-        <exclude>org.apache.zookeeper:zookeeper-client</exclude>
         <exclude>org.apache.zookeeper:zookeeper-docs</exclude>
       </excludes>
       <useProjectArtifact>false</useProjectArtifact>
@@ -63,6 +62,13 @@
       <fileMode>${rw.file.permission}</fileMode>
       <directoryMode>${rwx.file.permission}</directoryMode>
     </fileSet>
+    <fileSet>
+      <!-- ZooKeeper client generated api document -->
+      <directory>${project.basedir}/../zookeeper-client/target/apidocs</directory>
+      <outputDirectory>docs/apidocs/zookeeper-client</outputDirectory>
+      <fileMode>${rw.file.permission}</fileMode>
+      <directoryMode>${rwx.file.permission}</directoryMode>
+    </fileSet>
     <fileSet>
       <!-- ZooKeeper server generated api document -->
       <directory>${project.basedir}/../zookeeper-server/target/apidocs</directory>

zookeeper-assembly/src/main/assembly/lib-package.xml

@@ -29,7 +29,7 @@
   <fileSets>
     <fileSet>
       <!-- ZooKeeper C client lib and include files -->
-      <directory>${project.basedir}/../zookeeper-client/zookeeper-client-c/target/c</directory>
+      <directory>${project.basedir}/../zookeeper-client-c/target/c</directory>
       <outputDirectory>usr</outputDirectory>
       <includes>
         <include>include/**/*</include>
@@ -40,7 +40,7 @@
     </fileSet>
     <fileSet>
       <!-- ZooKeeper C client binaries-->
-      <directory>${project.basedir}/../zookeeper-client/zookeeper-client-c/target/c</directory>
+      <directory>${project.basedir}/../zookeeper-client-c/target/c</directory>
       <outputDirectory>usr</outputDirectory>
       <includes>
         <include>bin/*</include>
@@ -50,7 +50,7 @@
     </fileSet>
     <fileSet>
       <!-- ZooKeeper license -->
-      <directory>${project.basedir}/../zookeeper-client/zookeeper-client-c</directory>
+      <directory>${project.basedir}/../zookeeper-client-c</directory>
       <includes>
         <include>LICENSE</include>
       </includes>

zookeeper-client/zookeeper-client-c/CMakeLists.txt renamed to zookeeper-client-c/CMakeLists.txt

@@ -288,6 +288,6 @@ if(WANT_CPPUNIT)
   enable_testing()
   add_test(NAME zktest_runner COMMAND zktest)
   set_property(TEST zktest_runner PROPERTY ENVIRONMENT
-    "ZKROOT=${CMAKE_CURRENT_SOURCE_DIR}/../.."
+    "ZKROOT=${CMAKE_CURRENT_SOURCE_DIR}/.."
     "CLASSPATH=$CLASSPATH:$CLOVER_HOME/lib/clover*.jar")
 endif()