@@ -166,24 +161,6 @@ public static void deleteRecursive(
}
}
- /**
- * @param filePath the file path to be validated
- * @return Returns null if valid otherwise error message
- */
- public static String validateFileInput(String filePath) {
- File file = new File(filePath);
- if (!file.exists()) {
- return "File '" + file.getAbsolutePath() + "' does not exist.";
- }
- if (!file.canRead()) {
- return "Read permission is denied on the file '" + file.getAbsolutePath() + "'";
- }
- if (file.isDirectory()) {
- return "'" + file.getAbsolutePath() + "' is a directory. it must be a file.";
- }
- return null;
- }
-
/**
* BFS Traversal of the system under pathRoot, with the entries in the list, in the
* same order as that of the traversal.
@@ -266,45 +243,4 @@ private static void visitSubTreeDFSHelper(
return; // ignore
}
}
-
- /**
- * @param perms
- * ACL permissions
- * @return string representation of permissions
- */
- public static String getPermString(int perms) {
- return permCache.computeIfAbsent(perms, k -> constructPermString(k));
- }
-
- private static String constructPermString(int perms) {
- StringBuilder p = new StringBuilder();
- if ((perms & ZooDefs.Perms.CREATE) != 0) {
- p.append('c');
- }
- if ((perms & ZooDefs.Perms.DELETE) != 0) {
- p.append('d');
- }
- if ((perms & ZooDefs.Perms.READ) != 0) {
- p.append('r');
- }
- if ((perms & ZooDefs.Perms.WRITE) != 0) {
- p.append('w');
- }
- if ((perms & ZooDefs.Perms.ADMIN) != 0) {
- p.append('a');
- }
- return p.toString();
- }
-
- public static String aclToString(List Use {@link ZKClientConfig#ZKClientConfig(Path configPath)} instead.
*
- * The signature of this method will be changed to throw {@link ConfigException}
- * instead of {@link QuorumPeerConfig.ConfigException} in future release.
+ * The signature of this method has been changed to throw {@link ConfigException}
+ * instead of {@code QuorumPeerConfig.ConfigException}.
*/
@Deprecated
- public ZKClientConfig(File configFile) throws QuorumPeerConfig.ConfigException {
+ public ZKClientConfig(File configFile) throws ConfigException {
super(configFile);
}
/**
* Use {@link ZKClientConfig#ZKClientConfig(Path configPath)} instead.
*
- * The signature of this method will be changed to throw {@link ConfigException}
- * instead of {@link QuorumPeerConfig.ConfigException} in future release.
+ * The signature of this method has been changed to throw {@link ConfigException}
+ * instead of {@code QuorumPeerConfig.ConfigException}.
*/
@Deprecated
- public ZKClientConfig(String configPath) throws QuorumPeerConfig.ConfigException {
+ public ZKClientConfig(String configPath) throws ConfigException {
super(configPath);
}
@@ -122,6 +122,11 @@ protected void handleBackwardCompatibility() {
setProperty(SECURE_CLIENT, System.getProperty(SECURE_CLIENT));
}
+ @Override
+ public boolean isClient() {
+ return true;
+ }
+
/**
* Returns true if the SASL client is enabled. By default, the client is
* enabled but can be disabled by setting the system property
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZooKeeperBuilder.java b/zookeeper-client/src/main/java/org/apache/zookeeper/client/ZooKeeperBuilder.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/client/ZooKeeperBuilder.java
rename to zookeeper-client/src/main/java/org/apache/zookeeper/client/ZooKeeperBuilder.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZooKeeperOptions.java b/zookeeper-client/src/main/java/org/apache/zookeeper/client/ZooKeeperOptions.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/client/ZooKeeperOptions.java
rename to zookeeper-client/src/main/java/org/apache/zookeeper/client/ZooKeeperOptions.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZooKeeperSaslClient.java b/zookeeper-client/src/main/java/org/apache/zookeeper/client/ZooKeeperSaslClient.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/client/ZooKeeperSaslClient.java
rename to zookeeper-client/src/main/java/org/apache/zookeeper/client/ZooKeeperSaslClient.java
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ConnectStringParserTest.java b/zookeeper-client/src/test/java/org/apache/zookeeper/client/ConnectStringParserTest.java
similarity index 96%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/test/ConnectStringParserTest.java
rename to zookeeper-client/src/test/java/org/apache/zookeeper/client/ConnectStringParserTest.java
index fc30e69920f..214412b557d 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ConnectStringParserTest.java
+++ b/zookeeper-client/src/test/java/org/apache/zookeeper/client/ConnectStringParserTest.java
@@ -16,14 +16,12 @@
* limitations under the License.
*/
-package org.apache.zookeeper.test;
+package org.apache.zookeeper.client;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.zookeeper.ZKTestCase;
-import org.apache.zookeeper.client.ConnectStringParser;
import org.junit.jupiter.api.Test;
-public class ConnectStringParserTest extends ZKTestCase {
+public class ConnectStringParserTest {
private static final int DEFAULT_PORT = 2181;
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/StaticHostProviderTest.java b/zookeeper-client/src/test/java/org/apache/zookeeper/client/StaticHostProviderTest.java
similarity index 99%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/test/StaticHostProviderTest.java
rename to zookeeper-client/src/test/java/org/apache/zookeeper/client/StaticHostProviderTest.java
index 2289847d4e4..b99ef37f8b2 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/StaticHostProviderTest.java
+++ b/zookeeper-client/src/test/java/org/apache/zookeeper/client/StaticHostProviderTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.zookeeper.test;
+package org.apache.zookeeper.client;
import static org.hamcrest.CoreMatchers.anyOf;
import static org.hamcrest.CoreMatchers.equalTo;
@@ -44,9 +44,6 @@
import java.util.List;
import java.util.Map;
import java.util.Random;
-import org.apache.zookeeper.ZKTestCase;
-import org.apache.zookeeper.client.HostProvider;
-import org.apache.zookeeper.client.StaticHostProvider;
import org.apache.zookeeper.common.Time;
import org.burningwave.tools.net.DefaultHostResolver;
import org.burningwave.tools.net.HostResolutionRequestInterceptor;
@@ -55,7 +52,7 @@
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-public class StaticHostProviderTest extends ZKTestCase {
+public class StaticHostProviderTest {
@BeforeAll
public static void setupDNSMocks() {
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/client/ZKClientConfigTest.java b/zookeeper-client/src/test/java/org/apache/zookeeper/client/ZKClientConfigTest.java
similarity index 100%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/client/ZKClientConfigTest.java
rename to zookeeper-client/src/test/java/org/apache/zookeeper/client/ZKClientConfigTest.java
diff --git a/zookeeper-common/pom.xml b/zookeeper-common/pom.xml
new file mode 100644
index 00000000000..6538e339c1c
--- /dev/null
+++ b/zookeeper-common/pom.xml
@@ -0,0 +1,254 @@
+
+ Use {@link ZKConfig#ZKConfig(Path configPath)} instead.
*
- * The signature of this method will be changed to throw {@link ConfigException}
- * instead of {@link QuorumPeerConfig.ConfigException} in future release.
+ * The signature of this method has been changed to throw {@link ConfigException}
+ * instead of {@code QuorumPeerConfig.ConfigException}.
*
* @param configPath
* Configuration file path
@@ -74,15 +75,15 @@ public ZKConfig() {
* if failed to load configuration properties
*/
@Deprecated
- public ZKConfig(String configPath) throws QuorumPeerConfig.ConfigException {
- this(new File(configPath));
+ public ZKConfig(String configPath) throws ConfigException {
+ this(Paths.get(configPath));
}
/**
* Use {@link ZKConfig#ZKConfig(Path configPath)} instead.
*
- * The signature of this method will be changed to throw {@link ConfigException}
- * instead of {@link QuorumPeerConfig.ConfigException} in future release.
+ * The signature of this method has been changed to throw {@link ConfigException}
+ * instead of {@code QuorumPeerConfig.ConfigException}.
*
* @param configFile
* Configuration file
@@ -90,10 +91,8 @@ public ZKConfig(String configPath) throws QuorumPeerConfig.ConfigException {
* if failed to load configuration properties
*/
@Deprecated
- public ZKConfig(File configFile) throws QuorumPeerConfig.ConfigException {
- this();
- addConfiguration(configFile);
- LOG.info("ZK Config {}", this.properties);
+ public ZKConfig(File configFile) throws ConfigException {
+ this(configFile.toPath());
}
/**
@@ -102,9 +101,10 @@ public ZKConfig(File configFile) throws QuorumPeerConfig.ConfigException {
* @param configPath path to configuration file
* @throws ConfigException
*/
- @SuppressWarnings("deprecation")
public ZKConfig(Path configPath) throws ConfigException {
- this(configPath.toFile());
+ this();
+ addConfiguration(configPath);
+ LOG.info("ZK Config {}", this.properties);
}
private void init() {
@@ -122,40 +122,17 @@ private void init() {
*/
protected void handleBackwardCompatibility() {
properties.put(JUTE_MAXBUFFER, System.getProperty(JUTE_MAXBUFFER));
- properties.put(KINIT_COMMAND, System.getProperty(KINIT_COMMAND));
properties.put(JGSS_NATIVE, System.getProperty(JGSS_NATIVE));
- try (ClientX509Util clientX509Util = new ClientX509Util()) {
- putSSLProperties(clientX509Util);
- properties.put(clientX509Util.getSslAuthProviderProperty(), System.getProperty(clientX509Util.getSslAuthProviderProperty()));
- properties.put(clientX509Util.getSslProviderProperty(), System.getProperty(clientX509Util.getSslProviderProperty()));
- }
-
- try (X509Util x509Util = new QuorumX509Util()) {
- putSSLProperties(x509Util);
- }
+ System.getProperties().forEach((key, value) -> {
+ if (((String) key).startsWith("zookeeper.")) {
+ properties.put((String) key, (String) value);
+ }
+ });
}
- private void putSSLProperties(X509Util x509Util) {
- properties.put(x509Util.getSslProtocolProperty(), System.getProperty(x509Util.getSslProtocolProperty()));
- properties.put(x509Util.getSslEnabledProtocolsProperty(), System.getProperty(x509Util.getSslEnabledProtocolsProperty()));
- properties.put(x509Util.getSslCipherSuitesProperty(), System.getProperty(x509Util.getSslCipherSuitesProperty()));
- properties.put(x509Util.getSslKeystoreLocationProperty(), System.getProperty(x509Util.getSslKeystoreLocationProperty()));
- properties.put(x509Util.getSslKeystorePasswdProperty(), System.getProperty(x509Util.getSslKeystorePasswdProperty()));
- properties.put(x509Util.getSslKeystorePasswdPathProperty(), System.getProperty(x509Util.getSslKeystorePasswdPathProperty()));
- properties.put(x509Util.getSslKeystoreTypeProperty(), System.getProperty(x509Util.getSslKeystoreTypeProperty()));
- properties.put(x509Util.getSslTruststoreLocationProperty(), System.getProperty(x509Util.getSslTruststoreLocationProperty()));
- properties.put(x509Util.getSslTruststorePasswdProperty(), System.getProperty(x509Util.getSslTruststorePasswdProperty()));
- properties.put(x509Util.getSslTruststorePasswdPathProperty(), System.getProperty(x509Util.getSslTruststorePasswdPathProperty()));
- properties.put(x509Util.getSslTruststoreTypeProperty(), System.getProperty(x509Util.getSslTruststoreTypeProperty()));
- properties.put(x509Util.getSslContextSupplierClassProperty(), System.getProperty(x509Util.getSslContextSupplierClassProperty()));
- properties.put(x509Util.getSslClientHostnameVerificationEnabledProperty(), System.getProperty(x509Util.getSslClientHostnameVerificationEnabledProperty()));
- properties.put(x509Util.getSslHostnameVerificationEnabledProperty(), System.getProperty(x509Util.getSslHostnameVerificationEnabledProperty()));
- properties.put(x509Util.getSslCrlEnabledProperty(), System.getProperty(x509Util.getSslCrlEnabledProperty()));
- properties.put(x509Util.getSslOcspEnabledProperty(), System.getProperty(x509Util.getSslOcspEnabledProperty()));
- properties.put(x509Util.getSslClientAuthProperty(), System.getProperty(x509Util.getSslClientAuthProperty()));
- properties.put(x509Util.getSslHandshakeDetectionTimeoutMillisProperty(), System.getProperty(x509Util.getSslHandshakeDetectionTimeoutMillisProperty()));
- properties.put(x509Util.getFipsModeProperty(), System.getProperty(x509Util.getFipsModeProperty()));
+ public boolean isClient() {
+ return false;
}
/**
@@ -215,16 +192,39 @@ public void setProperty(String key, String value) {
*
* @param configPath path to Configuration file.
*/
- @SuppressWarnings("deprecation")
public void addConfiguration(Path configPath) throws ConfigException {
- addConfiguration(configPath.toFile());
+ Path absoluteConfigPath = configPath.toAbsolutePath();
+ LOG.info("Reading configuration from: {}", absoluteConfigPath);
+ try {
+ File configFile = (new VerifyingFileFactory.Builder(LOG).warnForRelativePath()
+ .failForNonExistingPath()
+ .build()).validate(configPath.toFile());
+ Properties cfg = new Properties();
+ try (FileInputStream in = new FileInputStream(configFile)) {
+ cfg.load(in);
+ }
+ parseProperties(cfg);
+ } catch (IOException | IllegalArgumentException e) {
+ LOG.error("Error while configuration from: {}", absoluteConfigPath, e);
+ String msg = "Error while processing " + absoluteConfigPath;
+ try {
+ Class clazz = Class.forName("org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException");
+ Class exceptionClass = clazz.asSubclass(ConfigException.class);
+ Constructor constructor = exceptionClass.getDeclaredConstructor(String.class, Exception.class);
+ throw constructor.newInstance(msg, e);
+ } catch (ClassNotFoundException ignored) {
+ } catch (Exception ignored) {
+ LOG.warn("Fail to construct QuorumPeerConfig.ConfigException", e);
+ }
+ throw new ConfigException(msg, e);
+ }
}
/**
* Use {@link #addConfiguration(Path)} instead. The signature of this method will be changed to throw {@link ConfigException}
- * instead of {@link QuorumPeerConfig.ConfigException} in future release.
+ * The signature of this method has been changed to throw {@link ConfigException}
+ * instead of {@code QuorumPeerConfig.ConfigException}.
*
* Add a configuration resource. The properties form this configuration will
* overwrite corresponding already loaded property and system property
@@ -233,31 +233,15 @@ public void addConfiguration(Path configPath) throws ConfigException {
* Configuration file.
*/
@Deprecated
- public void addConfiguration(File configFile) throws QuorumPeerConfig.ConfigException {
- LOG.info("Reading configuration from: {}", configFile.getAbsolutePath());
- try {
- configFile = (new VerifyingFileFactory.Builder(LOG).warnForRelativePath()
- .failForNonExistingPath()
- .build()).validate(configFile);
- Properties cfg = new Properties();
- FileInputStream in = new FileInputStream(configFile);
- try {
- cfg.load(in);
- } finally {
- in.close();
- }
- parseProperties(cfg);
- } catch (IOException | IllegalArgumentException e) {
- LOG.error("Error while configuration from: {}", configFile.getAbsolutePath(), e);
- throw new QuorumPeerConfig.ConfigException("Error while processing " + configFile.getAbsolutePath(), e);
- }
+ public void addConfiguration(File configFile) throws ConfigException {
+ addConfiguration(configFile.toPath());
}
/**
* Use {@link #addConfiguration(Path)} instead. The signature of this method will be changed to throw {@link ConfigException}
- * instead of {@link QuorumPeerConfig.ConfigException} in future release.
+ * The signature of this method has been changed to throw {@link ConfigException}
+ * instead of {@code QuorumPeerConfig.ConfigException}.
*
* Add a configuration resource. The properties form this configuration will
* overwrite corresponding already loaded property and system property
@@ -266,8 +250,8 @@ public void addConfiguration(File configFile) throws QuorumPeerConfig.ConfigExce
* Configuration file path.
*/
@Deprecated
- public void addConfiguration(String configPath) throws QuorumPeerConfig.ConfigException {
- addConfiguration(new File(configPath));
+ public void addConfiguration(String configPath) throws ConfigException {
+ addConfiguration(Paths.get(configPath));
}
private void parseProperties(Properties cfg) {
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKHostnameVerifier.java b/zookeeper-common/src/main/java/org/apache/zookeeper/common/ZKHostnameVerifier.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKHostnameVerifier.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/common/ZKHostnameVerifier.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKTrustManager.java b/zookeeper-common/src/main/java/org/apache/zookeeper/common/ZKTrustManager.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKTrustManager.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/common/ZKTrustManager.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/compat/ProtocolManager.java b/zookeeper-common/src/main/java/org/apache/zookeeper/compat/ProtocolManager.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/compat/ProtocolManager.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/compat/ProtocolManager.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ByteBufferInputStream.java b/zookeeper-common/src/main/java/org/apache/zookeeper/server/ByteBufferInputStream.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/server/ByteBufferInputStream.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/server/ByteBufferInputStream.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/EphemeralType.java b/zookeeper-common/src/main/java/org/apache/zookeeper/server/EphemeralType.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/server/EphemeralType.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/server/EphemeralType.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/EphemeralTypeEmulate353.java b/zookeeper-common/src/main/java/org/apache/zookeeper/server/EphemeralTypeEmulate353.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/server/EphemeralTypeEmulate353.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/server/EphemeralTypeEmulate353.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ExitCode.java b/zookeeper-common/src/main/java/org/apache/zookeeper/server/ExitCode.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/server/ExitCode.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/server/ExitCode.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperThread.java b/zookeeper-common/src/main/java/org/apache/zookeeper/server/ZooKeeperThread.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperThread.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/server/ZooKeeperThread.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/KerberosName.java b/zookeeper-common/src/main/java/org/apache/zookeeper/server/auth/KerberosName.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/KerberosName.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/server/auth/KerberosName.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/util/KerberosUtil.java b/zookeeper-common/src/main/java/org/apache/zookeeper/server/util/KerberosUtil.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/server/util/KerberosUtil.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/server/util/KerberosUtil.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/util/VerifyingFileFactory.java b/zookeeper-common/src/main/java/org/apache/zookeeper/server/util/VerifyingFileFactory.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/server/util/VerifyingFileFactory.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/server/util/VerifyingFileFactory.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/watch/PathParentIterator.java b/zookeeper-common/src/main/java/org/apache/zookeeper/server/watch/PathParentIterator.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/server/watch/PathParentIterator.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/server/watch/PathParentIterator.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/util/PemReader.java b/zookeeper-common/src/main/java/org/apache/zookeeper/util/PemReader.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/util/PemReader.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/util/PemReader.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/util/SecurityUtils.java b/zookeeper-common/src/main/java/org/apache/zookeeper/util/SecurityUtils.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/util/SecurityUtils.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/util/SecurityUtils.java
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/util/ServiceUtils.java b/zookeeper-common/src/main/java/org/apache/zookeeper/util/ServiceUtils.java
similarity index 100%
rename from zookeeper-server/src/main/java/org/apache/zookeeper/util/ServiceUtils.java
rename to zookeeper-common/src/main/java/org/apache/zookeeper/util/ServiceUtils.java
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/CreateModeTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/CreateModeTest.java
similarity index 93%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/test/CreateModeTest.java
rename to zookeeper-common/src/test/java/org/apache/zookeeper/CreateModeTest.java
index ee2e4f4f75e..29388bd4776 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/CreateModeTest.java
+++ b/zookeeper-common/src/test/java/org/apache/zookeeper/CreateModeTest.java
@@ -16,20 +16,17 @@
* limitations under the License.
*/
-package org.apache.zookeeper.test;
+package org.apache.zookeeper;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.util.EnumSet;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.Code;
-import org.apache.zookeeper.ZKTestCase;
import org.junit.jupiter.api.Test;
-public class CreateModeTest extends ZKTestCase {
+public class CreateModeTest {
@Test
public void testBasicCreateMode() {
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/EventTypeTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/EventTypeTest.java
similarity index 92%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/test/EventTypeTest.java
rename to zookeeper-common/src/test/java/org/apache/zookeeper/EventTypeTest.java
index b7ff295d933..54f4a3666ea 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/EventTypeTest.java
+++ b/zookeeper-common/src/test/java/org/apache/zookeeper/EventTypeTest.java
@@ -16,16 +16,15 @@
* limitations under the License.
*/
-package org.apache.zookeeper.test;
+package org.apache.zookeeper;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import java.util.EnumSet;
import org.apache.zookeeper.Watcher.Event.EventType;
-import org.apache.zookeeper.ZKTestCase;
import org.junit.jupiter.api.Test;
-public class EventTypeTest extends ZKTestCase {
+public class EventTypeTest {
@Test
public void testIntConversion() {
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/KeeperStateTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/KeeperStateTest.java
similarity index 94%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/test/KeeperStateTest.java
rename to zookeeper-common/src/test/java/org/apache/zookeeper/KeeperStateTest.java
index 9d0833205c9..fcd6006a175 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/KeeperStateTest.java
+++ b/zookeeper-common/src/test/java/org/apache/zookeeper/KeeperStateTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.zookeeper.test;
+package org.apache.zookeeper;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -24,10 +24,9 @@
import java.util.EnumSet;
import org.apache.zookeeper.KeeperException.Code;
import org.apache.zookeeper.Watcher.Event.KeeperState;
-import org.apache.zookeeper.ZKTestCase;
import org.junit.jupiter.api.Test;
-public class KeeperStateTest extends ZKTestCase {
+public class KeeperStateTest {
@Test
public void testIntConversion() {
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/MultiOperationRecordTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/MultiOperationRecordTest.java
similarity index 97%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/MultiOperationRecordTest.java
rename to zookeeper-common/src/test/java/org/apache/zookeeper/MultiOperationRecordTest.java
index df8d8b91642..45423567046 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/MultiOperationRecordTest.java
+++ b/zookeeper-common/src/test/java/org/apache/zookeeper/MultiOperationRecordTest.java
@@ -27,7 +27,7 @@
import org.apache.zookeeper.server.ByteBufferInputStream;
import org.junit.jupiter.api.Test;
-public class MultiOperationRecordTest extends ZKTestCase {
+public class MultiOperationRecordTest {
@Test
public void testRoundTrip() throws IOException {
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchedEventTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/WatchedEventTest.java
similarity index 95%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchedEventTest.java
rename to zookeeper-common/src/test/java/org/apache/zookeeper/WatchedEventTest.java
index a9bc11da2a6..9912dd3201b 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchedEventTest.java
+++ b/zookeeper-common/src/test/java/org/apache/zookeeper/WatchedEventTest.java
@@ -16,19 +16,17 @@
* limitations under the License.
*/
-package org.apache.zookeeper.test;
+package org.apache.zookeeper;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import java.util.EnumSet;
-import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher.Event.EventType;
import org.apache.zookeeper.Watcher.Event.KeeperState;
-import org.apache.zookeeper.ZKTestCase;
import org.apache.zookeeper.proto.WatcherEvent;
import org.junit.jupiter.api.Test;
-public class WatchedEventTest extends ZKTestCase {
+public class WatchedEventTest {
@Test
public void testCreatingWatchedEvent() {
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/common/CertificatesToPlayWith.java b/zookeeper-common/src/test/java/org/apache/zookeeper/common/CertificatesToPlayWith.java
similarity index 100%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/common/CertificatesToPlayWith.java
rename to zookeeper-common/src/test/java/org/apache/zookeeper/common/CertificatesToPlayWith.java
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/common/KeyStoreFileTypeTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/common/KeyStoreFileTypeTest.java
similarity index 98%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/common/KeyStoreFileTypeTest.java
rename to zookeeper-common/src/test/java/org/apache/zookeeper/common/KeyStoreFileTypeTest.java
index 3f7faaabcc5..5153fa58079 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/common/KeyStoreFileTypeTest.java
+++ b/zookeeper-common/src/test/java/org/apache/zookeeper/common/KeyStoreFileTypeTest.java
@@ -21,10 +21,9 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.apache.zookeeper.ZKTestCase;
import org.junit.jupiter.api.Test;
-public class KeyStoreFileTypeTest extends ZKTestCase {
+public class KeyStoreFileTypeTest {
@Test
public void testGetPropertyValue() {
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/common/NetUtilsTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/common/NetUtilsTest.java
similarity index 98%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/common/NetUtilsTest.java
rename to zookeeper-common/src/test/java/org/apache/zookeeper/common/NetUtilsTest.java
index fbe49221470..48396175b46 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/common/NetUtilsTest.java
+++ b/zookeeper-common/src/test/java/org/apache/zookeeper/common/NetUtilsTest.java
@@ -23,10 +23,9 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.net.InetSocketAddress;
-import org.apache.zookeeper.ZKTestCase;
import org.junit.jupiter.api.Test;
-public class NetUtilsTest extends ZKTestCase {
+public class NetUtilsTest {
private Integer port = 1234;
private String v4addr = "127.0.0.1";
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/common/PathUtilsTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/common/PathUtilsTest.java
similarity index 98%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/common/PathUtilsTest.java
rename to zookeeper-common/src/test/java/org/apache/zookeeper/common/PathUtilsTest.java
index fb4f4bd73bd..ff1018c5b35 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/common/PathUtilsTest.java
+++ b/zookeeper-common/src/test/java/org/apache/zookeeper/common/PathUtilsTest.java
@@ -21,10 +21,9 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.apache.zookeeper.ZKTestCase;
import org.junit.jupiter.api.Test;
-public class PathUtilsTest extends ZKTestCase {
+public class PathUtilsTest {
@Test
public void testValidatePath_ValidPath() {
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java
similarity index 100%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java
rename to zookeeper-common/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKHostnameVerifierTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/common/ZKHostnameVerifierTest.java
similarity index 100%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKHostnameVerifierTest.java
rename to zookeeper-common/src/test/java/org/apache/zookeeper/common/ZKHostnameVerifierTest.java
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/compat/ProtocolManagerTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/compat/ProtocolManagerTest.java
similarity index 100%
rename from zookeeper-server/src/test/java/org/apache/zookeeper/compat/ProtocolManagerTest.java
rename to zookeeper-common/src/test/java/org/apache/zookeeper/compat/ProtocolManagerTest.java
diff --git a/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml b/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
index f78a8fdce09..7198149f860 100644
--- a/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
@@ -49,7 +49,7 @@
This module exists for two purposes: + *
DON'T DELETE THIS FILE. + * + *
`maven-bundle-plugin` does not include classes if there is no source code. I have no idea why. + * + *
As far as I know OSGI could not tolerate overlapping package paths cross bundles. But we have + * jute classes `FileHeader`, `LearnerInfo`, `QuorumAuthPacket` and `QuorumPacket` in `zookeeper-jute` + * under package `o.a.zookeeper.server` which is exported by `zookeeper` but not `zookeeper-jute`. + * + *
We have to include above classes to this bundle without bring other classes from `zookeeper-jute`. + * `Embed-Dependency` can't handle this as we can not embed `zookeeper-jute` while jar of `zookeeper-server` + * does not contain those classes. So we have to resort to exclude/include from `Export-Package` as before. + * But, it does not work if there is no source code, so we have this file for OSGI bundle. + */ +package org.apache.zookeeper; diff --git a/zookeeper-server/src/main/resources/LICENSE.txt b/zookeeper/src/main/resources/LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/LICENSE.txt rename to zookeeper/src/main/resources/LICENSE.txt diff --git a/zookeeper-server/src/main/resources/NOTICE.txt b/zookeeper/src/main/resources/NOTICE.txt similarity index 100% rename from zookeeper-server/src/main/resources/NOTICE.txt rename to zookeeper/src/main/resources/NOTICE.txt diff --git a/zookeeper-server/src/main/resources/lib/commons-cli-1.5.0.LICENSE.txt b/zookeeper/src/main/resources/lib/commons-cli-1.5.0.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/commons-cli-1.5.0.LICENSE.txt rename to zookeeper/src/main/resources/lib/commons-cli-1.5.0.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/commons-io-2.11.0.LICENSE.txt b/zookeeper/src/main/resources/lib/commons-io-2.11.0.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/commons-io-2.11.0.LICENSE.txt rename to zookeeper/src/main/resources/lib/commons-io-2.11.0.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/jetty-client-9.4.57.v20241219.LICENSE.txt b/zookeeper/src/main/resources/lib/jetty-client-9.4.57.v20241219.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/jetty-client-9.4.57.v20241219.LICENSE.txt rename to zookeeper/src/main/resources/lib/jetty-client-9.4.57.v20241219.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/jetty-http-9.4.57.v20241219.LICENSE.txt b/zookeeper/src/main/resources/lib/jetty-http-9.4.57.v20241219.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/jetty-http-9.4.57.v20241219.LICENSE.txt rename to zookeeper/src/main/resources/lib/jetty-http-9.4.57.v20241219.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/jetty-io-9.4.57.v20241219.LICENSE.txt b/zookeeper/src/main/resources/lib/jetty-io-9.4.57.v20241219.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/jetty-io-9.4.57.v20241219.LICENSE.txt rename to zookeeper/src/main/resources/lib/jetty-io-9.4.57.v20241219.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/jetty-security-9.4.57.v20241219.LICENSE.txt b/zookeeper/src/main/resources/lib/jetty-security-9.4.57.v20241219.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/jetty-security-9.4.57.v20241219.LICENSE.txt rename to zookeeper/src/main/resources/lib/jetty-security-9.4.57.v20241219.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/jetty-server-9.4.57.v20241219.LICENSE.txt b/zookeeper/src/main/resources/lib/jetty-server-9.4.57.v20241219.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/jetty-server-9.4.57.v20241219.LICENSE.txt rename to zookeeper/src/main/resources/lib/jetty-server-9.4.57.v20241219.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/jetty-servlet-9.4.57.v20241219.LICENSE.txt b/zookeeper/src/main/resources/lib/jetty-servlet-9.4.57.v20241219.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/jetty-servlet-9.4.57.v20241219.LICENSE.txt rename to zookeeper/src/main/resources/lib/jetty-servlet-9.4.57.v20241219.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/jetty-util-9.4.57.v20241219.LICENSE.txt b/zookeeper/src/main/resources/lib/jetty-util-9.4.57.v20241219.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/jetty-util-9.4.57.v20241219.LICENSE.txt rename to zookeeper/src/main/resources/lib/jetty-util-9.4.57.v20241219.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/jetty-util-ajax-9.4.57.v20241219.LICENSE.txt b/zookeeper/src/main/resources/lib/jetty-util-ajax-9.4.57.v20241219.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/jetty-util-ajax-9.4.57.v20241219.LICENSE.txt rename to zookeeper/src/main/resources/lib/jetty-util-ajax-9.4.57.v20241219.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/jline-2.14.6.LICENSE.txt b/zookeeper/src/main/resources/lib/jline-2.14.6.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/jline-2.14.6.LICENSE.txt rename to zookeeper/src/main/resources/lib/jline-2.14.6.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/logback-classic-1.3.15.LICENSE.txt b/zookeeper/src/main/resources/lib/logback-classic-1.3.15.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/logback-classic-1.3.15.LICENSE.txt rename to zookeeper/src/main/resources/lib/logback-classic-1.3.15.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/logback-core-1.3.15.LICENSE.txt b/zookeeper/src/main/resources/lib/logback-core-1.3.15.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/logback-core-1.3.15.LICENSE.txt rename to zookeeper/src/main/resources/lib/logback-core-1.3.15.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/metrics-core-4.1.12.1.jar_LICENSE.txt b/zookeeper/src/main/resources/lib/metrics-core-4.1.12.1.jar_LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/metrics-core-4.1.12.1.jar_LICENSE.txt rename to zookeeper/src/main/resources/lib/metrics-core-4.1.12.1.jar_LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/netty-buffer-4.1.119.Final.LICENSE.txt b/zookeeper/src/main/resources/lib/netty-buffer-4.1.119.Final.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/netty-buffer-4.1.119.Final.LICENSE.txt rename to zookeeper/src/main/resources/lib/netty-buffer-4.1.119.Final.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/netty-codec-4.1.119.Final.LICENSE.txt b/zookeeper/src/main/resources/lib/netty-codec-4.1.119.Final.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/netty-codec-4.1.119.Final.LICENSE.txt rename to zookeeper/src/main/resources/lib/netty-codec-4.1.119.Final.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/netty-common-4.1.119.Final.LICENSE.txt b/zookeeper/src/main/resources/lib/netty-common-4.1.119.Final.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/netty-common-4.1.119.Final.LICENSE.txt rename to zookeeper/src/main/resources/lib/netty-common-4.1.119.Final.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/netty-handler-4.1.119.Final.LICENSE.txt b/zookeeper/src/main/resources/lib/netty-handler-4.1.119.Final.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/netty-handler-4.1.119.Final.LICENSE.txt rename to zookeeper/src/main/resources/lib/netty-handler-4.1.119.Final.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/netty-resolver-4.1.119.Final.LICENSE.txt b/zookeeper/src/main/resources/lib/netty-resolver-4.1.119.Final.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/netty-resolver-4.1.119.Final.LICENSE.txt rename to zookeeper/src/main/resources/lib/netty-resolver-4.1.119.Final.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-4.1.119.Final.LICENSE.txt b/zookeeper/src/main/resources/lib/netty-transport-4.1.119.Final.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/netty-transport-4.1.119.Final.LICENSE.txt rename to zookeeper/src/main/resources/lib/netty-transport-4.1.119.Final.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-classes-epoll-4.1.119.Final.LICENSE.txt b/zookeeper/src/main/resources/lib/netty-transport-classes-epoll-4.1.119.Final.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/netty-transport-classes-epoll-4.1.119.Final.LICENSE.txt rename to zookeeper/src/main/resources/lib/netty-transport-classes-epoll-4.1.119.Final.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.119.Final.LICENSE.txt b/zookeeper/src/main/resources/lib/netty-transport-native-unix-common-4.1.119.Final.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/netty-transport-native-unix-common-4.1.119.Final.LICENSE.txt rename to zookeeper/src/main/resources/lib/netty-transport-native-unix-common-4.1.119.Final.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/simpleclient-0.9.0.LICENSE.txt b/zookeeper/src/main/resources/lib/simpleclient-0.9.0.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/simpleclient-0.9.0.LICENSE.txt rename to zookeeper/src/main/resources/lib/simpleclient-0.9.0.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/simpleclient_common-0.9.0_LICENSE.txt b/zookeeper/src/main/resources/lib/simpleclient_common-0.9.0_LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/simpleclient_common-0.9.0_LICENSE.txt rename to zookeeper/src/main/resources/lib/simpleclient_common-0.9.0_LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/simpleclient_hotspot-0.9.0_LICENSE.txt b/zookeeper/src/main/resources/lib/simpleclient_hotspot-0.9.0_LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/simpleclient_hotspot-0.9.0_LICENSE.txt rename to zookeeper/src/main/resources/lib/simpleclient_hotspot-0.9.0_LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/simpleclient_servlet-0.9.0_LICENSE.txt b/zookeeper/src/main/resources/lib/simpleclient_servlet-0.9.0_LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/simpleclient_servlet-0.9.0_LICENSE.txt rename to zookeeper/src/main/resources/lib/simpleclient_servlet-0.9.0_LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/slf4j-2.0.13.LICENSE.txt b/zookeeper/src/main/resources/lib/slf4j-2.0.13.LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/slf4j-2.0.13.LICENSE.txt rename to zookeeper/src/main/resources/lib/slf4j-2.0.13.LICENSE.txt diff --git a/zookeeper-server/src/main/resources/lib/snappy-java-1.1.10.5.jar_LICENSE.txt b/zookeeper/src/main/resources/lib/snappy-java-1.1.10.5.jar_LICENSE.txt similarity index 100% rename from zookeeper-server/src/main/resources/lib/snappy-java-1.1.10.5.jar_LICENSE.txt rename to zookeeper/src/main/resources/lib/snappy-java-1.1.10.5.jar_LICENSE.txt diff --git a/zookeeper-server/src/main/resources/overview.html b/zookeeper/src/main/resources/overview.html similarity index 100% rename from zookeeper-server/src/main/resources/overview.html rename to zookeeper/src/main/resources/overview.html