fix: Disable Jetty's webapp configuration #6050
Conversation
Simplifies embedded server setup slightly, and avoid calling reflective and ServiceLoader based configuration apis. Fixes deephaven#6049
niloc132
added
NoDocumentationNeeded
jetty
ReleaseNotesNeeded
| String knownFile = "/ide/index.html"; | ||
| URL ide = JettyBackedGrpcServer.class.getResource(knownFile); | ||
| Resource jarContents = Resource.newResource(ide.toExternalForm().replace("!" + knownFile, "!/")); | ||
| context.setBaseResource(ControlledCacheResource.wrap(jarContents)); |
There was a problem hiding this comment.
It looks like we don't use io.deephaven.server.jetty.ControlledCacheResource; is that correct? If so, should we delete it?
There was a problem hiding this comment.
Good catch, same problem that js-plugins has... I found that the ServletContextHandler also can be given a base resource and will guide DefaultServlet to provide content from there. We still want to share other settings though - it turns out our DefaultServlet configuration was coming from a jetty xml file, webdefault.xml. Now we explicitly configure it (and don't end up with other annotation scanning from the classpath or service loaders).
| new ServletContextHandler(null, "/", null, null, null, new ErrorPageErrorHandler(), NO_SESSIONS); | ||
| String knownFile = "/ide/index.html"; | ||
| URL ide = JettyBackedGrpcServer.class.getResource(knownFile); | ||
| String path = ide.toExternalForm().replace("!" + knownFile, "!/"); |
There was a problem hiding this comment.
probably worth a comment about ""!/" specifies this resource base is a jar file which should have its contents served" (but worded better maybe)
There was a problem hiding this comment.
Reverted to roughly the old code, and added a note.
Simplifies embedded server setup slightly, and avoid calling reflective and ServiceLoader based configuration apis.
Fixes #6049