opendev/gerrit
Code Issues Proposed changes

Update to GWT 2.0.1

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-gwtdebug/src/main/java/com/google/gerrit/gwtdebug/GerritDebugLauncher.java
View File

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

2
pom.xml
View File

@@ -50,7 +50,7 @@ limitations under the License.
<gwtormVersion>1.1.4-SNAPSHOT</gwtormVersion> <gwtormVersion>1.1.4-SNAPSHOT</gwtormVersion>
<gwtjsonrpcVersion>1.2.2-SNAPSHOT</gwtjsonrpcVersion> <gwtjsonrpcVersion>1.2.2-SNAPSHOT</gwtjsonrpcVersion>
<gwtexpuiVersion>1.2.1-SNAPSHOT</gwtexpuiVersion> <gwtexpuiVersion>1.2.1-SNAPSHOT</gwtexpuiVersion>
<gwtVersion>2.0.0</gwtVersion> <gwtVersion>2.0.1</gwtVersion>
<slf4jVersion>1.5.8</slf4jVersion> <slf4jVersion>1.5.8</slf4jVersion>
<guiceVersion>2.0</guiceVersion> <guiceVersion>2.0</guiceVersion>
<jettyVersion>7.0.1.v20091125</jettyVersion> <jettyVersion>7.0.1.v20091125</jettyVersion>