Add shared ZK client config generator for zkfacade and vespa-zkcli

2 files changed, 20 insertions, 1 deletions

diff --git a/zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java b/zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java
new file mode 100644
index 00000000000..1bc1a21a237
--- /dev/null
+++ b/zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java
@@ -0,0 +1,19 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.zookeeper.cli;
+
+import com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder;
+import org.apache.zookeeper.ZooKeeperMain;
+
+import java.io.IOException;
+
+/**
+ * @author bjorncs
+ */
+public class Main {
+    public static void main(String[] args) throws IOException, InterruptedException {
+        new ZkClientConfigBuilder()
+                .toConfigProperties()
+                .forEach(System::setProperty);
+        ZooKeeperMain.main(args);
+    }
+}
diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zkcli b/zookeeper-command-line-client/src/main/sh/vespa-zkcli
index 5c29f9bb084..1a5858b3222 100755
--- a/zookeeper-command-line-client/src/main/sh/vespa-zkcli
+++ b/zookeeper-command-line-client/src/main/sh/vespa-zkcli
@@ -95,4 +95,4 @@ done
 $sudo java \
 	-cp $VESPA_HOME/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \
 	-Dlog4j.configuration="log4j-vespa.properties" -Xms32m -Xmx512m \
-	org.apache.zookeeper.ZooKeeperMain "$@"
+	com.yahoo.vespa.zookeeper.cli.Main "$@"