From f97f7cd2b489e1fa1d45e6c3315399fd858e677e Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Tue, 22 Oct 2019 10:34:08 +0200
Subject: Revert "Revert "Reapply "move ZooKeeperServer to another module"""

---
 configserver/CMakeLists.txt                                   | 1 +
 configserver/pom.xml                                          | 6 ++++++
 configserver/src/main/resources/configserver-app/services.xml | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'configserver')

diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt
index 8f939e54d55..54961945407 100644
--- a/configserver/CMakeLists.txt
+++ b/configserver/CMakeLists.txt
@@ -20,4 +20,5 @@ install_symlink(lib/jars/service-monitor-jar-with-dependencies.jar conf/configse
 install_symlink(lib/jars/application-model-jar-with-dependencies.jar conf/configserver-app/components/application-model.jar)
 install_symlink(lib/jars/node-repository-jar-with-dependencies.jar conf/configserver-app/components/node-repository.jar)
 install_symlink(lib/jars/zkfacade-jar-with-dependencies.jar conf/configserver-app/components/zkfacade.jar)
+install_symlink(lib/jars/zookeeper-server-jar-with-dependencies.jar conf/configserver-app/components/zookeeper-server.jar)
 install_symlink(conf/configserver-app/components lib/jars/config-models)
diff --git a/configserver/pom.xml b/configserver/pom.xml
index 778b6264f5e..de7fe02452f 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -190,6 +190,12 @@
       <version>${project.version}</version>
       <scope>compile</scope> <!-- TODO Should ideally be provided, but this bundle is not installed as part of configserver. Orchestrator bundle also includes jaxrs_client_utils in compile scope -->
     </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>zookeeper-server</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml
index 97b2156e8ca..25e6a727841 100644
--- a/configserver/src/main/resources/configserver-app/services.xml
+++ b/configserver/src/main/resources/configserver-app/services.xml
@@ -11,7 +11,7 @@
 
     <component id="com.yahoo.vespa.config.server.ConfigServerBootstrap" bundle="configserver" />
     <component id="com.yahoo.vespa.config.server.monitoring.Metrics" bundle="configserver" />
-    <component id="com.yahoo.vespa.zookeeper.ZooKeeperServer" bundle="zkfacade" />
+    <component id="com.yahoo.vespa.zookeeper.ZooKeeperServer" bundle="zookeeper-server" />
     <component id="com.yahoo.vespa.config.server.rpc.RpcServer" bundle="configserver" />
     <component id="com.yahoo.vespa.config.server.ConfigServerDB" bundle="configserver" />
     <component id="com.yahoo.vespa.config.server.session.FileDistributionFactory" bundle="configserver" />
-- 
cgit v1.2.3