Remove container-search-gui

3 files changed, 0 insertions, 38 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java b/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
index 7ce82848d09..29b1edc1397 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
@@ -52,7 +52,6 @@ public class PlatformBundles {
 
     public static final Set<Path> SEARCH_AND_DOCPROC_BUNDLES = toBundlePaths(
             SEARCH_AND_DOCPROC_BUNDLE,
-            "container-search-gui",
             "docprocs",
             "linguistics-components"
     );
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/GUIHandler.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/GUIHandler.java
deleted file mode 100644
index b00faa80715..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/GUIHandler.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.container.search;
-
-import com.yahoo.container.bundle.BundleInstantiationSpecification;
-import com.yahoo.osgi.provider.model.ComponentModel;
-import com.yahoo.vespa.model.container.component.Handler;
-
-
-/**
- * @author  Henrik Høiness
- */
-public class GUIHandler extends Handler {
-
-    public static final String BUNDLE = "container-search-gui";
-    public static final String CLASS = "com.yahoo.search.query.gui.GUIHandler";
-    public static final String BINDING_PATH = "/querybuilder/*";
-
-    public GUIHandler() {
-        super(new ComponentModel(bundleSpec(CLASS, BUNDLE)));
-    }
-
-    public static BundleInstantiationSpecification bundleSpec(String className, String bundle) {
-        return BundleInstantiationSpecification.fromStrings(className, className, bundle);
-    }
-
-}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index f6174e1740f..0ba3ae7eca9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -80,7 +80,6 @@ import com.yahoo.vespa.model.container.http.ssl.HostedSslConnectorFactory;
 import com.yahoo.vespa.model.container.http.xml.HttpBuilder;
 import com.yahoo.vespa.model.container.processing.ProcessingChains;
 import com.yahoo.vespa.model.container.search.ContainerSearch;
-import com.yahoo.vespa.model.container.search.GUIHandler;
 import com.yahoo.vespa.model.container.search.PageTemplates;
 import com.yahoo.vespa.model.container.search.searchchain.SearchChains;
 import com.yahoo.vespa.model.container.xml.document.DocumentFactoryBuilder;
@@ -552,9 +551,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
         addSearchHandler(cluster, searchElement);
 
-        // Set up GUI handler only on self hosted
-        if (!deployState.isHosted())
-            addGUIHandler(cluster);
         validateAndAddConfiguredComponents(deployState, cluster, searchElement, "renderer", ContainerModelBuilder::validateRendererElement);
     }
 
@@ -898,13 +894,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         searchHandler.addComponent(Component.fromClassAndBundle(SearchHandler.EXECUTION_FACTORY_CLASS, PlatformBundles.SEARCH_AND_DOCPROC_BUNDLE));
     }
 
-    private void addGUIHandler(ApplicationContainerCluster cluster) {
-        Handler guiHandler = new GUIHandler();
-        guiHandler.addServerBindings(SystemBindingPattern.fromHttpPath(GUIHandler.BINDING_PATH));
-        cluster.addComponent(guiHandler);
-    }
-
-
     private List<BindingPattern> serverBindings(Element searchElement, BindingPattern... defaultBindings) {
         List<Element> bindings = XML.getChildren(searchElement, "binding");
         if (bindings.isEmpty())