Merge remote-tracking branch 'origin/master' into ogronnesby/propagate-ca-in-config

1 files changed, 12 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java
index f00b617de46..82f0c87d074 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java
@@ -4,6 +4,10 @@ package com.yahoo.vespa.model.container;
 import com.yahoo.config.model.api.TlsSecrets;
 import com.yahoo.config.model.api.container.ContainerServiceType;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
+import com.yahoo.container.bundle.BundleInstantiationSpecification;
+import com.yahoo.osgi.provider.model.ComponentModel;
+import com.yahoo.prelude.fastsearch.FS4ResourcePool;
+import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.http.ConnectorFactory;
 import com.yahoo.vespa.model.container.http.Http;
 import com.yahoo.vespa.model.container.http.JettyHttpServer;
@@ -48,8 +52,16 @@ public final class ApplicationContainer extends Container {
 
             server.addConnector(new ConnectorFactory(connectorName, 4443, sslProvider));
         }
+        addComponent(getFS4ResourcePool()); // TODO Remove when FS4 based search protocol is gone
     }
 
+    private static Component<?, ComponentModel> getFS4ResourcePool() {
+        BundleInstantiationSpecification spec = BundleInstantiationSpecification.
+                getInternalSearcherSpecificationFromStrings(FS4ResourcePool.class.getName(), null);
+        return new Component<>(new ComponentModel(spec));
+    }
+
+
     @Override
     protected ContainerServiceType myServiceType() {
         if (parent instanceof ContainerCluster) {