diff options
| author | Iván Ávalos <avalos@disroot.org> | 2024-06-14 21:08:21 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2024-06-14 21:08:21 -0600 |
| commit | 471dc4ca7b6cfd656cc2c04c526fe56ee538991c (patch) | |
| tree | 4766fa7209e2eaab65269db456cf0436e6a64a49 /src/main/java/org/traccar/web | |
| parent | 447c7e15fcec8fc72d0457bb7dbf166cbea84acd (diff) | |
| parent | 64528b96da4a742070d5845a876b07ca66ad0be3 (diff) | |
| download | trackermap-server-471dc4ca7b6cfd656cc2c04c526fe56ee538991c.tar.gz trackermap-server-471dc4ca7b6cfd656cc2c04c526fe56ee538991c.tar.bz2 trackermap-server-471dc4ca7b6cfd656cc2c04c526fe56ee538991c.zip | |
Merge tag 'v6.2'
Diffstat (limited to 'src/main/java/org/traccar/web')
| -rw-r--r-- | src/main/java/org/traccar/web/DefaultOverrideServlet.java (renamed from src/main/java/org/traccar/web/ModernDefaultServlet.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/traccar/web/WebServer.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/traccar/web/ModernDefaultServlet.java b/src/main/java/org/traccar/web/DefaultOverrideServlet.java index a7c8cdb29..14b441f86 100644 --- a/src/main/java/org/traccar/web/ModernDefaultServlet.java +++ b/src/main/java/org/traccar/web/DefaultOverrideServlet.java @@ -1,5 +1,5 @@ /* - * Copyright 2023 Anton Tananaev (anton@traccar.org) + * Copyright 2023 - 2024 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,12 +24,12 @@ import jakarta.inject.Inject; import java.io.File; import java.io.IOException; -public class ModernDefaultServlet extends DefaultServlet { +public class DefaultOverrideServlet extends DefaultServlet { private Resource overrideResource; @Inject - public ModernDefaultServlet(Config config) { + public DefaultOverrideServlet(Config config) { String override = config.getString(Keys.WEB_OVERRIDE); if (override != null) { overrideResource = Resource.newResource(new File(override)); diff --git a/src/main/java/org/traccar/web/WebServer.java b/src/main/java/org/traccar/web/WebServer.java index 4759942b1..68fcf52de 100644 --- a/src/main/java/org/traccar/web/WebServer.java +++ b/src/main/java/org/traccar/web/WebServer.java @@ -139,7 +139,7 @@ public class WebServer implements LifecycleObject { } private void initWebApp(ServletContextHandler servletHandler) { - ServletHolder servletHolder = new ServletHolder(new ModernDefaultServlet(config)); + ServletHolder servletHolder = new ServletHolder(new DefaultOverrideServlet(config)); servletHolder.setInitParameter("resourceBase", new File(config.getString(Keys.WEB_PATH)).getAbsolutePath()); servletHolder.setInitParameter("dirAllowed", "false"); if (config.getBoolean(Keys.WEB_DEBUG)) { |