Skip to content

Commit 7008b8e

Browse files
kezhuwkezhuw
committed
ZOOKEEPER-233: Split zookeeper-cli from zookeeper
This makes `zookeeper` a bundle module while keep compatiblity with old `zookeeper` module. The resulting `zookeeper-cli` depends maily on `zookeeper-client`. It does depend on `QuorumPeerConfig` from `zookeeper-server` to parse quorum members. But this functionality should be exported by client also as we have `ZooKeeper::getConfig`, see ZOOKEEPER-4971.
1 parent 318a99b commit 7008b8e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+235
-68
lines changed

‎pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858

5959
<modules>
6060
<module>zookeeper</module>
61+
<module>zookeeper-cli</module>
6162
<module>zookeeper-docs</module>
6263
<module>zookeeper-jute</module>
6364
<module>zookeeper-server</module>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
</fileSet>
7979
<fileSet>
8080
<!-- ZooKeeper cli generated api document -->
81-
<directory>${project.basedir}/../zookeeper/target/apidocs</directory>
82-
<outputDirectory>docs/apidocs/zookeeper-server</outputDirectory>
81+
<directory>${project.basedir}/../zookeeper-cli/target/apidocs</directory>
82+
<outputDirectory>docs/apidocs/zookeeper-cli</outputDirectory>
8383
<fileMode>${rw.file.permission}</fileMode>
8484
<directoryMode>${rwx.file.permission}</directoryMode>
8585
</fileSet>

‎zookeeper-cli/pom.xml

