Skip to content

Commit

Permalink
Update GWT version to 2.6.0-rc3
Browse files Browse the repository at this point in the history 
GWT 2.6.0 has Java 7 support and other new features [1].

Internal Jetty version, shipped with GWT was updated to 8.1. This
version collides with the version that is used internally by Gerrit
(9.1).  To resolve the conflict, GWT's own Jetty version is stripped
from the gwt-dev.jar with maven_jar() method and Gerrit's own Jetty
used instead. Missing Jetty artifacts, needed for the GWT to run in
dev mode:

* jetty-webapp
* jetty-xml

are included now as dependency of gerrit-gwtdebug project.

New GWT version updates a number of dependencies that are used in
Gerrit [3]. Update them too.

EditIteratorTest test is failing with NSME Exception in gwt-test-utils
framework, so deactivate it for now [2].

[1] http://www.gwtproject.org/release-notes.html#Release_Notes_2_6_0_RC1
[2] https://code.google.com/p/gwt-test-utils/issues/detail?id=179
[3]
* Guava 15.0
* Protobuf 2.5.0
* ASM 4.1

Change-Id: I0fa96da6465d52febeae65168b0bd1c2913f6c7e
  • Loading branch information
@davido
davido committed Jan 23, 2014
1 parent cec9b3b commit a283507
Show file tree
Hide file tree
Showing 7 changed files with 182 additions and 65 deletions.
7 changes: 6 additions & 1 deletion gerrit-gwtdebug/BUCK
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
java_library(
name = 'gwtdebug',
srcs = ['src/main/java/com/google/gerrit/gwtdebug/GerritDebugLauncher.java'],
deps = ['//lib/gwt:dev'],
deps = [
'//lib/gwt:dev',
'//lib/jetty:server',
'//lib/jetty:servlet',
'//lib/jetty:webapp',
],
visibility = ['//tools/eclipse:classpath'],
)
186 changes: 136 additions & 50 deletions gerrit-gwtdebug/src/main/java/com/google/gerrit/gwtdebug/GerritDebugLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,31 @@
import com.google.gwt.core.ext.ServletContainerLauncher;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.shell.jetty.JettyNullLogger;

import org.mortbay.component.AbstractLifeCycle;
import org.mortbay.jetty.AbstractConnector;
import org.mortbay.jetty.HttpFields.Field;
import org.mortbay.jetty.Request;
import org.mortbay.jetty.RequestLog;
import org.mortbay.jetty.Response;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.handler.RequestLogHandler;
import org.mortbay.jetty.nio.SelectChannelConnector;
import org.mortbay.jetty.webapp.WebAppClassLoader;
import org.mortbay.jetty.webapp.WebAppContext;
import org.mortbay.log.Log;
import org.mortbay.log.Logger;

import org.eclipse.jetty.http.HttpField;
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.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.RequestLogHandler;
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.webapp.WebAppClassLoader;
import org.eclipse.jetty.webapp.WebAppContext;

import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Iterator;

