Bump Jetty version to 9.2 including transitive dependencies
The Jetty 9.2 quick start mechanism provides almost an order of
magnitude improvement in start time [1]. Moreover since Jetty 8
is horribly outdated, more and more projects that depend on GWT
upgraded to current Jetty 9 and because of incompatibility between
Jetty 8 and Jetty 9 have classpath collisions, that can be only
resolved with very ugly hacks, including forking of part of GWT
source code: [2].
Because HtmlUnit project, used for test toolchain had dependency
on outdated Jetty 8 (WebSocket) we had not an upgrade path here.
Luckily, HtmlUnit was recently upgraded to use Jetty 9.2.x: [3].
The following transitive dependencies were updated:
* commons-codec: 1.10
* commons-lang: 3.4
* commons-logging: 1.2
* cssparser: 0.9.18
* htmlunit: 2.19
* htmlunit-core-js: 2.15
* httpclient: 4.5.1
* httpcore: 4.4.4
* httpmime: 4.5.1
* jetty: 9.2.14.v20151106
* log4j: 1.2.17
* nekohtml: 1.9.22
* slf4j-api: 1.7.12
* slf4j-log4j12: 1.7.12
* tomcat-servlet-api: 8.0.28
TEST PLAN:
$ cd user && ant test.dev.htmlunit test.draft.htmlunit
Note, that animation tests were disabled, because they break with
htmlunit-2.19. However unchanged code works against 2.18. So that
we can alternatively upgrade to older version of the library,
instead of disabling the tests. See code comments for more details.
[1] https://webtide.com/jetty-9-quick-start
[2] https://gerrit-review.googlesource.com/59354
[3] https://sourceforge.net/p/htmlunit/bugs/1656
Bug-Link: https://github.com/gwtproject/gwt/issues/8712
Change-Id: Id1d338a01f4fc72b2adf2f43b57aeddfb06cfec1
diff --git a/dev/build.xml b/dev/build.xml
index 0be3728..e6e0d4f 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -67,8 +67,7 @@
<include name="objectweb/asm-5.0.3/lib/asm-all-5.0.3.jar"/>
<include name="guava/guava-18.0/guava-18.0-rebased.jar"/>
<include name="icu4j/50.1.1/icu4j.jar"/>
- <include name="jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/>
- <include name="jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
+ <include name="jetty/jetty-9.2.14.v20151106/jetty-all-9.2.14.v20151106.jar"/>
<include name="jscomp/20131118.json.rebased/compiler-rebased.jar"/>
<include name="jscomp/20131118.json.rebased/sourcemap-rebased.jar"/>
<include name="jsr305/jsr305.jar"/>
@@ -79,20 +78,21 @@
<include name="tomcat/jasper-runtime-1.0.jar"/>
<include name="tomcat/jsp-api-2.0.jar"/>
<!-- dependencies needed for JSP support in DevMode: END -->
+ <include name="tomcat/tomcat-servlet-api-8.0.28.jar"/>
<include name="apache/commons/commons-collections-3.2.1.jar"/>
<!-- htmlunit dependencies not already included: BEGIN -->
- <include name="apache/http/httpclient-4.3.1.jar"/>
- <include name="apache/http/httpcore-4.3.jar"/>
- <include name="apache/http/httpmime-4.3.1.jar"/>
+ <include name="apache/http/httpclient-4.5.1.jar"/>
+ <include name="apache/http/httpcore-4.4.4.jar"/>
+ <include name="apache/http/httpmime-4.5.1.jar"/>
<include name="apache/james/apache-mime4j-0.6.jar"/>
- <include name="apache/commons/commons-codec-1.8.jar"/>
+ <include name="apache/commons/commons-codec-1.10.jar"/>
<include name="apache/commons/commons-io-2.4.jar"/>
- <include name="apache/commons/commons-lang3-3.1.jar"/>
- <include name="apache/commons/commons-logging-1.1.3.jar"/>
- <include name="cssparser/cssparser-0.9.11.jar"/>
- <include name="htmlunit/htmlunit-2.13/htmlunit-2.13.jar"/>
- <include name="htmlunit/htmlunit-2.13/htmlunit-core-js-2.13.jar"/>
- <include name="nekohtml/nekohtml-1.9.19.jar"/>
+ <include name="apache/commons/commons-lang3-3.4"/>
+ <include name="apache/commons/commons-logging-1.2.jar"/>
+ <include name="cssparser/cssparser-0.9.18.jar"/>
+ <include name="htmlunit/htmlunit-2.19/htmlunit-2.19.jar"/>
+ <include name="htmlunit/htmlunit-2.19/htmlunit-core-js-2.15.jar"/>
+ <include name="nekohtml/nekohtml-1.9.22.jar"/>
<include name="cup/java-cup-11a.jar"/>
<include name="xalan/xalan-2.7.1-nocup.jar"/>
<include name="xerces/xerces-2_11_0/serializer-2.7.1.jar"/>
@@ -120,9 +120,7 @@
<zipfileset src="${gwt.tools.lib}/guava/guava-18.0/guava-18.0-rebased.jar"/>
<zipfileset src="${gwt.tools.lib}/icu4j/50.1.1/icu4j.jar"/>
<zipfileset
- src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/>
- <zipfileset
- src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
+ src="${gwt.tools.lib}/jetty/jetty-9.2.14.v20151106/jetty-all-9.2.14.v20151106.jar"/>
<zipfileset src="${gwt.tools.lib}/jscomp/20131118.json.rebased/compiler-rebased.jar"/>
<zipfileset src="${gwt.tools.lib}/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/>
<zipfileset src="${gwt.tools.lib}/jsr305/jsr305.jar"/>
@@ -134,22 +132,23 @@
<zipfileset src="${gwt.tools.lib}/tomcat/jasper-runtime-1.0.jar"/>
<zipfileset src="${gwt.tools.lib}/tomcat/jsp-api-2.0.jar"/>
<!-- dependencies needed for JSP support in DevMode: END -->
+ <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-servlet-api-8.0.28.jar"/>
<zipfileset
src="${gwt.tools.lib}/apache/commons/commons-collections-3.2.1.jar"/>
<!-- htmlunit dependencies not already included: BEGIN -->
- <zipfileset src="${gwt.tools.lib}/apache/http/httpclient-4.3.1.jar"/>
- <zipfileset src="${gwt.tools.lib}/apache/http/httpcore-4.3.jar"/>
- <zipfileset src="${gwt.tools.lib}/apache/http/httpmime-4.3.1.jar"/>
+ <zipfileset src="${gwt.tools.lib}/apache/http/httpclient-4.5.1.jar"/>
+ <zipfileset src="${gwt.tools.lib}/apache/http/httpcore-4.4.4.jar"/>
+ <zipfileset src="${gwt.tools.lib}/apache/http/httpmime-4.5.1.jar"/>
<zipfileset src="${gwt.tools.lib}/apache/james/apache-mime4j-0.6.jar"/>
- <zipfileset src="${gwt.tools.lib}/apache/commons/commons-codec-1.8.jar"/>
+ <zipfileset src="${gwt.tools.lib}/apache/commons/commons-codec-1.10.jar"/>
<zipfileset src="${gwt.tools.lib}/apache/commons/commons-io-2.4.jar"/>
- <zipfileset src="${gwt.tools.lib}/apache/commons/commons-lang3-3.1.jar"/>
- <zipfileset src="${gwt.tools.lib}/apache/commons/commons-logging-1.1.3.jar"/>
- <zipfileset src="${gwt.tools.lib}/cssparser/cssparser-0.9.11.jar"/>
- <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-2.13/htmlunit-2.13.jar"/>
+ <zipfileset src="${gwt.tools.lib}/apache/commons/commons-lang3-3.4.jar"/>
+ <zipfileset src="${gwt.tools.lib}/apache/commons/commons-logging-1.2.jar"/>
+ <zipfileset src="${gwt.tools.lib}/cssparser/cssparser-0.9.18.jar"/>
+ <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-2.19/htmlunit-2.19.jar"/>
<zipfileset
- src="${gwt.tools.lib}/htmlunit/htmlunit-2.13/htmlunit-core-js-2.13.jar"/>
- <zipfileset src="${gwt.tools.lib}/nekohtml/nekohtml-1.9.19.jar"/>
+ src="${gwt.tools.lib}/htmlunit/htmlunit-2.19/htmlunit-core-js-2.15.jar"/>
+ <zipfileset src="${gwt.tools.lib}/nekohtml/nekohtml-1.9.22.jar"/>
<zipfileset src="${gwt.tools.lib}/cup/java-cup-11a.jar"/>
<zipfileset src="${gwt.tools.lib}/xalan/xalan-2.7.1-nocup.jar"/>
<zipfileset src="${gwt.tools.lib}/xerces/xerces-2_11_0/serializer-2.7.1.jar"/>
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/WebServer.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/WebServer.java
index 9e16f64..930ef4f 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/WebServer.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/WebServer.java
@@ -24,11 +24,10 @@
import com.google.gwt.dev.json.JsonObject;
import org.eclipse.jetty.http.MimeTypes;
-import org.eclipse.jetty.io.Buffer;
-import org.eclipse.jetty.server.AbstractHttpConnection;
+import org.eclipse.jetty.server.HttpConnection;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.servlets.GzipFilter;
@@ -119,13 +118,12 @@
void start(final TreeLogger logger) throws UnableToCompleteException {
- SelectChannelConnector connector = new SelectChannelConnector();
+ Server newServer = new Server();
+ ServerConnector connector = new ServerConnector(newServer);
connector.setHost(bindAddress);
connector.setPort(port);
connector.setReuseAddress(false);
connector.setSoLingerTime(0);
-
- Server newServer = new Server();
newServer.addConnector(connector);
ServletContextHandler newHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
@@ -546,8 +544,8 @@
/* visible for testing */
static String guessMimeType(String filename) {
- Buffer mimeType = MIME_TYPES.getMimeByExtension(filename);
- return mimeType != null ? mimeType.toString() : "";
+ String mimeType = MIME_TYPES.getMimeByExtension(filename);
+ return mimeType != null ? mimeType : "";
}
/**
@@ -567,7 +565,7 @@
private static void setHandled(HttpServletRequest request) {
Request baseRequest = (request instanceof Request) ? (Request) request :
- AbstractHttpConnection.getCurrentConnection().getRequest();
+ HttpConnection.getCurrentConnection().getHttpChannel().getRequest();
baseRequest.setHandled(true);
}
}
diff --git a/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java b/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
index 0d8103e..5a7b37c 100644
--- a/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
+++ b/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
@@ -24,20 +24,22 @@
import org.apache.tools.ant.taskdefs.Javac;
import org.eclipse.jdt.core.JDTCompilerAdapter;
+import org.eclipse.jetty.http.HttpField;
import org.eclipse.jetty.http.HttpFields;
-import org.eclipse.jetty.http.HttpFields.Field;
-import org.eclipse.jetty.server.AbstractConnector;
-import org.eclipse.jetty.server.AbstractHttpConnection;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.RequestLog;
import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.server.handler.RequestLogHandler;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
-import org.eclipse.jetty.server.ssl.SslSocketConnector;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.webapp.ClasspathPattern;
import org.eclipse.jetty.webapp.WebAppClassLoader;
import org.eclipse.jetty.webapp.WebAppContext;
@@ -140,18 +142,17 @@
+ " - " + request.getMethod() + ' ' + request.getUri() + " ("
+ userString + request.getRemoteHost() + ')' + bytesString);
if (branch.isLoggable(logHeaders)) {
- AbstractHttpConnection connection = request.getConnection();
logHeaders(branch.branch(logHeaders, "Request headers"), logHeaders,
- connection.getRequestFields());
+ request.getHttpFields());
logHeaders(branch.branch(logHeaders, "Response headers"), logHeaders,
- connection.getResponseFields());
+ response.getHttpFields());
}
}
}
private void logHeaders(TreeLogger logger, TreeLogger.Type logLevel, HttpFields fields) {
for (int i = 0; i < fields.size(); ++i) {
- Field field = fields.getField(i);
+ HttpField field = fields.getField(i);
logger.log(logLevel, field.getName() + ": " + field.getValue());
}
}
@@ -175,6 +176,10 @@
this.logger = logger;
}
+ public void debug(String msg, long arg) {
+ logger.log(TreeLogger.SPAM, format(msg, arg));
+ }
+
public void debug(String msg, Object... args) {
if (logger.isLoggable(TreeLogger.SPAM)) {
logger.log(TreeLogger.SPAM, format(msg, args));
@@ -586,7 +591,7 @@
* @param bindAddress
* @param port
*/
- private static void setupConnector(AbstractConnector connector,
+ private static void setupConnector(ServerConnector connector,
String bindAddress, int port) {
if (bindAddress != null) {
connector.setHost(bindAddress.toString());
@@ -726,7 +731,7 @@
Server server = new Server();
- AbstractConnector connector = getConnector(logger);
+ ServerConnector connector = getConnector(server, logger);
setupConnector(connector, bindAddress, port);
server.addConnector(connector);
@@ -750,9 +755,6 @@
branch.log(TreeLogger.ERROR, String.format(
"Failed to connect to open channel with port %d (return value %d)",
port, connectorPort));
- if (connector.getConnection() == null) {
- branch.log(TreeLogger.TRACE, "Connection is null");
- }
}
return createServletContainer(logger, appRootDir, server, wac,
connectorPort);
@@ -767,40 +769,52 @@
return new WebAppContextWithReload(logger, appRootDir.getAbsolutePath(), "/");
}
- @SuppressWarnings("deprecation")
- protected AbstractConnector getConnector(TreeLogger logger) {
+ protected ServerConnector getConnector(Server server, TreeLogger logger) {
+ HttpConfiguration config = defaultConfig();
if (useSsl) {
TreeLogger sslLogger = logger.branch(TreeLogger.INFO,
"Listening for SSL connections");
if (sslLogger.isLoggable(TreeLogger.TRACE)) {
sslLogger.log(TreeLogger.TRACE, "Using keystore " + keyStore);
}
- SslSocketConnector conn = new SslSocketConnector();
+ SslContextFactory ssl = new SslContextFactory();
if (clientAuth != null) {
switch (clientAuth) {
case NONE:
- conn.setWantClientAuth(false);
- conn.setNeedClientAuth(false);
+ ssl.setWantClientAuth(false);
+ ssl.setNeedClientAuth(false);
break;
case WANT:
sslLogger.log(TreeLogger.TRACE, "Requesting client certificates");
- conn.setWantClientAuth(true);
- conn.setNeedClientAuth(false);
+ ssl.setWantClientAuth(true);
+ ssl.setNeedClientAuth(false);
break;
case REQUIRE:
sslLogger.log(TreeLogger.TRACE, "Requiring client certificates");
- conn.setWantClientAuth(true);
- conn.setNeedClientAuth(true);
+ ssl.setWantClientAuth(true);
+ ssl.setNeedClientAuth(true);
break;
}
}
- conn.setKeystore(keyStore);
- conn.setTruststore(keyStore);
- conn.setKeyPassword(keyStorePassword);
- conn.setTrustPassword(keyStorePassword);
- return conn;
+ ssl.setKeyStorePath(keyStore);
+ ssl.setTrustStorePath(keyStore);
+ ssl.setKeyStorePassword(keyStorePassword);
+ ssl.setTrustStorePassword(keyStorePassword);
+ config.addCustomizer(new SecureRequestCustomizer());
+ return new ServerConnector(server,
+ null, null, null, 0, 2,
+ new SslConnectionFactory(ssl, "http/1.1"),
+ new HttpConnectionFactory(config));
}
- return new SelectChannelConnector();
+ return new ServerConnector(server, new HttpConnectionFactory(config));
+ }
+
+ protected HttpConfiguration defaultConfig() {
+ HttpConfiguration config = new HttpConfiguration();
+ config.setRequestHeaderSize(16386);
+ config.setSendServerVersion(false);
+ config.setSendDateHeader(true);
+ return config;
}
private void checkStartParams(TreeLogger logger, int port, File appRootDir) {
diff --git a/eclipse/dev/.classpath b/eclipse/dev/.classpath
index 34d8816..e3cbc8e 100644
--- a/eclipse/dev/.classpath
+++ b/eclipse/dev/.classpath
@@ -8,7 +8,7 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/apache/tapestry-util-text-4.0.2.jar" sourcepath="/GWT_TOOLS/lib/apache/tapestry-util-text-4.0.2-src.zip"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/org.eclipse.jdt.core_3.11.2-CUSTOM-GWT-2.8-20160205.jar" sourcepath="/GWT_TOOLS/lib/eclipse/org.eclipse.jdt.core.source_3.11.2-CUSTOM-GWT-2.8-20160205.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/jdtCompilerAdapter_3.11.2-CUSTOM-GWT-2.8-20160205.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/>
+ <classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/jetty/jetty-9.2.14.v20151106/jetty-all-9.2.14.v20151106.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/jsr305/jsr305.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-4.8.2.jar" sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.zip"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/objectweb/asm-5.0.3/lib/asm-all-5.0.3.jar"/>
@@ -19,15 +19,15 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/jasper-compiler-1.0.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/jasper-runtime-1.0.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/jsp-api-2.0.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.13/htmlunit-core-js-2.13.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.13/htmlunit-2.13.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.19/htmlunit-2.19.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.19/htmlunit-core-js-2.15.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-18.0/guava-18.0-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/compiler-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/json/android-sdk-19.1/json-android-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-collections-3.2.1.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
+ <classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/tomcat/tomcat-servlet-api-8.0.28.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/colt/colt-1.2.jar" sourcepath="/GWT_TOOLS/lib/colt/colt-1.2-src.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/eclipse/dev/codeserver/.classpath b/eclipse/dev/codeserver/.classpath
index 67a4627..96354aa 100644
--- a/eclipse/dev/codeserver/.classpath
+++ b/eclipse/dev/codeserver/.classpath
@@ -3,11 +3,9 @@
<classpathentry kind="src" path="codeserver/java"/>
<classpathentry kind="src" path="codeserver/javatests"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-18.0/guava-18.0-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/compiler-rebased.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-4.8.2.jar" sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.zip"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-user"/>
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath
index 0a9da21..58fa437 100644
--- a/eclipse/user/.classpath
+++ b/eclipse/user/.classpath
@@ -6,23 +6,22 @@
<classpathentry kind="src" path="core/javadoc"/>
<classpathentry excluding="**/super/**" kind="src" path="core/test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/apache/tapestry-util-text-4.0.2.jar" sourcepath="/GWT_TOOLS/lib/apache/tapestry-util-text-4.0.2-src.zip"/>
- <classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/junit/junit-4.8.2.jar" sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.jar"/>
- <classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/apache/tapestry-util-text-4.0.2.jar" sourcepath="/GWT_TOOLS/lib/apache/tapestry-util-text-4.0.2-src.zip"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-4.8.2.jar" sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/jsr305/jsr305.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/apache/http/httpclient-4.3.1.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/apache/http/httpcore-4.3.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/apache/http/httpmime-4.3.1.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/apache/http/httpclient-4.5.1.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/apache/http/httpcore-4.4.4.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/apache/http/httpmime-4.5.1.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/apache/james/apache-mime4j-0.6.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-codec-1.8.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-codec-1.10.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-lang3-3.1.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-lang3-3.4.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-logging-1.2.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-io-2.4.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/cssparser/cssparser-0.9.11.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/cssparser/cssparser-0.9.18.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/gss/2015-11-04/closure-stylesheets-library-20151104-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/mockito/1.9.5/mockito-all-1.9.5.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/nekohtml/nekohtml-1.9.19.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/nekohtml/nekohtml-1.9.22.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/selenium/selenium-java-client-driver.jar" sourcepath="/GWT_TOOLS/lib/selenium/selenium-java-client-driver-sources.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/cup/java-cup-11a.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/xalan/xalan-2.7.1-nocup.jar"/>
@@ -35,17 +34,16 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/objenesis/objenesis-1.2.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/objectweb/asm-5.0.3/lib/asm-all-5.0.3.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.13/htmlunit-2.13.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.13/htmlunit-core-js-2.13.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.19/htmlunit-2.19.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.19/htmlunit-core-js-2.15.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/json/android-sdk-19.1/json-android-rebased.jar" sourcepath="/GWT_TOOLS/lib/json/android-sdk-19.1/json-android-rebased-sources.jar"/>
<classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/javax/validation/validation-api-1.0.0.GA.jar" sourcepath="/GWT_TOOLS/lib/javax/validation/validation-api-1.0.0.GA-sources.jar"/>
<classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/javax/validation/validation-api-1.0.0.GA-sources.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/hibernate/validator/hibernate-validator-4.1.0.Final-sources.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/hibernate/validator/hibernate-validator-4.1.0.Final.jar" sourcepath="/GWT_TOOLS/lib/hibernate/validator/hibernate-validator-4.1.0.Final-sources.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/apache/log4j/log4j-1.2.16.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/slf4j/slf4j-api/slf4j-api-1.6.1.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/apache/log4j/log4j-1.2.17.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/slf4j/slf4j-api/slf4j-api-1.7.12.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/slf4j/slf4j-log4j12/slf4j-log4j12-1.7.12.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-18.0/guava-18.0-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/icu4j/50.1.1/icu4j.jar"/>
@@ -67,4 +65,3 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/jdtCompilerAdapter_3.11.2-CUSTOM-GWT-2.8-20160205.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
-
diff --git a/requestfactory/build.xml b/requestfactory/build.xml
index 10b6b77..de85c8f 100755
--- a/requestfactory/build.xml
+++ b/requestfactory/build.xml
@@ -134,10 +134,10 @@
classname="com.google.web.bindery.requestfactory.vm.RequestFactoryJreSuite">
<jvmarg value="-Xss8m" />
<classpath>
- <fileset dir="${gwt.tools.lib}" includes="jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar" />
- <fileset dir="${gwt.tools.lib}" includes="apache/log4j/log4j-1.2.16.jar" />
- <fileset dir="${gwt.tools.lib}" includes="slf4j/slf4j-api/slf4j-api-1.6.1.jar" />
- <fileset dir="${gwt.tools.lib}" includes="slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar" />
+ <fileset dir="${gwt.tools.lib}" includes="tomcat/tomcat-servlet-api-8.0.28.jar" />
+ <fileset dir="${gwt.tools.lib}" includes="apache/log4j/log4j-1.2.17.jar" />
+ <fileset dir="${gwt.tools.lib}" includes="slf4j/slf4j-api/slf4j-api-1.7.12.jar" />
+ <fileset dir="${gwt.tools.lib}" includes="slf4j/slf4j-log4j12/slf4j-log4j12-1.7.12.jar" />
<fileset dir="${gwt.tools.lib}" includes="hibernate/validator/hibernate-validator-4.1.0.Final.jar" />
<fileset dir="${gwt.tools.lib}" includes="javax/validation/validation-api-1.0.0.GA.jar" />
<fileset dir="${gwt.tools.lib}" includes="javax/xml/bind/jaxb-api-2.1.jar" />
diff --git a/samples/dynatablerf/pom.xml b/samples/dynatablerf/pom.xml
index 85c1ddb..8ba1316 100644
--- a/samples/dynatablerf/pom.xml
+++ b/samples/dynatablerf/pom.xml
@@ -97,12 +97,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
+ <version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.7.12</version>
</dependency>
</dependencies>
diff --git a/samples/mobilewebapp/pom.xml b/samples/mobilewebapp/pom.xml
index 8ce47a0..5c57299 100644
--- a/samples/mobilewebapp/pom.xml
+++ b/samples/mobilewebapp/pom.xml
@@ -102,12 +102,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
+ <version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.7.12</version>
</dependency>
<!-- Google App Engine (GAE) -->
diff --git a/samples/validation/pom.xml b/samples/validation/pom.xml
index dd9c7fd..520da29 100644
--- a/samples/validation/pom.xml
+++ b/samples/validation/pom.xml
@@ -103,12 +103,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
+ <version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.7.12</version>
</dependency>
</dependencies>
diff --git a/user/build.xml b/user/build.xml
index 2e43d09..bf50826 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -67,7 +67,7 @@
<pathelement location="${gwt.build}/out/dev/bin-test"/>
<pathelement location="test-super"/>
<pathelement location="test_i18n_${gwt.i18n.test.InnerClassChar}"/>
- <pathelement location="${gwt.tools.lib}/apache/log4j/log4j-1.2.16.jar"/>
+ <pathelement location="${gwt.tools.lib}/apache/log4j/log4j-1.2.17.jar"/>
<pathelement location="${gwt.tools.lib}/cglib/cglib-3.1.jar"/>
<pathelement location="${gwt.tools.lib}/mockito/1.9.5/mockito-all-1.9.5.jar"/>
<pathelement location="${gwt.tools.lib}/objenesis/objenesis-1.2.jar"/>
@@ -78,8 +78,8 @@
location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final.jar"/>
<pathelement
location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final-sources.jar"/>
- <pathelement location="${gwt.tools.lib}/slf4j/slf4j-api/slf4j-api-1.6.1.jar"/>
- <pathelement location="${gwt.tools.lib}/slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar"/>
+ <pathelement location="${gwt.tools.lib}/slf4j/slf4j-api/slf4j-api-1.7.12.jar"/>
+ <pathelement location="${gwt.tools.lib}/slf4j/slf4j-log4j12/slf4j-log4j12-1.7.12.jar"/>
<pathelement
location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
<!-- TCK jars -->
@@ -106,9 +106,9 @@
<mkdir dir="${javac.out}"/>
<gwt.javac excludes="**/super/**">
<classpath>
+ <pathelement location="${gwt.tools.lib}/gss/2015-10-07/closure-stylesheets-library-20151007-rebased.jar"/>
<pathelement location="${gwt.tools.lib}/gss/2015-11-04/closure-stylesheets-library-20151104-rebased.jar"/>
- <pathelement
- location="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
+ <pathelement location="${gwt.tools.lib}/tomcat/tomcat-servlet-api-8.0.28.jar"/>
<pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar"/>
<pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar"/>
<pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar"/>
@@ -163,7 +163,7 @@
<fileset dir="src" excludes="**/package.html"/>
<fileset dir="super" excludes="**/package.html"/>
<fileset dir="${javac.out}"/>
- <zipfileset src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"
+ <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-servlet-api-8.0.28.jar"
excludes="**/*.java"/>
<zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar"/>
<zipfileset src="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar"/>
diff --git a/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java b/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
index 3297431..7daf264 100644
--- a/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
+++ b/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
@@ -24,6 +24,7 @@
import com.gargoylesoftware.htmlunit.BrowserVersion;
import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
import com.gargoylesoftware.htmlunit.IncorrectnessListener;
+import com.gargoylesoftware.htmlunit.InteractivePage;
import com.gargoylesoftware.htmlunit.OnbeforeunloadHandler;
import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.ScriptException;
@@ -107,21 +108,21 @@
webClient.setJavaScriptErrorListener(new JavaScriptErrorListener() {
@Override
- public void loadScriptError(HtmlPage htmlPage, URL scriptUrl,
+ public void loadScriptError(InteractivePage htmlPage, URL scriptUrl,
Exception exception) {
treeLogger.log(TreeLogger.ERROR,
"Load Script Error: " + exception, exception);
}
@Override
- public void malformedScriptURL(HtmlPage htmlPage, String url,
+ public void malformedScriptURL(InteractivePage htmlPage, String url,
MalformedURLException malformedURLException) {
treeLogger.log(TreeLogger.ERROR,
"Malformed Script URL: " + malformedURLException.getLocalizedMessage());
}
@Override
- public void scriptException(HtmlPage htmlPage,
+ public void scriptException(InteractivePage htmlPage,
ScriptException scriptException) {
treeLogger.log(TreeLogger.DEBUG,
"Script Exception: " + scriptException.getLocalizedMessage() +
@@ -129,7 +130,7 @@
}
@Override
- public void timeoutError(HtmlPage htmlPage, long allowedTime,
+ public void timeoutError(InteractivePage htmlPage, long allowedTime,
long executionTime) {
treeLogger.log(TreeLogger.ERROR,
"Script Timeout Error " + executionTime + " > " + allowedTime);
@@ -197,11 +198,12 @@
private static final Map<BrowserVersion, String> USER_AGENT_MAP = Maps.newHashMap();
static {
- addBrowser(BrowserVersion.FIREFOX_17, "gecko1_8");
+ // “Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0″
+ addBrowser(BrowserVersion.EDGE, "safari");
+ addBrowser(BrowserVersion.FIREFOX_38, "gecko1_8");
addBrowser(BrowserVersion.CHROME, "safari");
addBrowser(BrowserVersion.INTERNET_EXPLORER_8, "ie8");
- addBrowser(BrowserVersion.INTERNET_EXPLORER_9, "ie9");
- addBrowser(BrowserVersion.INTERNET_EXPLORER_10, "ie10");
+ addBrowser(BrowserVersion.INTERNET_EXPLORER_11, "gecko1_8");
}
private static void addBrowser(BrowserVersion browser, String userAgent) {
@@ -237,8 +239,8 @@
@Override
public int initialize(String args) {
if (args == null || args.length() == 0) {
- // If no browsers specified, default to Firefox 17.
- args = "FF17";
+ // If no browsers specified, default to Firefox 38.
+ args = "FF38";
}
Set<BrowserVersion> browserSet = new HashSet<BrowserVersion>();
Set<String> userAgentSet = new HashSet<String>();
diff --git a/user/src/com/google/gwt/junit/server/JUnitHostImpl.java b/user/src/com/google/gwt/junit/server/JUnitHostImpl.java
index 1e61d34..05acad7 100644
--- a/user/src/com/google/gwt/junit/server/JUnitHostImpl.java
+++ b/user/src/com/google/gwt/junit/server/JUnitHostImpl.java
@@ -183,7 +183,11 @@
private StackTraceDeobfuscator getDeobfuscator() throws IOException {
if (deobfuscator == null) {
- String path = getRequestModuleBasePath() + "/" + JUnitSymbolMapsLinker.SYMBOL_MAP_DIR;
+ String path = getRequestModuleBasePath();
+ if (!path.endsWith("/")) {
+ path += "/";
+ }
+ path += JUnitSymbolMapsLinker.SYMBOL_MAP_DIR;
deobfuscator = StackTraceDeobfuscator.fromUrl(getServletContext().getResource(path));
}
return deobfuscator;
diff --git a/user/test/com/google/gwt/animation/client/AnimationSchedulerTest.java b/user/test/com/google/gwt/animation/client/AnimationSchedulerTest.java
index 17fa012..6dd83b7 100644
--- a/user/test/com/google/gwt/animation/client/AnimationSchedulerTest.java
+++ b/user/test/com/google/gwt/animation/client/AnimationSchedulerTest.java
@@ -20,6 +20,8 @@
import com.google.gwt.core.client.Duration;
import com.google.gwt.dom.client.DivElement;
import com.google.gwt.dom.client.Document;
+import com.google.gwt.junit.DoNotRunWith;
+import com.google.gwt.junit.Platform;
import com.google.gwt.junit.client.GWTTestCase;
import com.google.gwt.user.client.Timer;
@@ -68,6 +70,9 @@
}.schedule(TIMER_DELAY);
}
+ // TODO(davido): doesn't work on htmlunit-2.19 (works in 2.18)
+ // Presumably because of: http://sourceforge.net/p/htmlunit/code/11004
+ @DoNotRunWith(Platform.HtmlUnitBug)
public void testRequestAnimationFrame() {
delayTestFinish(TEST_TIMEOUT);
final double startTime = Duration.currentTimeMillis();
@@ -82,6 +87,8 @@
}, element);
}
+ // The same as above
+ @DoNotRunWith(Platform.HtmlUnitBug)
public void testRequestAnimationFrameWithoutElement() {
delayTestFinish(TEST_TIMEOUT);
final double startTime = Duration.currentTimeMillis();
diff --git a/user/test/com/google/gwt/user/server/rpc/LogFilterServletContext.java b/user/test/com/google/gwt/user/server/rpc/LogFilterServletContext.java
index 877b342..25fa7a3 100644
--- a/user/test/com/google/gwt/user/server/rpc/LogFilterServletContext.java
+++ b/user/test/com/google/gwt/user/server/rpc/LogFilterServletContext.java
@@ -279,5 +279,9 @@
realContext.setSessionTrackingModes(arg0);
}
+ public String getVirtualServerName() {
+ return realContext.getVirtualServerName();
+ }
+
protected abstract boolean shouldLog(Throwable t, String msg);
}
\ No newline at end of file
diff --git a/user/test/com/google/gwt/user/server/rpc/LoggingRPCTestServiceImpl.java b/user/test/com/google/gwt/user/server/rpc/LoggingRPCTestServiceImpl.java
index 2856def..f0f1eff 100644
--- a/user/test/com/google/gwt/user/server/rpc/LoggingRPCTestServiceImpl.java
+++ b/user/test/com/google/gwt/user/server/rpc/LoggingRPCTestServiceImpl.java
@@ -83,6 +83,11 @@
}
private String getJunitSymbolMapsPath() {
- return getRequestModuleBasePath() + "/" + JUnitSymbolMapsLinker.SYMBOL_MAP_DIR;
+ String path = getRequestModuleBasePath();
+ if (!path.endsWith("/")) {
+ path += "/";
+ }
+ path += JUnitSymbolMapsLinker.SYMBOL_MAP_DIR;
+ return path;
}
}
diff --git a/user/test/com/google/gwt/user/server/rpc/MockHttpServletRequest.java b/user/test/com/google/gwt/user/server/rpc/MockHttpServletRequest.java
index 1772c68..b442371 100644
--- a/user/test/com/google/gwt/user/server/rpc/MockHttpServletRequest.java
+++ b/user/test/com/google/gwt/user/server/rpc/MockHttpServletRequest.java
@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpUpgradeHandler;
import javax.servlet.http.Part;
/**
@@ -306,4 +307,17 @@
throws IllegalStateException {
throw new UnsupportedOperationException();
}
+
+ public String changeSessionId() {
+ throw new UnsupportedOperationException();
+ }
+
+ public long getContentLengthLong() {
+ throw new UnsupportedOperationException();
+ }
+
+ public <T extends HttpUpgradeHandler> T upgrade(Class<T> arg0)
+ throws IOException, ServletException {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/user/test/com/google/gwt/user/server/rpc/RPCServletUtilsTest.java b/user/test/com/google/gwt/user/server/rpc/RPCServletUtilsTest.java
index 4ceb463..4bdf492 100644
--- a/user/test/com/google/gwt/user/server/rpc/RPCServletUtilsTest.java
+++ b/user/test/com/google/gwt/user/server/rpc/RPCServletUtilsTest.java
@@ -25,6 +25,7 @@
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
+import javax.servlet.ReadListener;
import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
@@ -93,6 +94,20 @@
public int read(byte[] b, int off, int len) throws IOException {
return realStream.read(b, off, len);
}
+
+ @Override
+ public boolean isFinished() {
+ return !isReady();
+ }
+
+ @Override
+ public boolean isReady() {
+ return realStream.available() > 0;
+ }
+
+ @Override
+ public void setReadListener(ReadListener arg0) {
+ }
}
/**
diff --git a/user/test/com/google/gwt/user/server/rpc/RemoteServiceServletTest.java b/user/test/com/google/gwt/user/server/rpc/RemoteServiceServletTest.java
index 518cc4a..0cd88ac 100644
--- a/user/test/com/google/gwt/user/server/rpc/RemoteServiceServletTest.java
+++ b/user/test/com/google/gwt/user/server/rpc/RemoteServiceServletTest.java
@@ -304,6 +304,10 @@
public void setSessionTrackingModes(Set<SessionTrackingMode> arg0) {
throw new UnsupportedOperationException();
}
+
+ public String getVirtualServerName() {
+ throw new UnsupportedOperationException();
+ }
}
public void testDoGetSerializationPolicy_FailToOpenMD5Resource()
diff --git a/user/test/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryTest.java b/user/test/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryTest.java
index 5f5b2b6..c7a7754 100644
--- a/user/test/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryTest.java
+++ b/user/test/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryTest.java
@@ -112,10 +112,10 @@
/*
* Make sure your class path includes:
*
- * tools/lib/apache/log4j/log4j-1.2.16.jar
+ * tools/lib/apache/log4j/log4j-1.2.17.jar
* tools/lib/hibernate/validator/hibernate-validator-4.1.0.Final.jar
- * tools/lib/slf4j/slf4j-api/slf4j-api-1.6.1.jar
- * tools/lib/slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar
+ * tools/lib/slf4j/slf4j-api/slf4j-api-1.7.12.jar
+ * tools/lib/slf4j/slf4j-log4j12/slf4j-log4j12-1.7.12.jar
*/
fail("Violations expected (you might be missing some jars, "
+ "see the comment above this line)");
diff --git a/user/test/com/google/web/bindery/requestfactory/server/RequestFactoryTestServer.java b/user/test/com/google/web/bindery/requestfactory/server/RequestFactoryTestServer.java
index cf6d44b..0c9e3f2 100644
--- a/user/test/com/google/web/bindery/requestfactory/server/RequestFactoryTestServer.java
+++ b/user/test/com/google/web/bindery/requestfactory/server/RequestFactoryTestServer.java
@@ -16,7 +16,7 @@
package com.google.web.bindery.requestfactory.server;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlets.GzipFilter;
@@ -32,7 +32,7 @@
public static void main(String[] args) {
Server server = new Server();
- SocketConnector connector = new SocketConnector();
+ ServerConnector connector = new ServerConnector(server);
connector.setPort(9999);
server.addConnector(connector);
