Skip to content

The Unified and Autonomous Development Platform

Fix errors after upgrading to latest Jetty version

Robin Shen9125c148b7ba
diff --git a/server-core/src/main/java/io/onedev/server/util/jetty/AssetServlet.java b/server-core/src/main/java/io/onedev/server/util/jetty/AssetServlet.java
index 245e39859d..8b69d5a1f2 100644
--- a/server-core/src/main/java/io/onedev/server/util/jetty/AssetServlet.java
+++ b/server-core/src/main/java/io/onedev/server/util/jetty/AssetServlet.java
@@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
import org.eclipse.jetty.http.HttpContent;
import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.server.ResourceService;
import org.eclipse.jetty.server.Response;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
@@ -32,6 +33,36 @@ public abstract class AssetServlet extends DefaultServlet {
private static ThreadLocal<HttpServletRequest> requestHolder = new ThreadLocal<HttpServletRequest>();
+ public AssetServlet() {
+ super(new ResourceService() {
+
+ @Override
+ protected void putHeaders(HttpServletResponse response, HttpContent content, long contentLength) {
+ super.putHeaders(response, content, contentLength);
+
+ HttpFields fields;
+ if (response instanceof Response)
+ fields = ((Response) response).getHttpFields();
+ else
+ fields = ((Response)((HttpServletResponseWrapper) response).getResponse()).getHttpFields();
+
+ if (requestHolder.get().getDispatcherType() == DispatcherType.ERROR) {
+ /*
+ * Do not cache error page and also makes sure that error page is not eligible for
+ * modification check. That is, error page will be always retrieved.
+ */
+ fields.put(HttpHeader.CACHE_CONTROL, "must-revalidate,no-cache,no-store");
+ } else if (requestHolder.get().getRequestURI().equals("/favicon.ico")) {
+ /*
+ * Make sure favicon request is cached. Otherwise, it will be requested for every
+ * page request.
+ */
+ fields.put(HttpHeader.CACHE_CONTROL, "max-age=86400,public");
+ }
+ }
+
+ });
+ }
@Override
public String getInitParameter(String name) {
String value = super.getInitParameter(name);
@@ -104,31 +135,6 @@ public abstract class AssetServlet extends DefaultServlet {
*/
protected abstract URL loadResource(String relativePath);
- @Override
- protected void putHeaders(HttpServletResponse response, HttpContent content, long contentLength) {
- super.putHeaders(response, content, contentLength);
-
- HttpFields fields;
- if (response instanceof Response)
- fields = ((Response) response).getHttpFields();
- else
- fields = ((Response)((HttpServletResponseWrapper) response).getResponse()).getHttpFields();
-
- if (requestHolder.get().getDispatcherType() == DispatcherType.ERROR) {
- /*
- * Do not cache error page and also makes sure that error page is not eligible for
- * modification check. That is, error page will be always retrieved.
- */
- fields.put(HttpHeader.CACHE_CONTROL, "must-revalidate,no-cache,no-store");
- } else if (requestHolder.get().getRequestURI().equals("/favicon.ico")) {
- /*
- * Make sure favicon request is cached. Otherwise, it will be requested for every
- * page request.
- */
- fields.put(HttpHeader.CACHE_CONTROL, "max-age=86400,public");
- }
- }
-
@Override
protected void doGet(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
diff --git a/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyRunner.java b/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyRunner.java
index fb26d28473..f07341a220 100644
--- a/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyRunner.java
+++ b/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyRunner.java
@@ -62,7 +62,7 @@ public class DefaultJettyRunner implements JettyRunner, Provider<ServletContextH
servletContextHandler.setErrorHandler(new ErrorPageErrorHandler());
servletContextHandler.addFilter(DisableTraceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
- servletContextHandler.getSessionHandler().getSessionManager().setSessionIdPathParameterName(null);
+ servletContextHandler.getSessionHandler().setSessionIdPathParameterName(null);
/*
* By default contributions is in reverse dependency order. We reverse the order so that
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
index 0079f1d485..cdab997db6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
@@ -161,7 +161,7 @@ public abstract class BasePage extends WebPage {
});
int sessionTimeout = AppLoader.getInstance(ServletContextHandler.class)
- .getSessionHandler().getSessionManager().getMaxInactiveInterval();
+ .getSessionHandler().getMaxInactiveInterval();
add(new WebMarkupContainer("keepSessionAlive")
.add(new AjaxSelfUpdatingTimerBehavior(Duration.milliseconds(sessionTimeout*500L))));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index 7cc954bb89..08401932a7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -9,7 +9,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://onedev.io">
+ <a class="navbar-brand" href="https://github.com/theonedev/onedev">
<img alt="Brand" src="/img/logo.png">
<div class="separator"></div>
</a>
diff --git a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
index 1d349ffa0f..1fc8195eba 100644
--- a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
+++ b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
@@ -66,7 +66,7 @@ public class ProductServletConfigurator implements ServletConfigurator {
public void configure(ServletContextHandler context) {
context.setContextPath("/");
- context.getSessionHandler().getSessionManager().setMaxInactiveInterval(serverConfig.getSessionTimeout());
+ context.getSessionHandler().setMaxInactiveInterval(serverConfig.getSessionTimeout());
context.setInitParameter(EnvironmentLoader.ENVIRONMENT_CLASS_PARAM, OneWebEnvironment.class.getName());
context.addEventListener(new EnvironmentLoaderListener());