Publish

2 files changed, 37 insertions, 0 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
new file mode 100644
index 00000000000..252c401fea5
--- /dev/null
+++ b/container-core/src/main/java/com/yahoo/container/servlet/ServletProvider.java
@@ -0,0 +1,31 @@
+// Copyright 2016 Yahoo Inc. 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 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
new file mode 100644
index 00000000000..caf1bdd3910
--- /dev/null
+++ b/container-core/src/main/java/com/yahoo/container/servlet/package-info.java
@@ -0,0 +1,6 @@
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+@ExportPackage
+package com.yahoo.container.servlet;
+
+import com.yahoo.osgi.annotation.ExportPackage;
+