Merge pull request #171 from marc92w/bugfix/jaxrs-static-files

dvalin-jaxrs: Fix conflict between jetty ContextHandlers
taimos · Dec 8, 2024 · 670c25b · 670c25b
2 parents 645751a + cfc9c7f
commit 670c25b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@
 * Fixed vulnerabilities: CVE-2023-52428(nimbus-jose-jwt), CVE-2024-29857,CVE-2024-30171,CVE-2024-30172,CVE-2024-34447 (bouncycastle), CVE-2024-28752,CVE-2024-29736 (Apache CXF), CVE-2024-38808 (Spring Framework)
 * Corrected the use of @Nullable and @Nonnull annotations on created ivos and events, especially on the generated builders 
 * Add support for h2 embedded database
+* Fix conflicting jetty ContextHandlers for static files and web frontend
 
 # 1.35
 * Update dependencies

diff --git a/jaxrs/src/main/java/de/taimos/dvalin/jaxrs/JAXRSServerConfig.java b/jaxrs/src/main/java/de/taimos/dvalin/jaxrs/JAXRSServerConfig.java
@@ -103,7 +103,7 @@ protected ContextHandler createResourceContext(String contextPath, Resource base
     @Order(1)
     @Bean(name = "web-server-context-static")
     public ContextHandler staticContextHandler() throws IOException {
-        return createResourceContext("/", Resource.newResource("./static"));
+        return createResourceContext("/static", Resource.newResource("./static"));
     }
 
     @Order(2)