diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-10-20 19:56:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-20 19:56:41 +0200 |
| commit | 20138e8a44b6084b6930fc84f312266866b1c69c (patch) | |
| tree | 7c68d3d819de34fba21647c4da98f5204fb0aa74 /configserver | |
| parent | 5a7a981b3d5e763ec363e1b2463b12d392d292bf (diff) | |
Revert "Revert "Move ZooKeeperServer to another module""
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | configserver/src/main/resources/configserver-app/services.xml | 2 |
2 files changed, 2 insertions, 1 deletions
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/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" /> |