diff options
4 files changed, 0 insertions, 41 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java index 8298afb56b0..2c0e142774a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java @@ -9,7 +9,6 @@ import com.yahoo.container.QrConfig; import com.yahoo.container.core.ContainerHttpConfig; import com.yahoo.container.jdisc.ContainerMbusConfig; import com.yahoo.container.jdisc.JdiscBindingsConfig; -import com.yahoo.container.jdisc.config.PortOverridesConfig; import com.yahoo.search.config.QrStartConfig; import com.yahoo.vespa.defaults.Defaults; import com.yahoo.vespa.model.AbstractService; @@ -47,7 +46,6 @@ public class Container extends AbstractService implements ComponentsConfig.Producer, JdiscBindingsConfig.Producer, ContainerHttpConfig.Producer, - PortOverridesConfig.Producer, ContainerMbusConfig.Producer { public static final class PortOverride { @@ -116,7 +114,6 @@ public class Container extends AbstractService implements addBuiltinHandlers(); addChild(new SimpleComponent("com.yahoo.container.jdisc.ConfiguredApplication$ApplicationContext")); - addChild(new SimpleComponent("com.yahoo.container.jdisc.ContainerPortsOverride")); } /** True if this container is retired (slated for removal) */ @@ -303,15 +300,6 @@ public class Container extends AbstractService implements } @Override - public void getConfig(PortOverridesConfig.Builder builder) { - for (PortOverride portOverride: portOverrides) { - builder.server(new PortOverridesConfig.Server.Builder(). - id(portOverride.serverId.stringValue()). - port(portOverride.port)); - } - } - - @Override public void getConfig(QrConfig.Builder builder) { builder. rpc(new Rpc.Builder() diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java index 62fdb36cbad..21820a95aa6 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java @@ -17,7 +17,6 @@ import com.yahoo.container.di.config.Subscriber; import com.yahoo.container.di.config.SubscriberFactory; import com.yahoo.container.http.filter.FilterChainRepository; import com.yahoo.container.jdisc.component.Deconstructor; -import com.yahoo.container.jdisc.config.PortOverridesConfig; import com.yahoo.container.jdisc.metric.DisableGuiceMetric; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.application.Application; @@ -79,8 +78,6 @@ public final class ConfiguredApplication implements Application { new ComponentRegistry<>(), new ComponentRegistry<>(), new ComponentRegistry<>()); - private final ContainerPortsOverride defaultContainerPortsOverride = new ContainerPortsOverride( - new PortOverridesConfig(new PortOverridesConfig.Builder())); private final OsgiFramework restrictedOsgiFramework; private volatile int applicationSerialNo = 0; private HandlersConfigurerDi configurer; @@ -238,7 +235,6 @@ public final class ConfiguredApplication implements Application { bind(OsgiFramework.class).toInstance(restrictedOsgiFramework); bind(com.yahoo.jdisc.Timer.class).toInstance(timerSingleton); bind(FilterChainRepository.class).toInstance(defaultFilterChainRepository); - bind(ContainerPortsOverride.class).toInstance(defaultContainerPortsOverride); } }); modules.install(applicationWithLegacySetup.getMbusBindings()); diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ContainerPortsOverride.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ContainerPortsOverride.java deleted file mode 100644 index 421a268587e..00000000000 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ContainerPortsOverride.java +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.container.jdisc; - -import com.yahoo.component.AbstractComponent; -import com.yahoo.container.jdisc.config.PortOverridesConfig; - -/** - * Holds PortsOverrideConfig for the current container. - * HttpServerConfigProvider can't depend on PortsOverrideConfig directly, - * since it's config producer is not under the container in the model. - * @author tonytv - */ -public final class ContainerPortsOverride extends AbstractComponent { - public final PortOverridesConfig config; - - public ContainerPortsOverride(PortOverridesConfig portOverridesConfigConfig) { - this.config = portOverridesConfigConfig; - } -} diff --git a/container-disc/src/main/resources/configdefinitions/port-overrides.def b/container-disc/src/main/resources/configdefinitions/port-overrides.def deleted file mode 100644 index 0f62c6268c8..00000000000 --- a/container-disc/src/main/resources/configdefinitions/port-overrides.def +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 -namespace=container.jdisc.config - -server[].id string -server[].port int |