diff options
author | gjoranv <gv@verizonmedia.com> | 2019-06-07 18:04:38 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-06-07 18:07:37 +0200 |
commit | f0d9b3a11c21f2e00a16dfea68e98a3fc1b00f5f (patch) | |
tree | abf98e7f5ce5076fa0becef5bb7962d85e22f97d /config-model | |
parent | c4b7047b056dfab94c4b8a3d6575d6de8e482ffb (diff) |
Set up SecurityFilterInvoker for all container types.
- It is needed by Jetty, and if not added to the model, Guice will
create an UnsupportedFilterInvoker and cause a reconstruction of
JettyHttpServer upon every redeploy.
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java | 1 | ||||
-rwxr-xr-x | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index 50d6f24b8fc..9cbaa5f91af 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -53,7 +53,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat addSimpleComponent(DEFAULT_LINGUISTICS_PROVIDER); addSimpleComponent("com.yahoo.container.jdisc.SecretStoreProvider"); addSimpleComponent("com.yahoo.container.jdisc.CertificateStoreProvider"); - addSimpleComponent("com.yahoo.jdisc.http.filter.SecurityFilterInvoker"); } @Override diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index 1080a1c3990..23083bc6176 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -28,6 +28,7 @@ import com.yahoo.container.jdisc.state.StateHandler; import com.yahoo.container.logging.AccessLog; import com.yahoo.container.usability.BindingsOverviewHandler; import com.yahoo.document.config.DocumentmanagerConfig; +import com.yahoo.jdisc.http.filter.SecurityFilterInvoker; import com.yahoo.metrics.simple.runtime.MetricProperties; import com.yahoo.osgi.provider.model.ComponentModel; import com.yahoo.prelude.semantics.SemanticRulesConfig; @@ -177,6 +178,7 @@ public abstract class ContainerCluster<CONTAINER extends Container> // TODO: Better modelling addSimpleComponent(ThreadPoolProvider.class); addSimpleComponent(com.yahoo.concurrent.classlock.ClassLocking.class); + addSimpleComponent(SecurityFilterInvoker.class); addSimpleComponent("com.yahoo.container.jdisc.metric.MetricConsumerProviderProvider"); addSimpleComponent("com.yahoo.container.jdisc.metric.MetricProvider"); addSimpleComponent("com.yahoo.container.jdisc.metric.MetricUpdater"); |