You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2018/09/16 14:00:44 UTC
svn commit: r1841012 - in /felix/trunk/http/jetty: pom.xml
src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
Author: cziegeler
Date: Sun Sep 16 14:00:44 2018
New Revision: 1841012
URL: http://svn.apache.org/viewvc?rev=1841012&view=rev
Log:
FELIX-5931 : Update to jetty 9.4.12.v20180830
Modified:
felix/trunk/http/jetty/pom.xml
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
Modified: felix/trunk/http/jetty/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/pom.xml?rev=1841012&r1=1841011&r2=1841012&view=diff
==============================================================================
--- felix/trunk/http/jetty/pom.xml (original)
+++ felix/trunk/http/jetty/pom.xml Sun Sep 16 14:00:44 2018
@@ -43,7 +43,7 @@
<!-- Skip because of problems with Java 8 -->
<animal.sniffer.skip>true</animal.sniffer.skip>
<felix.java.version>8</felix.java.version>
- <jetty.version>9.4.11.v20180605</jetty.version>
+ <jetty.version>9.4.12.v20180830</jetty.version>
</properties>
<build>
Modified: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java?rev=1841012&r1=1841011&r2=1841012&view=diff
==============================================================================
--- felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java (original)
+++ felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java Sun Sep 16 14:00:44 2018
@@ -44,6 +44,7 @@ import org.apache.felix.http.base.intern
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.io.ConnectionStatistics;
import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.UserStore;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
@@ -376,7 +377,11 @@ public final class JettyService extends
}
this.server.addLifeCycleListener(this);
- this.server.addBean(new HashLoginService("OSGi HTTP Service Realm"));
+ // FELIX-5931 : PropertyUserStore used as default by HashLoginService has changed in 9.4.12.v20180830
+ // and fails without a config, therefore using plain UserStore
+ final HashLoginService loginService = new HashLoginService("OSGi HTTP Service Realm");
+ loginService.setUserStore(new UserStore());
+ this.server.addBean(loginService);
this.parent = new ContextHandlerCollection();
@@ -403,7 +408,7 @@ public final class JettyService extends
this.server.setHandler(this.parent);
- if (this.config.isGzipHandlerEnabled())
+ if (this.config.isGzipHandlerEnabled())
{
GzipHandler gzipHandler = new GzipHandler();
gzipHandler.setMinGzipSize(this.config.getGzipMinGzipSize());
@@ -417,10 +422,10 @@ public final class JettyService extends
gzipHandler.addExcludedPaths(this.config.getGzipExcludedPaths());
gzipHandler.addIncludedMimeTypes(this.config.getGzipIncludedMimeTypes());
gzipHandler.addExcludedMimeTypes(this.config.getGzipExcludedMimeTypes());
-
+
this.server.insertHandler(gzipHandler);
}
-
+
this.server.start();
// session id manager is only available after server is started