diff options
| -rw-r--r-- | clustercontroller-apps/pom.xml | 6 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java | 3 | ||||
| -rw-r--r-- | configserver/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | configserver/pom.xml | 6 | ||||
| -rw-r--r-- | configserver/src/main/resources/configserver-app/services.xml | 2 | ||||
| -rw-r--r-- | container-disc/pom.xml | 1 | ||||
| -rw-r--r-- | standalone-container/vespa-standalone-container.spec | 1 | ||||
| -rw-r--r-- | zkfacade/pom.xml | 12 | ||||
| -rw-r--r-- | zookeeper-server/pom.xml | 6 | ||||
| -rw-r--r-- | zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java (renamed from zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java) | 0 | ||||
| -rw-r--r-- | zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/package-info.java (renamed from zkfacade/src/main/java/com/yahoo/vespa/zookeeper/package-info.java) | 0 | ||||
| -rw-r--r-- | zookeeper-server/src/test/java/com/yahoo/vespa/zookeeper/ZooKeeperServerTest.java (renamed from zkfacade/src/test/java/com/yahoo/vespa/zookeeper/ZooKeeperServerTest.java) | 0 |
12 files changed, 36 insertions, 2 deletions
diff --git a/clustercontroller-apps/pom.xml b/clustercontroller-apps/pom.xml index acd9656db38..8d8255493bf 100644 --- a/clustercontroller-apps/pom.xml +++ b/clustercontroller-apps/pom.xml @@ -54,6 +54,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>zookeeper-server</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> <scope>test</scope> diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java index a9af815aa1e..e45bf3f0921 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java @@ -29,7 +29,7 @@ public class ClusterControllerContainer extends Container implements ZookeeperServerConfig.Producer { private static final ComponentSpecification CLUSTERCONTROLLER_BUNDLE = new ComponentSpecification("clustercontroller-apps"); - private static final ComponentSpecification ZOOKEEPER_SERVER_BUNDLE = new ComponentSpecification("zkfacade"); + private static final ComponentSpecification ZOOKEEPER_SERVER_BUNDLE = new ComponentSpecification("zookeeper-server"); private final Set<String> bundles = new TreeSet<>(); @@ -59,6 +59,7 @@ public class ClusterControllerContainer extends Container implements addFileBundle("lib/jars/clustercontroller-apputil-jar-with-dependencies.jar"); addFileBundle("lib/jars/clustercontroller-core-jar-with-dependencies.jar"); addFileBundle("lib/jars/clustercontroller-utils-jar-with-dependencies.jar"); + addFileBundle("lib/jars/zookeeper-server-jar-with-dependencies.jar"); } @Override 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 @@ -191,6 +191,12 @@ <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> <scope>provided</scope> 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" /> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 6506d6862cb..98fb483f9bc 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -166,6 +166,7 @@ defaults-jar-with-dependencies.jar, component-jar-with-dependencies.jar, zkfacade-jar-with-dependencies.jar, + zookeeper-server-jar-with-dependencies.jar, <!-- Misc 3rd party bundles --> bcpkix-jdk15on-${bouncycastle.version}.jar, bcprov-jdk15on-${bouncycastle.version}.jar, diff --git a/standalone-container/vespa-standalone-container.spec b/standalone-container/vespa-standalone-container.spec index 31312bde6f7..c8029a81bf6 100644 --- a/standalone-container/vespa-standalone-container.spec +++ b/standalone-container/vespa-standalone-container.spec @@ -62,6 +62,7 @@ declare -a modules=( vespa-athenz vespaclient-container-plugin zkfacade + zookeeper-server ) for module in "${modules[@]}"; do cp "$module"/target/"$module"-jar-with-dependencies.jar "$jars_dir" diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index 8b2a90abc12..e32a86937e8 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -36,6 +36,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>zookeeper-server</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> </dependency> @@ -60,6 +66,12 @@ <artifactId>slf4j-jdk14</artifactId> </dependency> <dependency> + <!-- Needed to have the same version as slf4j-api --> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.7.5</version> + </dependency> + <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>vespalog</artifactId> <version>${project.version}</version> diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml index 54d73b8a702..3ccda41d1b9 100644 --- a/zookeeper-server/pom.xml +++ b/zookeeper-server/pom.xml @@ -45,6 +45,12 @@ <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> </dependency> + <dependency> + <!-- Needed to have the same version as slf4j-api --> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.7.5</version> + </dependency> </dependencies> <build> <plugins> diff --git a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java b/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java index 252dc6697b0..252dc6697b0 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java +++ b/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java diff --git a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/package-info.java b/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/package-info.java index 470d1350f9c..470d1350f9c 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/package-info.java +++ b/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/package-info.java diff --git a/zkfacade/src/test/java/com/yahoo/vespa/zookeeper/ZooKeeperServerTest.java b/zookeeper-server/src/test/java/com/yahoo/vespa/zookeeper/ZooKeeperServerTest.java index 3f33892fd45..3f33892fd45 100644 --- a/zkfacade/src/test/java/com/yahoo/vespa/zookeeper/ZooKeeperServerTest.java +++ b/zookeeper-server/src/test/java/com/yahoo/vespa/zookeeper/ZooKeeperServerTest.java |