Lines changed: 193 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,193 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<!--
4+
/**
5+
* Licensed to the Apache Software Foundation (ASF) under one
6+
* or more contributor license agreements. See the NOTICE file
7+
* distributed with this work for additional information
8+
* regarding copyright ownership. The ASF licenses this file
9+
* to you under the Apache License, Version 2.0 (the
10+
* "License"); you may not use this file except in compliance
11+
* with the License. You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
*/
21+
-->
22+
<modelVersion>4.0.0</modelVersion>
23+
<parent>
24+
<groupId>org.apache.zookeeper</groupId>
25+
<artifactId>parent</artifactId>
26+
<version>3.10.0-SNAPSHOT</version>
27+
</parent>
28+
29+
<artifactId>zookeeper-cli</artifactId>
30+
<packaging>jar</packaging>
31+
<name>Apache ZooKeeper - Cli</name>
32+
<description>ZooKeeper cli</description>
33+
34+
<dependencies>
35+
<dependency>
36+
<groupId>org.apache.zookeeper</groupId>
37+
<artifactId>zookeeper-jute</artifactId>
38+
<version>${project.version}</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.apache.zookeeper</groupId>
42+
<artifactId>zookeeper-common</artifactId>
43+
<version>${project.version}</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.apache.zookeeper</groupId>
47+
<artifactId>zookeeper-client</artifactId>
48+
<version>${project.version}</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.apache.zookeeper</groupId>
52+
<artifactId>zookeeper-server</artifactId>
53+
<version>${project.version}</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.apache.zookeeper</groupId>
57+
<artifactId>zookeeper-server</artifactId>
58+
<version>${project.version}</version>
59+
<type>test-jar</type>
60+
<scope>test</scope>
61+
</dependency>
62+
63+
<dependency>
64+
<groupId>com.github.spotbugs</groupId>
65+
<artifactId>spotbugs-annotations</artifactId>
66+
<scope>provided</scope>
67+
<optional>true</optional>
68+
</dependency>
69+
70+
<dependency>
71+
<groupId>commons-cli</groupId>
72+
<artifactId>commons-cli</artifactId>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.apache.commons</groupId>
76+
<artifactId>commons-collections4</artifactId>
77+
<scope>test</scope>
78+
</dependency>
79+
<dependency>
80+
<groupId>jline</groupId>
81+
<artifactId>jline</artifactId>
82+
<scope>provided</scope>
83+
</dependency>
84+
85+
<!-- server optional components -->
86+
<dependency>
87+
<groupId>io.dropwizard.metrics</groupId>
88+
<artifactId>metrics-core</artifactId>
89+
<scope>test</scope>
90+
</dependency>
91+
<dependency>
92+
<groupId>org.xerial.snappy</groupId>
93+
<artifactId>snappy-java</artifactId>
94+
<scope>test</scope>
95+
</dependency>
96+
97+
<!-- log facilities -->
98+
<dependency>
99+
<groupId>org.slf4j</groupId>
100+
<artifactId>slf4j-api</artifactId>
101+
</dependency>
102+
<dependency>
103+
<groupId>ch.qos.logback</groupId>
104+
<artifactId>logback-classic</artifactId>
105+
<scope>runtime</scope>
106+
<optional>true</optional>
107+
</dependency>
108+
109+
<!-- HexDumpOutputFormatter -->
110+
<dependency>
111+
<groupId>io.netty</groupId>
112+
<artifactId>netty-buffer</artifactId>
113+
</dependency>
114+
115+
<!-- test -->
116+
<dependency>
117+
<groupId>org.mockito</groupId>
118+
<artifactId>mockito-core</artifactId>
119+
<scope>test</scope>
120+
</dependency>
121+
<dependency>
122+
<groupId>org.mockito</groupId>
123+
<artifactId>mockito-inline</artifactId>
124+
<scope>test</scope>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.jmockit</groupId>
128+
<artifactId>jmockit</artifactId>
129+
<scope>test</scope>
130+
</dependency>
131+
<dependency>
132+
<groupId>org.hamcrest</groupId>
133+
<artifactId>hamcrest-library</artifactId>
134+
<scope>test</scope>
135+
</dependency>
136+
<dependency>
137+
<groupId>org.junit.jupiter</groupId>
138+
<artifactId>junit-jupiter-api</artifactId>
139+
<scope>test</scope>
140+
</dependency>
141+
<dependency>
142+
<groupId>org.junit.jupiter</groupId>
143+
<artifactId>junit-jupiter-engine</artifactId>
144+
<scope>test</scope>
145+
</dependency>
146+
<dependency>
147+
<groupId>org.junit.jupiter</groupId>
148+
<artifactId>junit-jupiter-params</artifactId>
149+
<scope>test</scope>
150+
</dependency>
151+
<dependency>
152+
<groupId>org.junit.platform</groupId>
153+
<artifactId>junit-platform-runner</artifactId>
154+
<scope>test</scope>
155+
</dependency>
156+
</dependencies>
157+
158+
<build>
159+
<plugins>
160+
<plugin>
161+
<groupId>org.apache.maven.plugins</groupId>
162+
<artifactId>maven-surefire-plugin</artifactId>
163+
<configuration>
164+
<includes>
165+
<include>**/*Test.java</include>
166+
</includes>
167+
<forkCount>${surefire-forkcount}</forkCount>
168+
<reuseForks>false</reuseForks>
169+
<argLine>-Xmx512m -Dtest.junit.threads=${surefire-forkcount} -Dzookeeper.junit.threadid=${surefire.forkNumber} -javaagent:${org.jmockit:jmockit:jar}</argLine>
170+
<basedir>${project.basedir}</basedir>
171+
<systemPropertyVariables>
172+
<build.test.dir>${project.build.directory}/surefire</build.test.dir>
173+
<zookeeper.DigestAuthenticationProvider.superDigest>super:D/InIHSb7yEEbrWz8b9l71RjZJU=</zookeeper.DigestAuthenticationProvider.superDigest>
174+
</systemPropertyVariables>
175+
</configuration>
176+
</plugin>
177+
178+
<plugin>
179+
<groupId>org.apache.maven.plugins</groupId>
180+
<artifactId>maven-jar-plugin</artifactId>
181+
<executions>
182+
<execution>
183+
<id>publish-test-jar</id>
184+
<goals>
185+
<goal>test-jar</goal>
186+
</goals>
187+
</execution>
188+
</executions>
189+
</plugin>
190+
</plugins>
191+
</build>
192+
193+
</project>

‎zookeeper/src/main/java/org/apache/zookeeper/JLineZNodeCompleter.java renamed to ‎zookeeper-cli/src/main/java/org/apache/zookeeper/JLineZNodeCompleter.java

File renamed without changes.

‎zookeeper/src/main/java/org/apache/zookeeper/ZooKeeperMain.java renamed to ‎zookeeper-cli/src/main/java/org/apache/zookeeper/ZooKeeperMain.java

File renamed without changes.

‎zookeeper/src/main/java/org/apache/zookeeper/cli/AclParser.java renamed to ‎zookeeper-cli/src/main/java/org/apache/zookeeper/cli/AclParser.java

File renamed without changes.

‎zookeeper/src/main/java/org/apache/zookeeper/cli/AddAuthCommand.java renamed to ‎zookeeper-cli/src/main/java/org/apache/zookeeper/cli/AddAuthCommand.java

File renamed without changes.

‎zookeeper/src/main/java/org/apache/zookeeper/cli/AddWatchCommand.java renamed to ‎zookeeper-cli/src/main/java/org/apache/zookeeper/cli/AddWatchCommand.java

File renamed without changes.

‎zookeeper/src/main/java/org/apache/zookeeper/cli/Base64OutputFormatter.java renamed to ‎zookeeper-cli/src/main/java/org/apache/zookeeper/cli/Base64OutputFormatter.java

File renamed without changes.

‎zookeeper/src/main/java/org/apache/zookeeper/cli/CliCommand.java renamed to ‎zookeeper-cli/src/main/java/org/apache/zookeeper/cli/CliCommand.java

File renamed without changes.

0 commit comments

Comments
 (0)