Remove Servlet integration from container-core

2 files changed, 1 insertions, 28 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/servlet/ServletProvider.java b/container-core/src/main/java/com/yahoo/container/servlet/ServletProvider.java
deleted file mode 100644
index aabaa6dd378..00000000000
--- a/container-core/src/main/java/com/yahoo/container/servlet/ServletProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.servlet;
-
-import javax.servlet.Servlet;
-
-import com.yahoo.container.di.componentgraph.Provider;
-import org.eclipse.jetty.servlet.ServletHolder;
-
-/**
- * @author stiankri
- */
-public class ServletProvider implements Provider<ServletHolder> {
-
-    private final ServletHolder servletHolder;
-
-    public ServletProvider(Servlet servlet, ServletConfigConfig servletConfigConfig) {
-        servletHolder = new ServletHolder(servlet);
-        servletConfigConfig.map().forEach( (key, value) -> servletHolder.setInitParameter(key, value));
-    }
-
-    @Override
-    public ServletHolder get() {
-        return servletHolder;
-    }
-
-    @Override
-    public void deconstruct() { }
-}
diff --git a/container-core/src/main/java/com/yahoo/container/servlet/package-info.java b/container-core/src/main/java/com/yahoo/container/servlet/package-info.java
index 38c03998bf7..8ecb3cbe827 100644
--- a/container-core/src/main/java/com/yahoo/container/servlet/package-info.java
+++ b/container-core/src/main/java/com/yahoo/container/servlet/package-info.java
@@ -1,4 +1,5 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// TODO Vespa 8 Remove export package
 @ExportPackage
 package com.yahoo.container.servlet;