From 341eaa2886a89c247f70973f22e4416325f9f34b Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Wed, 10 Apr 2024 15:47:16 -0700
Subject: Enable override by default

---
 .../org/traccar/web/DefaultOverrideServlet.java    | 59 ++++++++++++++++++++++
 .../java/org/traccar/web/ModernDefaultServlet.java | 59 ----------------------
 src/main/java/org/traccar/web/WebServer.java       |  2 +-
 3 files changed, 60 insertions(+), 60 deletions(-)
 create mode 100644 src/main/java/org/traccar/web/DefaultOverrideServlet.java
 delete mode 100644 src/main/java/org/traccar/web/ModernDefaultServlet.java

(limited to 'src')

diff --git a/src/main/java/org/traccar/web/DefaultOverrideServlet.java b/src/main/java/org/traccar/web/DefaultOverrideServlet.java
new file mode 100644
index 000000000..14b441f86
--- /dev/null
+++ b/src/main/java/org/traccar/web/DefaultOverrideServlet.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.web;
+
+import org.eclipse.jetty.servlet.DefaultServlet;
+import org.eclipse.jetty.util.resource.Resource;
+import org.traccar.config.Config;
+import org.traccar.config.Keys;
+
+import jakarta.inject.Inject;
+import java.io.File;
+import java.io.IOException;
+
+public class DefaultOverrideServlet extends DefaultServlet {
+
+    private Resource overrideResource;
+
+    @Inject
+    public DefaultOverrideServlet(Config config) {
+        String override = config.getString(Keys.WEB_OVERRIDE);
+        if (override != null) {
+            overrideResource = Resource.newResource(new File(override));
+        }
+    }
+
+    @Override
+    public Resource getResource(String pathInContext) {
+        if (overrideResource != null) {
+            try {
+                Resource override = overrideResource.addPath(pathInContext);
+                if (override.exists()) {
+                    return override;
+                }
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return super.getResource(pathInContext.indexOf('.') < 0 ? "/" : pathInContext);
+    }
+
+    @Override
+    public String getWelcomeFile(String pathInContext) {
+        return super.getWelcomeFile("/");
+    }
+
+}
diff --git a/src/main/java/org/traccar/web/ModernDefaultServlet.java b/src/main/java/org/traccar/web/ModernDefaultServlet.java
deleted file mode 100644
index a7c8cdb29..000000000
--- a/src/main/java/org/traccar/web/ModernDefaultServlet.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2023 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.web;
-
-import org.eclipse.jetty.servlet.DefaultServlet;
-import org.eclipse.jetty.util.resource.Resource;
-import org.traccar.config.Config;
-import org.traccar.config.Keys;
-
-import jakarta.inject.Inject;
-import java.io.File;
-import java.io.IOException;
-
-public class ModernDefaultServlet extends DefaultServlet {
-
-    private Resource overrideResource;
-
-    @Inject
-    public ModernDefaultServlet(Config config) {
-        String override = config.getString(Keys.WEB_OVERRIDE);
-        if (override != null) {
-            overrideResource = Resource.newResource(new File(override));
-        }
-    }
-
-    @Override
-    public Resource getResource(String pathInContext) {
-        if (overrideResource != null) {
-            try {
-                Resource override = overrideResource.addPath(pathInContext);
-                if (override.exists()) {
-                    return override;
-                }
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        return super.getResource(pathInContext.indexOf('.') < 0 ? "/" : pathInContext);
-    }
-
-    @Override
-    public String getWelcomeFile(String pathInContext) {
-        return super.getWelcomeFile("/");
-    }
-
-}
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)) {
-- 
cgit v1.2.3