Skip to content

Commit 08bf5dd

Browse files
allow use of old package name for ResourceFileServlet
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
1 parent a241f57 commit 08bf5dd

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,7 @@ public class AppEngineWebAppContext extends WebAppContext {
9292
private final boolean ignoreContentLength;
9393

9494
// Map of deprecated package names to their replacements.
95-
private static final Map<String, String> DEPRECATED_PACKAGE_NAMES = ImmutableMap.of(
96-
"org.eclipse.jetty.servlets", "org.eclipse.jetty.ee10.servlets",
97-
"org.eclipse.jetty.servlet", "org.eclipse.jetty.ee10.servlet"
98-
);
95+
private static final Map<String, String> DEPRECATED_PACKAGE_NAMES = ImmutableMap.of();
9996

10097
@Override
10198
public boolean checkAlias(String path, Resource resource) {

runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/ee8/AppEngineWebAppContext.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ public class AppEngineWebAppContext extends WebAppContext {
9595
// Map of deprecated package names to their replacements.
9696
private static final Map<String, String> DEPRECATED_PACKAGE_NAMES = ImmutableMap.of(
9797
"org.eclipse.jetty.servlets", "org.eclipse.jetty.ee8.servlets",
98-
"org.eclipse.jetty.servlet", "org.eclipse.jetty.ee8.servlet"
98+
"org.eclipse.jetty.servlet", "org.eclipse.jetty.ee8.servlet",
99+
"com.google.apphosting.runtime.jetty9.ResourceFileServlet", "com.google.apphosting.runtime.jetty.ee8.ResourceFileServlet"
99100
);
100101

101102
@Override

0 commit comments

Comments
 (0)