Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 5875781c5 -> 3583409bd refs/heads/master 21201789f -> 5026b1314
ACCUMULO-2934 Use jetty 8 for Accumulo 1.6.x This patch drops Jetty back to version 8, for the 1.6.x branches, so that Accumulo can continue to run in Java 6. servlet-api drops back to 3.0.1 here, and jetty-continuation is added as a runtime dependency. A few small changes were made to the EmbeddedWebServer to use the SelectChannelConnector and its corresponding one for SSL, instead of the newer ServerConnector from Jetty 9. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3583409b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3583409b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3583409b Branch: refs/heads/1.6.1-SNAPSHOT Commit: 3583409bdde987e8e7b13fc429f5f9ee41874d80 Parents: 5875781 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Jun 23 19:18:11 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Jun 23 19:18:11 2014 -0400 ---------------------------------------------------------------------- assemble/pom.xml | 4 ++++ assemble/src/main/assemblies/component.xml | 1 + pom.xml | 9 +++++++-- server/monitor/pom.xml | 6 +++++- .../org/apache/accumulo/monitor/EmbeddedWebServer.java | 12 ++++++------ 5 files changed, 23 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3583409b/assemble/pom.xml ---------------------------------------------------------------------- diff --git a/assemble/pom.xml b/assemble/pom.xml index c569dee..6b090e4 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -126,6 +126,10 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/accumulo/blob/3583409b/assemble/src/main/assemblies/component.xml ---------------------------------------------------------------------- diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml index 7efa48b..32ceb87 100644 --- a/assemble/src/main/assemblies/component.xml +++ b/assemble/src/main/assemblies/component.xml @@ -35,6 +35,7 @@ <include>org.apache.commons:commons-math</include> <include>org.apache.commons:commons-vfs2</include> <include>org.apache.thrift:libthrift</include> + <include>org.eclipse.jetty:jetty-continuation</include> <include>org.eclipse.jetty:jetty-http</include> <include>org.eclipse.jetty:jetty-io</include> <include>org.eclipse.jetty:jetty-security</include> http://git-wip-us.apache.org/repos/asf/accumulo/blob/3583409b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 14ba19f..2bc87cf 100644 --- a/pom.xml +++ b/pom.xml @@ -123,7 +123,7 @@ <!-- overwritten in profiles hadoop-1 or hadoop-2 --> <hadoop.version>2.2.0</hadoop.version> <httpclient.version>3.1</httpclient.version> - <jetty.version>9.1.5.v20140505</jetty.version> + <jetty.version>8.1.15.v20140411</jetty.version> <!-- the maven-release-plugin makes this recommendation, due to plugin bugs --> <maven.min-version>3.0.4</maven.min-version> <!-- surefire/failsafe plugin option --> @@ -199,7 +199,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <version>3.0.1</version> </dependency> <dependency> <groupId>javax.ws.rs</groupId> @@ -416,6 +416,11 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> <version>${jetty.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/accumulo/blob/3583409b/server/monitor/pom.xml ---------------------------------------------------------------------- diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml index f305818..221d6b3 100644 --- a/server/monitor/pom.xml +++ b/server/monitor/pom.xml @@ -81,6 +81,10 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> </dependency> <dependency> @@ -97,7 +101,7 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> + <artifactId>jetty-continuation</artifactId> <scope>runtime</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/accumulo/blob/3583409b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java index c76b4cf..a36b942 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java @@ -19,10 +19,10 @@ package org.apache.accumulo.monitor; import javax.servlet.http.HttpServlet; import org.apache.accumulo.core.conf.Property; -import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.server.session.SessionHandler; +import org.eclipse.jetty.server.ssl.SslSelectChannelConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.ssl.SslContextFactory; @@ -30,7 +30,7 @@ public class EmbeddedWebServer { private static String EMPTY = ""; Server server = null; - ServerConnector connector = null; + SelectChannelConnector connector = null; ServletContextHandler handler; boolean usingSsl; @@ -44,16 +44,16 @@ public class EmbeddedWebServer { || EMPTY.equals(Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_KEYSTOREPASS)) || EMPTY.equals(Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_TRUSTSTORE)) || EMPTY.equals(Monitor.getSystemConfiguration().get( Property.MONITOR_SSL_TRUSTSTOREPASS))) { - connector = new ServerConnector(server, new HttpConnectionFactory()); + connector = new SelectChannelConnector(); usingSsl = false; } else { SslContextFactory sslContextFactory = new SslContextFactory(); sslContextFactory.setKeyStorePath(Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_KEYSTORE)); sslContextFactory.setKeyStorePassword(Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_KEYSTOREPASS)); - sslContextFactory.setTrustStorePath(Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_TRUSTSTORE)); + sslContextFactory.setTrustStore(Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_TRUSTSTORE)); sslContextFactory.setTrustStorePassword(Monitor.getSystemConfiguration().get(Property.MONITOR_SSL_TRUSTSTOREPASS)); - connector = new ServerConnector(server, sslContextFactory); + connector = new SslSelectChannelConnector(sslContextFactory); usingSsl = true; }