public class GerritDebugLauncher extends ServletContainerLauncher {

private final static boolean __escape = true;

/**
* Log jetty requests/responses to TreeLogger.
*/
Expand All @@ -57,7 +59,6 @@ public JettyRequestLogger(TreeLogger logger) {
/**
* Log an HTTP request/response to TreeLogger.
*/
@SuppressWarnings("unchecked")
public void log(Request request, Response response) {
int status = response.getStatus();
if (status < 0) {
Expand Down Expand Up @@ -93,20 +94,13 @@ public void log(Request request, Response response) {
if (branch.isLoggable(logHeaders)) {
// Request headers
TreeLogger headers = branch.branch(logHeaders, "Request headers");
Iterator<Field> headerFields =
request.getConnection().getRequestFields().getFields();
while (headerFields.hasNext()) {
Field headerField = headerFields.next();
headers.log(logHeaders, headerField.getName() + ": "
+ headerField.getValue());
for (HttpField f : request.getHttpFields()) {
headers.log(logHeaders, f.getName() + ": " + f.getValue());
}
// Response headers
headers = branch.branch(logHeaders, "Response headers");
headerFields = response.getHttpFields().getFields();
while (headerFields.hasNext()) {
Field headerField = headerFields.next();
headers.log(logHeaders, headerField.getName() + ": "
+ headerField.getValue());
for (HttpField f : response.getHttpFields()) {
headers.log(logHeaders, f.getName() + ": " + f.getValue());
}
}
}
Expand Down Expand Up @@ -163,6 +157,54 @@ public void warn(String msg, Throwable th) {
logger.log(TreeLogger.WARN, msg, th);
}

public void debug(String msg, long value) {
// ignored
}

@Override
public void debug(String msg, Object... args) {
// ignored
}

@Override
public void debug(Throwable thrown) {
// ignored
}

@Override
public void warn(String msg, Object... args) {
logger.log(TreeLogger.WARN, format(msg, args));
}

@Override
public void warn(Throwable thrown) {
logger.log(TreeLogger.WARN, thrown.getMessage(), thrown);
}

@Override
public void info(String msg, Object... args) {
logger.log(TreeLogger.INFO, format(msg, args));
}

@Override
public void info(Throwable thrown) {
logger.log(TreeLogger.INFO, thrown.getMessage(), thrown);
}

@Override
public void info(String msg, Throwable thrown) {
logger.log(TreeLogger.INFO, msg, thrown);
}

@Override
public void ignore(Throwable ignored) {
}

@Override
public String getName() {
return this.getName();
}

/**
* Copied from org.mortbay.log.StdErrLog.
*/
Expand All @@ -178,6 +220,54 @@ private String format(String msg, Object arg0, Object arg1) {
}
return msg;
}

private String format(String msg, Object... args) {
StringBuilder builder = new StringBuilder();
if (msg == null) {
msg = "";
for (int i = 0; i < args.length; i++) {
msg += "{} ";
}
}
String braces = "{}";
int start = 0;
for (Object arg : args) {
int bracesIndex = msg.indexOf(braces,start);
if (bracesIndex < 0) {
escape(builder, msg.substring(start));
builder.append(" ");
builder.append(arg);
start = msg.length();
} else {
escape(builder, msg.substring(start, bracesIndex));
builder.append(String.valueOf(arg));
start = bracesIndex + braces.length();
}
}
escape(builder, msg.substring(start));
return builder.toString();
}

private void escape(StringBuilder builder, String string) {
if (__escape) {
for (int i = 0; i < string.length(); ++i) {
char c = string.charAt(i);
if (Character.isISOControl(c)) {
if (c == '\n') {
builder.append('|');
} else if (c == '\r') {
builder.append('<');
} else {
builder.append('?');
}
} else {
builder.append(c);
}
}
} else {
builder.append(string);
}
}
}

/**
Expand Down Expand Up @@ -268,7 +358,6 @@ protected final class MyWebAppContext extends WebAppContext {
private final ClassLoader systemClassLoader =
Thread.currentThread().getContextClassLoader();

@SuppressWarnings("unchecked")
private MyWebAppContext(String webApp, String contextPath) {
super(webApp, contextPath);

Expand All @@ -282,7 +371,7 @@ private MyWebAppContext(String webApp, String contextPath) {

@Override
protected void doStart() throws Exception {
setClassLoader(new MyLoader());
setClassLoader(new MyLoader(this));
super.doStart();
}

Expand All @@ -293,9 +382,10 @@ protected void doStop() throws Exception {
}

private class MyLoader extends WebAppClassLoader {
MyLoader() throws IOException {
MyWebAppContext ctx;
MyLoader(MyWebAppContext ctx) throws IOException {
super(bootStrapOnlyClassLoader, MyWebAppContext.this);

this.ctx = ctx;
final URLClassLoader scl = (URLClassLoader) systemClassLoader;
final URL[] urls = scl.getURLs();
for (URL u : urls) {
Expand All @@ -305,17 +395,10 @@ private class MyLoader extends WebAppClassLoader {
}
}

@Override
public boolean isSystemPath(String name) {
name = name.replace('/', '.');
return super.isSystemPath(name) //
|| name.startsWith("org.bouncycastle.");
}

@Override
protected Class<?> findClass(String name) throws ClassNotFoundException {
// For system path, always prefer the outside world.
if (isSystemPath(name)) {
if (ctx.isSystemClass(name.replace('/', '.'))) {
try {
return systemClassLoader.loadClass(name);
} catch (ClassNotFoundException e) {
Expand All @@ -327,9 +410,6 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
}

static {
// Suppress spammy Jetty log initialization.
System
.setProperty("org.mortbay.log.class", JettyNullLogger.class.getName());
Log.getLog();

/*
Expand Down Expand Up @@ -357,7 +437,6 @@ public ServletContainer start(TreeLogger logger, int port, File warDir)
throws Exception {
TreeLogger branch =
logger.branch(TreeLogger.INFO, "Starting Jetty on port " + port, null);

checkStartParams(branch, port, warDir);

// Setup our branch logger during startup.
Expand All @@ -366,7 +445,10 @@ public ServletContainer start(TreeLogger logger, int port, File warDir)
// Turn off XML validation.
System.setProperty("org.mortbay.xml.XmlParser.Validating", "false");

AbstractConnector connector = getConnector();
Server server = new Server();
HttpConfiguration config = defaultConfig();
ServerConnector connector = new ServerConnector(server,
new HttpConnectionFactory(config));
if (bindAddress != null) {
connector.setHost(bindAddress);
}
Expand All @@ -378,7 +460,7 @@ public ServletContainer start(TreeLogger logger, int port, File warDir)
// Linux keeps the port blocked after shutdown if we don't disable this.
connector.setSoLingerTime(0);

Server server = new Server();

server.addConnector(connector);

File top;
Expand Down Expand Up @@ -413,12 +495,16 @@ public ServletContainer start(TreeLogger logger, int port, File warDir)
// Now that we're started, log to the top level logger.
Log.setLog(new JettyTreeLogger(logger));

return new JettyServletContainer(logger, server, wac, connector
.getLocalPort(), warDir);
return new JettyServletContainer(logger, server, wac,
connector.getLocalPort(), warDir);
}

protected AbstractConnector getConnector() {
return new SelectChannelConnector();
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) {
Expand Down
2 changes: 2 additions & 0 deletions gerrit-gwtui/src/test/java/com/google/gerrit/client/diff/EditIteratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@
import net.codemirror.lib.LineCharacter;

import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;

/** Unit tests for EditIterator */
@GwtModule("com.google.gerrit.GerritGwtUI")
@Ignore
public class EditIteratorTest extends GwtTest {
private JsArrayString lines;

Expand Down
22 changes: 11 additions & 11 deletions lib/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,29 +65,29 @@ maven_jar(

maven_jar(
name = 'ow2-asm',
id = 'org.ow2.asm:asm:4.0',
sha1 = '659add6efc75a4715d738e73f07505246edf4d66',
id = 'org.ow2.asm:asm:4.1',
sha1 = 'ad568238ee36a820bd6c6806807e8a14ea34684d',
license = 'ow2',
)

maven_jar(
name = 'ow2-asm-analysis',
id = 'org.ow2.asm:asm-analysis:4.0',
sha1 = '1c45d52b6f6c638db13cf3ac12adeb56b254cdd7',
id = 'org.ow2.asm:asm-analysis:4.1',
sha1 = '73401033069e4714f57b60aeae02f97210aaa64e',
license = 'ow2',
)

maven_jar(
name = 'ow2-asm-tree',
id = 'org.ow2.asm:asm-tree:4.0',
sha1 = '67bd266cd17adcee486b76952ece4cc85fe248b8',
id = 'org.ow2.asm:asm-tree:4.1',
sha1 = '51085abcc4cb6c6e1cb5551e6f999eb8e31c5b2d',
license = 'ow2',
)

maven_jar(
name = 'ow2-asm-util',
id = 'org.ow2.asm:asm-util:4.0',
sha1 = 'd7a65f54cda284f9706a750c23d64830bb740c39',
id = 'org.ow2.asm:asm-util:4.1',
sha1 = '6344065cb0f94e2b930a95e6656e040ebc11df08',
license = 'ow2',
)

Expand Down Expand Up @@ -198,9 +198,9 @@ maven_jar(
maven_jar(
name = 'protobuf',
# Must match version in gwtorm/pom.xml.
id = 'com.google.protobuf:protobuf-java:2.4.1',
bin_sha1 = '0c589509ec6fd86d5d2fda37e07c08538235d3b9',
src_sha1 = 'e406f69360f2a89cb4aa724ed996a1c5599af383',
id = 'com.google.protobuf:protobuf-java:2.5.0',
bin_sha1 = 'a10732c76bfacdbd633a7eb0f7968b1059a65dfa',
src_sha1 = '7a27a7fc815e481b367ead5df19b4a71ace4a419',
license = 'protobuf',
)

Expand Down
Loading

0 comments on commit a283507

Please sign in to comment.