Update to GWT 2.0.1

We have to replicate the change for issue 4322[1] ourselves because
we cloned the development mode server setup code path to make it
easier to configure our context's CLASSPATH without having to build
the complete WAR file.

[1] http://code.google.com/p/google-web-toolkit/issues/detail?id=4322

Change-Id: I9447913ad1b5dc9c7bb904c4408d3e465994bf55
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2010-02-08 10:42:31 -08:00
parent 3c4a53edf6
commit 05de0c5d49
2 changed files with 11 additions and 1 deletions

View File

@@ -348,6 +348,13 @@ public class GerritDebugLauncher extends ServletContainerLauncher {
System.setProperty("Gerrit.GwtDevMode", "" + true);
}
private String bindAddress = null;
@Override
public void setBindAddress(String bindAddress) {
this.bindAddress = bindAddress;
}
@Override
public ServletContainer start(TreeLogger logger, int port, File warDir)
throws Exception {
@@ -363,6 +370,9 @@ public class GerritDebugLauncher extends ServletContainerLauncher {
System.setProperty("org.mortbay.xml.XmlParser.Validating", "false");
AbstractConnector connector = getConnector();
if (bindAddress != null) {
connector.setHost(bindAddress.toString());
}
connector.setPort(port);
// Don't share ports with an existing process.