From c7365b74da61730f33d2fbbb1bccc77955cf3503 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 25 Jun 2019 08:41:02 +0200
Subject: [PATCH] move StaticResourceServlet to package sonia.scm

---
 .../sonia/scm/{lifecycle => }/StaticResourceServlet.java   | 7 +++++--
 .../src/main/java/sonia/scm/lifecycle/SingleView.java      | 1 +
 .../main/java/sonia/scm/update/MigrationWizardModule.java  | 6 ++----
 .../scm/{lifecycle => }/StaticResourceServletTest.java     | 2 +-
 .../src/test/java/sonia/scm/lifecycle/SingleViewTest.java  | 1 +
 5 files changed, 10 insertions(+), 7 deletions(-)
 rename scm-webapp/src/main/java/sonia/scm/{lifecycle => }/StaticResourceServlet.java (92%)
 rename scm-webapp/src/test/java/sonia/scm/{lifecycle => }/StaticResourceServletTest.java (98%)

diff --git a/scm-webapp/src/main/java/sonia/scm/lifecycle/StaticResourceServlet.java b/scm-webapp/src/main/java/sonia/scm/StaticResourceServlet.java
similarity index 92%
rename from scm-webapp/src/main/java/sonia/scm/lifecycle/StaticResourceServlet.java
rename to scm-webapp/src/main/java/sonia/scm/StaticResourceServlet.java
index 51562b822a..57ea0dde09 100644
--- a/scm-webapp/src/main/java/sonia/scm/lifecycle/StaticResourceServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/StaticResourceServlet.java
@@ -1,4 +1,4 @@
-package sonia.scm.lifecycle;
+package sonia.scm;
 
 import com.github.sdorra.webresources.CacheControl;
 import com.github.sdorra.webresources.WebResourceSender;
@@ -14,6 +14,9 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
+/**
+ * Serves static resources from servlet context.
+ */
 @Singleton
 public class StaticResourceServlet extends HttpServlet {
 
@@ -35,7 +38,7 @@ public class StaticResourceServlet extends HttpServlet {
         response.setStatus(HttpServletResponse.SC_NOT_FOUND);
       }
     } catch (IOException ex) {
-      LOG.warn("failed to servce resource", ex);
+      LOG.warn("failed to serve resource", ex);
       response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
     }
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/lifecycle/SingleView.java b/scm-webapp/src/main/java/sonia/scm/lifecycle/SingleView.java
index c8adf63bf9..6099d55357 100644
--- a/scm-webapp/src/main/java/sonia/scm/lifecycle/SingleView.java
+++ b/scm-webapp/src/main/java/sonia/scm/lifecycle/SingleView.java
@@ -9,6 +9,7 @@ import com.google.inject.servlet.ServletModule;
 import sonia.scm.Default;
 import sonia.scm.SCMContext;
 import sonia.scm.SCMContextProvider;
+import sonia.scm.StaticResourceServlet;
 import sonia.scm.template.MustacheTemplateEngine;
 import sonia.scm.template.TemplateEngine;
 import sonia.scm.template.TemplateEngineFactory;
diff --git a/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardModule.java b/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardModule.java
index 4b357b6d96..465b0595f7 100644
--- a/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardModule.java
@@ -3,8 +3,7 @@ package sonia.scm.update;
 import com.google.inject.servlet.ServletModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.PushStateDispatcher;
-import sonia.scm.WebResourceServlet;
+import sonia.scm.StaticResourceServlet;
 
 class MigrationWizardModule extends ServletModule {
 
@@ -19,8 +18,7 @@ class MigrationWizardModule extends ServletModule {
     LOG.info("=   Open SCM-Manager in a browser to start the wizard.   =");
     LOG.info("=                                                        =");
     LOG.info("==========================================================");
-    bind(PushStateDispatcher.class).toInstance((request, response, uri) -> {});
-    serve("/images/*", "/styles/*", "/favicon.ico").with(WebResourceServlet.class);
+    serve("/images/*", "/styles/*", "/favicon.ico").with(StaticResourceServlet.class);
     serve("/*").with(MigrationWizardServlet.class);
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/lifecycle/StaticResourceServletTest.java b/scm-webapp/src/test/java/sonia/scm/StaticResourceServletTest.java
similarity index 98%
rename from scm-webapp/src/test/java/sonia/scm/lifecycle/StaticResourceServletTest.java
rename to scm-webapp/src/test/java/sonia/scm/StaticResourceServletTest.java
index a4f51944c3..98d784d558 100644
--- a/scm-webapp/src/test/java/sonia/scm/lifecycle/StaticResourceServletTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/StaticResourceServletTest.java
@@ -1,4 +1,4 @@
-package sonia.scm.lifecycle;
+package sonia.scm;
 
 import com.google.common.io.Resources;
 import org.junit.jupiter.api.Test;
diff --git a/scm-webapp/src/test/java/sonia/scm/lifecycle/SingleViewTest.java b/scm-webapp/src/test/java/sonia/scm/lifecycle/SingleViewTest.java
index ae957ca833..c5e89ffe45 100644
--- a/scm-webapp/src/test/java/sonia/scm/lifecycle/SingleViewTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/lifecycle/SingleViewTest.java
@@ -9,6 +9,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import sonia.scm.StaticResourceServlet;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;