Skip to content

Issue 53723: ClassNotFoundException: JspServlet with additionalWebapp #1172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 1 commit into from
Sep 4, 2025
Merged

Issue 53723: ClassNotFoundException: JspServlet with additionalWebapp #1172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package org.labkey.embedded;

import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Host;
import org.apache.catalina.Wrapper;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.loader.WebappLoader;
Expand Down Expand Up @@ -243,8 +245,6 @@ protected TomcatWebServer getTomcatWebServer(Tomcat tomcat)
Map<String, String> additionalWebapps = contextProperties.getAdditionalWebapps();
if (additionalWebapps != null)
{
// Turn the default web.xml behavior back on so that Tomcat serves up static files as normal
tomcat.setAddDefaultWebXmlToWebapp(true);
setRegisterDefaultServlet(true);

for (Map.Entry<String, String> entry : additionalWebapps.entrySet())
Expand All @@ -259,7 +259,23 @@ protected TomcatWebServer getTomcatWebServer(Tomcat tomcat)
{
throw new ConfigException("No docBase supplied additional webapp at context path " + contextPath);
}
tomcat.addWebapp(contextPath, docBase);
Context ctx = tomcat.addWebapp(contextPath, docBase);


// Issue 53723: register the default servlet without enabling JSPs

// Code copied from Tomcat.initWebappDefaults(), removing JSP-specific initialization
Wrapper servlet = Tomcat.addServlet(ctx, "default", "org.apache.catalina.servlets.DefaultServlet");
servlet.setLoadOnStartup(1);
servlet.setOverridable(true);
ctx.addServletMappingDecoded("/", "default");
Tomcat.addDefaultMimeTypeMappings(ctx);
ctx.addWelcomeFile("index.html");
ctx.addWelcomeFile("index.htm");
// Any application configured welcome files should override the defaults.
if (ctx instanceof StandardContext) {
((StandardContext) ctx).setReplaceWelcomeFiles(true);
}
}
}
}
Expand Down