From 15915afeb88da0d72f2deafc5c86084f3827ba47 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 3 Mar 2017 17:56:47 +0000
Subject: [PATCH] Remove dup DTDs in javax.servlet.jar Set InstanceManager for
 webapps Remove InstanceManager log message Resolves ticket #1818

---
 apps/jetty/build.xml                                  |  3 ++-
 apps/routerconsole/java/build.xml                     |  1 +
 .../src/net/i2p/router/web/RouterConsoleRunner.java   | 11 +++++------
 .../java/src/net/i2p/router/web/WebAppStarter.java    |  6 ++++++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index f9f24eae8..11333eb52 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -181,7 +181,8 @@
             <!-- Also includes org.apache.*, this is copied into jasper-runtime.jar below -->
             <zipfileset includes="javax/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
             <!-- In Debian packages they are found in /usr/share/java/tomcat8-servlet-api.jar in the libtomcat8-java package -->
-            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jetty-schemas-3.1.jar" />
+            <!-- javax/servlet/jsp/resources are dups of those in apache-jsp jar -->
+            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties javax/servlet/jsp/resources/*" src="${jetty.base}/lib/jetty-schemas-3.1.jar" />
         </jar>
       <!--
         <delete file="jetty.tar" />
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index a65b7bbec..988ebefc3 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -70,6 +70,7 @@
                 <pathelement location="../../jetty/jettylib/jetty-util.jar" />
                 <pathelement location="../../jetty/jettylib/jetty-webapp.jar" />
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
+                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
                 <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
                 <pathelement location="../../systray/java/build/systray.jar" />
                 <pathelement location="../../desktopgui/dist/desktopgui.jar" />
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
index 25329c9b5..eeb855c5c 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
@@ -40,6 +40,7 @@ import net.i2p.util.SecureDirectory;
 import net.i2p.util.I2PSSLSocketFactory;
 import net.i2p.util.SystemVersion;
 
+import org.apache.tomcat.SimpleInstanceManager;
 import org.eclipse.jetty.security.HashLoginService;
 import org.eclipse.jetty.security.ConstraintMapping;
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -631,12 +632,6 @@ public class RouterConsoleRunner implements RouterApp {
             File tmpdir = new SecureDirectory(workDir, ROUTERCONSOLE + "-" +
                                                        (_listenPort != null ? _listenPort : _sslListenPort));
             tmpdir.mkdir();
-            if (!SystemVersion.isWindows() && !SystemVersion.isMac() &&
-                _context.getBaseDir().getAbsolutePath().equals("/usr/share/i2p")) {
-               // We are using Tomcat 6, so the Debian patch doesn't apply.
-               // Remove when we switch to Tomcat 8
-               _context.logManager().getLog(Server.class).logAlways(net.i2p.util.Log.INFO, "Please ignore any InstanceManager warnings");
-            }
             rootServletHandler = new ServletHandler();
             rootWebApp = new LocaleWebAppHandler(_context,
                                                   "/", _webAppsDir + ROUTERCONSOLE + ".war",
@@ -667,6 +662,10 @@ public class RouterConsoleRunner implements RouterApp {
         try {
             // start does a mapContexts()
             _server.start();
+            // can't do this before start
+            // http://stackoverflow.com/questions/17529936/issues-while-using-jetty-embedded-to-handle-jsp-jasperexception-unable-to-com
+            // https://github.com/jetty-project/embedded-jetty-jsp/blob/master/src/main/java/org/eclipse/jetty/demo/Main.java
+            rootServletHandler.getServletContext().setAttribute("org.apache.tomcat.InstanceManager", new SimpleInstanceManager());
         } catch (Throwable me) {
             // NoClassFoundDefError from a webapp is a throwable, not an exception
             System.err.println("Error starting the Router Console server: " + me);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
index 42424c9b8..4d659c200 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
@@ -10,6 +10,7 @@ import net.i2p.router.RouterContext;
 import net.i2p.util.FileUtil;
 import net.i2p.util.SecureDirectory;
 
+import org.apache.tomcat.SimpleInstanceManager;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.ContextHandler;
@@ -63,6 +64,11 @@ public class WebAppStarter {
          // and the caller will know it failed
          wac.setThrowUnavailableOnStartupException(true);
          wac.start();
+         // can't do this before start
+         // do we just need one, in the ContextHandlerCollection, or one for each?
+         // http://stackoverflow.com/questions/17529936/issues-while-using-jetty-embedded-to-handle-jsp-jasperexception-unable-to-com
+         // https://github.com/jetty-project/embedded-jetty-jsp/blob/master/src/main/java/org/eclipse/jetty/demo/Main.java
+         wac.getServletContext().setAttribute("org.apache.tomcat.InstanceManager", new SimpleInstanceManager());
     }
 
     /**