From efef0f3734e37eb890e697bffccae7103aec0ae0 Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Fri, 29 Nov 2019 18:00:32 +0000
Subject: [PATCH] include a servlet as well as pre-compiled jsps

---
 webui/build.gradle                            | 16 ++++++++++++--
 .../java/com/muwire/webui/MuWireServlet.java  | 14 ++++++++++++
 webui/templates/web.xml.template              | 22 +++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 webui/src/main/java/com/muwire/webui/MuWireServlet.java
 create mode 100644 webui/templates/web.xml.template

diff --git a/webui/build.gradle b/webui/build.gradle
index 80d34ce1..f3133aec 100644
--- a/webui/build.gradle
+++ b/webui/build.gradle
@@ -30,7 +30,7 @@ task precompileJsp {
                     outputDir: "$buildDir/tmp_jsp",
                     compilerSourceVM: "1.8",
                     compilerTargetVM: "1.8",
-                    webXml: "$buildDir/tmp_jsp/web.xml") // maybe change this to a fragment?
+                    webXmlFragment: "$buildDir/tmp_jsp/web.xml.jasper")
         def output = new File("$buildDir/compiledJsps")
         output.mkdirs()
         ant.javac(srcDir: 'build/tmp_jsp',
@@ -40,7 +40,19 @@ task precompileJsp {
     }
 }
 
-war.dependsOn precompileJsp
+task generateWebXML {
+    doLast {
+        def template = new File("$projectDir/templates/web.xml.template")
+        def templateText = template.text
+        def jasper = new File("$buildDir/tmp_jsp/web.xml.jasper")
+        templateText = templateText.replaceAll("__JASPER__", jasper.text)
+        def webXml = new File("$buildDir/tmp_jsp/web.xml")
+        webXml.text = templateText
+    }
+}
+
+generateWebXML.dependsOn precompileJsp
+war.dependsOn generateWebXML
 
 artifacts {
     warArtifact war
diff --git a/webui/src/main/java/com/muwire/webui/MuWireServlet.java b/webui/src/main/java/com/muwire/webui/MuWireServlet.java
new file mode 100644
index 00000000..f390e93e
--- /dev/null
+++ b/webui/src/main/java/com/muwire/webui/MuWireServlet.java
@@ -0,0 +1,14 @@
+package com.muwire.webui;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+
+public class MuWireServlet extends HttpServlet {
+
+    @Override
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+    }
+
+}
diff --git a/webui/templates/web.xml.template b/webui/templates/web.xml.template
new file mode 100644
index 00000000..3da6cd49
--- /dev/null
+++ b/webui/templates/web.xml.template
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+                 http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1"
+         metadata-complete="false">
+
+<servlet>
+    <servlet-name>com.muwire.webui.MuWireServlet</servlet-name>
+    <servlet-class>com.muwire.webui.MuWireServlet</servlet-class>
+</servlet>
+
+<servlet-mapping>
+    <servlet-name>com.muwire.webui.MuWireServlet</servlet-name>
+    <url-pattern>/</url-pattern>
+</servlet-mapping>
+
+
+__JASPER__
+
+</web-app>