Merge pull request #405 from GoogleCloudPlatform:EE10-JspInitialization

PiperOrigin-RevId: 812886187
Change-Id: I95391eb20d78dff799f64af735e8d12bd8ac1a5e

Author: gae-java-bot

runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/ee10/EE10AppVersionHandlerFactory.java

@@ -33,7 +33,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.jsp.JspFactory;
 import org.eclipse.jetty.ee10.annotations.AnnotationConfiguration;
 import org.eclipse.jetty.ee10.quickstart.QuickStartConfiguration;
 import org.eclipse.jetty.ee10.servlet.Dispatcher;
@@ -168,23 +167,7 @@ private org.eclipse.jetty.server.Handler doCreateHandler(AppVersion appVersion)
       context.setExtractWAR(false);
       // ensure exception is thrown if context startup fails
       context.setThrowUnavailableOnStartupException(true);
-      // for JSP 2.2
-      try {
-        // Use the App Class loader to try to initialize the JSP machinery.
-        // Not an issue if it fails: it means the app does not contain the JSP jars in WEB-INF/lib.
-        Class<?> klass = classLoader.loadClass(TOMCAT_SIMPLE_INSTANCE_MANAGER);
-        Object sim = klass.getConstructor().newInstance();
-        context.getServletContext().setAttribute(TOMCAT_INSTANCE_MANAGER, sim);
-        // Set JSP factory equivalent for:
-        // JspFactory jspf = new JspFactoryImpl();
-        klass = classLoader.loadClass(TOMCAT_JSP_FACTORY);
-        JspFactory jspf = (JspFactory) klass.getConstructor().newInstance();
-        JspFactory.setDefaultFactory(jspf);
-        Class.forName("org.apache.jasper.compiler.JspRuntimeContext", true, classLoader);
-      } catch (Throwable t) {
-        // No big deal, there are no JSPs in the App since the jsp libraries are not inside the
-        // web app classloader.
-      }
+
       SessionsConfig sessionsConfig = appVersion.getSessionsConfig();
       EE10SessionManagerHandler.Config.Builder builder = EE10SessionManagerHandler.Config.builder();
       if (sessionsConfig.getAsyncPersistenceQueueName() != null) {