diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-03-11 13:51:42 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-03-11 13:51:42 +0100 |
commit | 8dfd194e88197552c6dcb9c0806c024868c61dba (patch) | |
tree | 2f2d00d96a81b95bb97333e0812f3e96ac9eeb80 /zookeeper-command-line-client | |
parent | b310bcb0d382dcb2f5c481902772c591a77197d8 (diff) |
Add shared ZK client config generator for zkfacade and vespa-zkcli
Diffstat (limited to 'zookeeper-command-line-client')
3 files changed, 33 insertions, 2 deletions
diff --git a/zookeeper-command-line-client/pom.xml b/zookeeper-command-line-client/pom.xml index 748a156b30c..c186b377eb6 100644 --- a/zookeeper-command-line-client/pom.xml +++ b/zookeeper-command-line-client/pom.xml @@ -17,6 +17,18 @@ <version>${zookeeper.client.version}</version> </dependency> <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>zookeeper-client-common</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>security-utils</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> <!-- Needed by vespa-zkcli --> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> @@ -34,7 +46,7 @@ <configuration> <archive> <manifest> - <mainClass>org.apache.zookeeper.ZooKeeperMain</mainClass> + <mainClass>com.yahoo.vespa.zookeeper.cli.Main</mainClass> </manifest> </archive> <descriptorRefs> 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 "$@" |