Move to GWT 2.0.3. Drop in new gwt-incubator to match.
Signed-off-by: James Ren <jamesren@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@4452 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/frontend/client/AfeClient.launch b/frontend/client/AfeClient.launch
index 464a570..8c79447 100644
--- a/frontend/client/AfeClient.launch
+++ b/frontend/client/AfeClient.launch
@@ -11,12 +11,12 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="AfeClient" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/AfeClient/src" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento project="AfeClient"/> </runtimeClasspathEntry> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-dev-linux.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-dev.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-incubator.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.HostedMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-ea -startupUrl http://localhost:8000/afe/server/autotest.AfeClient/AfeClient.html autotest.AfeClient"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl http://localhost:8000/afe/server/autotest.AfeClient/AfeClient.html autotest.AfeClient"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="AfeClient"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M -ea"/>
</launchConfiguration>
diff --git a/frontend/client/EmbeddedTkoClient.launch b/frontend/client/EmbeddedTkoClient.launch
index 0d8e2d0..c589d9f 100644
--- a/frontend/client/EmbeddedTkoClient.launch
+++ b/frontend/client/EmbeddedTkoClient.launch
@@ -11,12 +11,12 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="AfeClient" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/AfeClient/src" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento project="AfeClient"/> </runtimeClasspathEntry> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-dev-linux.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-dev.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-incubator.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.HostedMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-ea -startupUrl http://localhost:8000/new_tko/server/autotest.EmbeddedTkoClient/EmbeddedTkoClientTest.html autotest.EmbeddedTkoClient"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl http://localhost:8000/new_tko/server/autotest.EmbeddedTkoClient/EmbeddedTkoClientTest.html autotest.EmbeddedTkoClient"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="AfeClient"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512M"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512M -ea"/>
</launchConfiguration>
diff --git a/frontend/client/TestPlannerClient.launch b/frontend/client/TestPlannerClient.launch
index 55e37c4..344ca96 100644
--- a/frontend/client/TestPlannerClient.launch
+++ b/frontend/client/TestPlannerClient.launch
@@ -11,12 +11,12 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="AfeClient" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/AfeClient/src" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento project="AfeClient"/> </runtimeClasspathEntry> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-dev-linux.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-dev.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-incubator.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.HostedMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-ea -startupUrl http://localhost:8000/afe/server/autotest.TestPlannerClient/TestPlannerClient.html autotest.TestPlannerClient"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl http://localhost:8000/afe/server/autotest.TestPlannerClient/TestPlannerClient.html autotest.TestPlannerClient"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="AfeClient"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M -ea"/>
</launchConfiguration>
diff --git a/frontend/client/TkoClient.launch b/frontend/client/TkoClient.launch
index 8508189..a6b63dc 100644
--- a/frontend/client/TkoClient.launch
+++ b/frontend/client/TkoClient.launch
@@ -11,12 +11,12 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="AfeClient" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/AfeClient/src" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento project="AfeClient"/> </runtimeClasspathEntry> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-dev-linux.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-dev.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="/usr/local/lib/gwt/gwt-incubator.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.HostedMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-ea -startupUrl http://localhost:8000/new_tko/server/autotest.TkoClient/TkoClient.html autotest.TkoClient"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl http://localhost:8000/new_tko/server/autotest.TkoClient/TkoClient.html autotest.TkoClient"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="AfeClient"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M -ea"/>
</launchConfiguration>
diff --git a/frontend/client/src/autotest/TestPlannerClient.gwt.xml b/frontend/client/src/autotest/TestPlannerClient.gwt.xml
index ecb8efa..8e80ab0 100644
--- a/frontend/client/src/autotest/TestPlannerClient.gwt.xml
+++ b/frontend/client/src/autotest/TestPlannerClient.gwt.xml
@@ -3,8 +3,7 @@
<inherits name='com.google.gwt.json.JSON'/>
<inherits name='com.google.gwt.http.HTTP'/>
- <inherits name='com.google.gwt.widgetideas.WidgetIdeas'/>
- <inherits name='com.google.gwt.gen2.table.ScrollTable'/>
+ <inherits name='com.google.gwt.gen2.Gen2'/>
<source path="planner"/>
<source path="common"/>
diff --git a/frontend/client/src/autotest/common/PaddedJsonRpcProxy.java b/frontend/client/src/autotest/common/PaddedJsonRpcProxy.java
index 81427cb..08cfdff 100644
--- a/frontend/client/src/autotest/common/PaddedJsonRpcProxy.java
+++ b/frontend/client/src/autotest/common/PaddedJsonRpcProxy.java
@@ -84,6 +84,7 @@
* See the implementation of com.google.gwt.user.client.Timer.fire(), from which this
* technique was borrowed.
*/
+ @SuppressWarnings("unused")
public void handleResponse(JavaScriptObject responseJso) {
UncaughtExceptionHandler handler = GWT.getUncaughtExceptionHandler();
if (handler == null) {
diff --git a/frontend/client/src/autotest/planner/triage/FailureTableDisplay.java b/frontend/client/src/autotest/planner/triage/FailureTableDisplay.java
index 045d385..501552a 100644
--- a/frontend/client/src/autotest/planner/triage/FailureTableDisplay.java
+++ b/frontend/client/src/autotest/planner/triage/FailureTableDisplay.java
@@ -18,12 +18,12 @@
public class FailureTableDisplay extends Composite implements FailureTable.Display {
+ private FixedWidthFlexTable header = new FixedWidthFlexTable();
private FixedWidthGrid dataTable;
private ScrollTable scrollTable;
private CheckBox selectAll = new CheckBox();
public FailureTableDisplay(String group, String[] columnNames) {
- FixedWidthFlexTable header = new FixedWidthFlexTable();
FlexCellFormatter formatter = header.getFlexCellFormatter();
dataTable = new FixedWidthGrid(0, columnNames.length);
@@ -41,9 +41,6 @@
formatter.setColSpan(0, 0, columnNames.length + 1);
for (int i = 0; i < columnNames.length; i++) {
header.setText(1, i + 1, columnNames[i]);
- header.setColumnWidth(i + 1, 1);
- scrollTable.setHeaderColumnTruncatable(i, false);
- scrollTable.setColumnTruncatable(i, false);
}
initWidget(scrollTable);
@@ -57,7 +54,14 @@
dataTable.resizeRows(row + 1);
for (int cell = 0; cell < cells.length; cell++) {
dataTable.setText(row, cell, cells[cell]);
- dataTable.setColumnWidth(cell, 1);
+ }
+
+ for (int column = 0; column < dataTable.getColumnCount(); column++) {
+ int width = Math.max(
+ dataTable.getIdealColumnWidth(column), header.getColumnWidth(column + 1));
+
+ header.setColumnWidth(column + 1, width);
+ dataTable.setColumnWidth(column, width);
}
}
diff --git a/utils/compile_gwt_clients.py b/utils/compile_gwt_clients.py
index 0619dfa..67108bc 100755
--- a/utils/compile_gwt_clients.py
+++ b/utils/compile_gwt_clients.py
@@ -15,8 +15,7 @@
_COMPILE_LINE = ('java -Xmx512M '
'-cp "%(app_dir)s/src:%(app_dir)s/bin:%(gwt_dir)s/gwt-user.jar'
- ':%(gwt_dir)s/gwt-dev-linux.jar'
- ':%(gwt_dir)s/gwt-incubator.jar" '
+ ':%(gwt_dir)s/gwt-dev.jar:%(gwt_dir)s/gwt-incubator.jar" '
'-Djava.awt.headless=true com.google.gwt.dev.Compiler '
'-war "%(compile_dir)s" %(extra_args)s %(project_client)s')
diff --git a/utils/external_packages.py b/utils/external_packages.py
index 9f771b6..196964d 100644
--- a/utils/external_packages.py
+++ b/utils/external_packages.py
@@ -679,10 +679,10 @@
class GwtPackage(ExternalPackage):
"""Fetch and extract a local copy of GWT used to build the frontend."""
- version = '1.7.0'
- local_filename = 'gwt-linux-%s.tar.bz2' % version
+ version = '2.0.3'
+ local_filename = 'gwt-%s.zip' % version
urls = ('http://google-web-toolkit.googlecode.com/files/' + local_filename,)
- hex_sum = 'accb39506e1fa719ba166cf54451c91dafd9d456'
+ hex_sum = '1dabd25a02b9299f6fa84c51c97210a3373a663e'
name = 'gwt'
about_filename = 'about.txt'
module_name = None # Not a Python module.
@@ -712,7 +712,7 @@
def _build_and_install(self, install_dir):
os.chdir(install_dir)
self._extract_compressed_package()
- extracted_dir = self.local_filename[:-len('.tar.bz2')]
+ extracted_dir = self.local_filename[:-len('.zip')]
target_dir = os.path.join(install_dir, self.name)
if os.path.exists(target_dir):
shutil.rmtree(target_dir)
@@ -723,12 +723,12 @@
# This requires GWT to already be installed, so it must be declared after
# GwtPackage
class GwtIncubatorPackage(ExternalPackage):
- version = 'march-02-2009'
- local_filename = 'gwt-incubator.jar'
- remote_filename = 'gwt-incubator-%s.jar' % version
+ version = '20100204-r1747'
+ local_filename = 'gwt-incubator-%s.jar' % version
+ symlink_name = 'gwt-incubator.jar'
urls = ('http://google-web-toolkit-incubator.googlecode.com/files/'
- + remote_filename,)
- hex_sum = 'adc4c5c96e832b33885fa6dfec8399f7c13413c7'
+ + local_filename,)
+ hex_sum = '0c9495634f0627d0b4de0d78a50a3aefebf67f8c'
module_name = None # Not a Python module
@@ -740,6 +740,7 @@
def _build_and_install(self, install_dir):
dest = os.path.join(install_dir, GwtPackage.name, self.local_filename)
shutil.copyfile(self.verified_package, dest)
+ os.symlink(dest, self.symlink_name)
return True