Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 08:55:44 +01:00
Code Issues Packages Projects Releases Activity

move StaticResourceServlet to package sonia.scm

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-06-25 08:41:02 +02:00
parent 99f1c8c55e
commit c7365b74da
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-webapp/src/main/java/sonia/scm/lifecycle/StaticResourceServlet.java → scm-webapp/src/main/java/sonia/scm/StaticResourceServlet.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.lifecycle; package sonia.scm;
import com.github.sdorra.webresources.CacheControl; import com.github.sdorra.webresources.CacheControl;
import com.github.sdorra.webresources.WebResourceSender; import com.github.sdorra.webresources.WebResourceSender;
@@ -14,6 +14,9 @@ import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
/**
* Serves static resources from servlet context.
*/
@Singleton @Singleton
public class StaticResourceServlet extends HttpServlet { public class StaticResourceServlet extends HttpServlet {
@@ -35,7 +38,7 @@ public class StaticResourceServlet extends HttpServlet {
response.setStatus(HttpServletResponse.SC_NOT_FOUND); response.setStatus(HttpServletResponse.SC_NOT_FOUND);
} }
} catch (IOException ex) { } catch (IOException ex) {
LOG.warn("failed to servce resource", ex); LOG.warn("failed to serve resource", ex);
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
} }
} }

1
scm-webapp/src/main/java/sonia/scm/lifecycle/SingleView.java
View File

@@ -9,6 +9,7 @@ import com.google.inject.servlet.ServletModule;
import sonia.scm.Default; import sonia.scm.Default;
import sonia.scm.SCMContext; import sonia.scm.SCMContext;
import sonia.scm.SCMContextProvider; import sonia.scm.SCMContextProvider;
import sonia.scm.StaticResourceServlet;
import sonia.scm.template.MustacheTemplateEngine; import sonia.scm.template.MustacheTemplateEngine;
import sonia.scm.template.TemplateEngine; import sonia.scm.template.TemplateEngine;
import sonia.scm.template.TemplateEngineFactory; import sonia.scm.template.TemplateEngineFactory;

6
scm-webapp/src/main/java/sonia/scm/update/MigrationWizardModule.java
View File

@@ -3,8 +3,7 @@ package sonia.scm.update;
import com.google.inject.servlet.ServletModule; import com.google.inject.servlet.ServletModule;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sonia.scm.PushStateDispatcher; import sonia.scm.StaticResourceServlet;
import sonia.scm.WebResourceServlet;
class MigrationWizardModule extends ServletModule { 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("= Open SCM-Manager in a browser to start the wizard. =");
LOG.info("= ="); LOG.info("= =");
LOG.info("=========================================================="); LOG.info("==========================================================");
bind(PushStateDispatcher.class).toInstance((request, response, uri) -> {}); serve("/images/*", "/styles/*", "/favicon.ico").with(StaticResourceServlet.class);
serve("/images/*", "/styles/*", "/favicon.ico").with(WebResourceServlet.class);
serve("/*").with(MigrationWizardServlet.class); serve("/*").with(MigrationWizardServlet.class);
} }
} }

2
scm-webapp/src/test/java/sonia/scm/lifecycle/StaticResourceServletTest.java → scm-webapp/src/test/java/sonia/scm/StaticResourceServletTest.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.lifecycle; package sonia.scm;
import com.google.common.io.Resources; import com.google.common.io.Resources;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

1
scm-webapp/src/test/java/sonia/scm/lifecycle/SingleViewTest.java
View File

@@ -9,6 +9,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoExtension;
import sonia.scm.StaticResourceServlet;
import javax.servlet.FilterConfig; import javax.servlet.FilterConfig;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;