diff options
author | Martin Polden <mpolden@mpolden.no> | 2017-11-09 09:22:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-09 09:22:52 +0100 |
commit | 797a413b0cf0a78019c62011dba6a0a1bacaf2c2 (patch) | |
tree | 90850c35f404dc970d7f782d970e49e51e557c27 /config-model | |
parent | fe4e6d6000950596bdb27e5507fd6b79fe79480e (diff) |
Revert "Revert "Remove configserver-app magic include""
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java index 4004d72c808..6efd2f5b9a7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java @@ -1,17 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.container.xml; -import com.yahoo.config.application.Xml; -import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.model.ConfigModelContext; -import com.yahoo.path.Path; import com.yahoo.vespa.model.container.ContainerModel; import com.yahoo.vespa.model.container.configserver.ConfigserverCluster; import com.yahoo.vespa.model.container.configserver.option.CloudConfigOptions; import org.w3c.dom.Element; -import org.w3c.dom.Node; - -import java.util.List; /** * Builds the config model for the standalone config server. @@ -21,34 +15,18 @@ import java.util.List; public class ConfigServerContainerModelBuilder extends ContainerModelBuilder { private final CloudConfigOptions options; - private final static String HOSTED_VESPA_INCLUDE_DIR = "hosted-vespa"; public ConfigServerContainerModelBuilder(CloudConfigOptions options) { super(true, Networking.enable); this.options = options; } - @Override public void doBuild(ContainerModel model, Element spec, ConfigModelContext modelContext) { - ApplicationPackage app = modelContext.getDeployState().getApplicationPackage(); - if ( ! app.getFiles(Path.fromString(HOSTED_VESPA_INCLUDE_DIR), ".xml").isEmpty()) { - app.validateIncludeDir(HOSTED_VESPA_INCLUDE_DIR); - List<Element> configModelElements = Xml.allElemsFromPath(app, HOSTED_VESPA_INCLUDE_DIR); - mergeInto(spec, configModelElements); - } - - ConfigserverCluster cluster = new ConfigserverCluster(modelContext.getParentProducer(), "configserver", options); + ConfigserverCluster cluster = new ConfigserverCluster(modelContext.getParentProducer(), "configserver", + options); super.doBuild(model, spec, modelContext.withParent(cluster)); cluster.setContainerCluster(model.getCluster()); } - private void mergeInto(Element destination, List<Element> configModelElements) { - for (Element jdiscElement: configModelElements) { - for (Node child = jdiscElement.getFirstChild(); child != null; child = child.getNextSibling()) { - Node copiedNode = destination.getOwnerDocument().importNode(child, true); - destination.appendChild(copiedNode); - } - } - } } |