diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-08-31 09:26:26 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-08-31 09:26:26 +0200 |
commit | 1b8a9c67382878e4911d151626894787af5542a0 (patch) | |
tree | dc5b4c7f5e46a3f6c74efe8cc109706a6a6cdbf3 /container-disc | |
parent | bca73f4f4e56d0a016b99b3917a075823c193c57 (diff) |
Remove classes only needed by the removed Netty HTTP server
Diffstat (limited to 'container-disc')
3 files changed, 0 insertions, 29 deletions
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 |