Revision: 6326
Author: j...@google.com
Date: Thu Oct 8 11:27:39 2009
Log: Merge farewellSwt changes into branch.
svn merge --ignore-ancestry -r6280:6325 \
https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt .
http://code.google.com/p/google-web-toolkit/source/detail?r=6326
Added:
/changes/jat/abstractui/tools/do-not-commit-to-trunk
Deleted:
/changes/jat/abstractui/distro-source/linux/build.xml
/changes/jat/abstractui/distro-source/mac/build.xml
/changes/jat/abstractui/distro-source/windows/build.xml
Modified:
/changes/jat/abstractui/branch-info.txt
/changes/jat/abstractui/dev/build.xml
/changes/jat/abstractui/dev/oophm/src/com/google/gwt/dev/shell/HostedModePluginObject.java
/changes/jat/abstractui/dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java
/changes/jat/abstractui/eclipse/dev/.classpath
/changes/jat/abstractui/eclipse/user/.classpath
/changes/jat/abstractui/samples/common.ant.xml
/changes/jat/abstractui/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
/changes/jat/abstractui/user/src/com/google/gwt/user/tools/README.txtsrc
/changes/jat/abstractui/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
Replaced:
/changes/jat/abstractui/tools/do-not-commit-to-trunk/README
/changes/jat/abstractui/tools/do-not-commit-to-trunk/htmlunit-core-js-sources.jar
/changes/jat/abstractui/tools/do-not-commit-to-trunk/htmlunit-core-js.jar
/changes/jat/abstractui/tools/do-not-commit-to-trunk/htmlunit-sources.jar
/changes/jat/abstractui/tools/do-not-commit-to-trunk/htmlunit.jar
/changes/jat/abstractui/tools/do-not-commit-to-trunk/nekohtml-1.9.13.jar
=======================================
--- /changes/jat/abstractui/distro-source/linux/build.xml Thu Sep 24
13:55:42 2009
+++ /dev/null
@@ -1,76 +0,0 @@
-<project name="dist-linux" default="build" basedir=".">
- <property name="dist.platform" value="linux" />
- <import file="../common.ant.xml" />
- <property name="project.dist"
location="${gwt.build.dist}/${project.distname}.tar.bz2" />
-
- <target name="build" depends="filter" description="Packages the distro">
- <!-- TODO: figure out how to share most of this across platforms -->
- <mkdir dir="${gwt.build.dist}" />
- <mkdir dir="${gwt.build.out}/samples-scripts/${dist.platform}"/>
- <gwt.tgz.cat destfile="${project.dist}" compression="bzip2">
- <!-- jars -->
- <tarfileset file="${gwt.build.lib}/gwt-dev-${dist.platform}.jar"
prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-dev-oophm.jar"
prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-user.jar"
prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-servlet.jar"
prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-benchmark-viewer.war"
prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-soyc-vis.jar"
prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-api-checker.jar"
prefix="${project.distname}" />
-
- <!-- jni libs-->
- <tarfileset dir="${gwt.build.jni}/${dist.platform}"
prefix="${project.distname}" />
-
- <!-- raw files -->
- <tarfileset dir="${dist.resources}" prefix="${project.distname}"
mode="755">
- <patternset refid="chmod.executables" />
- </tarfileset>
- <tarfileset dir="${dist.resources}" prefix="${project.distname}">
- <patternset refid="chmod.not.executables" />
- </tarfileset>
- <tarfileset dir="src" prefix="${project.distname}" mode="755">
- <patternset refid="chmod.executables" />
- </tarfileset>
- <tarfileset dir="src" prefix="${project.distname}">
- <patternset refid="chmod.not.executables" />
- </tarfileset>
-
- <!-- doc -->
- <tarfileset dir="${gwt.build.out}" prefix="${project.distname}">
- <include name="doc" />
- <include name="doc/html/**" />
- <include name="doc/css/**" />
- <include name="doc/javadoc/**" />
- </tarfileset>
-
- <!-- samples -->
- <tarfileset dir="${gwt.build.out}" prefix="${project.distname}">
- <include name="samples" />
- <include name="samples/*" />
- <include name="samples/*/src/**" />
- <include name="samples/*/war/**" />
- </tarfileset>
- <tarfileset dir="${gwt.build.out}/samples-scripts/${dist.platform}"
mode="755" prefix="${project.distname}/samples">
- <include name="*/*" />
- </tarfileset>
-
- <includetar src="${gwt.tools.redist}/mozilla/mozilla-1.7.12.tar.gz"
compression="gzip" prefix="${project.distname}" />
- </gwt.tgz.cat>
-
- <if>
- <isset property="build.host.islinux" />
- <then>
- <!--
- Untar distro into the staging directory. Must use GNU tar
- to handle permissions and symlinks correctly.
- -->
- <mkdir dir="${gwt.build.staging}" />
- <exec executable="tar" failonerror="true">
- <arg value="-xpjf" />
- <arg file="${project.dist}" />
- <arg value="-C" />
- <arg file="${gwt.build.staging}" />
- </exec>
- </then>
- </if>
- </target>
-</project>
=======================================
--- /changes/jat/abstractui/distro-source/mac/build.xml Thu Sep 24 13:55:42
2009
+++ /dev/null
@@ -1,74 +0,0 @@
-<project name="dist-mac" default="build" basedir=".">
- <property name="dist.platform" value="mac" />
- <import file="../common.ant.xml" />
- <property name="project.dist"
location="${gwt.build.dist}/${project.distname}.tar.gz" />
-
- <target name="build" depends="filter" description="Packages the distro">
- <!-- TODO: figure out how to share most of this across platforms -->
- <mkdir dir="${gwt.build.dist}" />
- <mkdir dir="${gwt.build.out}/samples-scripts/${dist.platform}"/>
- <gwt.tgz.cat destfile="${project.dist}">
- <!-- jars -->
- <tarfileset file="${gwt.build.lib}/gwt-dev-${dist.platform}.jar"
prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-dev-oophm.jar"
prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-user.jar"
prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-servlet.jar"
prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-benchmark-viewer.war"
prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-soyc-vis.jar"
prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-api-checker.jar"
prefix="${project.distname}" />
-
- <!-- jni libs-->
- <tarfileset dir="${gwt.build.jni}/${dist.platform}"
prefix="${project.distname}" />
-
- <!-- raw files -->
- <tarfileset dir="${dist.resources}" prefix="${project.distname}"
mode="755">
- <patternset refid="chmod.executables" />
- </tarfileset>
- <tarfileset dir="${dist.resources}" prefix="${project.distname}">
- <patternset refid="chmod.not.executables" />
- </tarfileset>
- <tarfileset dir="src" prefix="${project.distname}" mode="755">
- <patternset refid="chmod.executables" />
- </tarfileset>
- <tarfileset dir="src" prefix="${project.distname}">
- <patternset refid="chmod.not.executables" />
- </tarfileset>
-
- <!-- doc -->
- <tarfileset dir="${gwt.build.out}" prefix="${project.distname}">
- <include name="doc" />
- <include name="doc/html/**" />
- <include name="doc/css/**" />
- <include name="doc/javadoc/**" />
- </tarfileset>
-
- <!-- samples -->
- <tarfileset dir="${gwt.build.out}" prefix="${project.distname}">
- <include name="samples" />
- <include name="samples/*" />
- <include name="samples/*/src/**" />
- <include name="samples/*/war/**" />
- </tarfileset>
- <tarfileset dir="${gwt.build.out}/samples-scripts/${dist.platform}"
mode="755" prefix="${project.distname}/samples">
- <include name="*/*" />
- </tarfileset>
- </gwt.tgz.cat>
-
- <if>
- <isset property="build.host.ismac" />
- <then>
- <!--
- Untar distro into the staging directory. Must use GNU tar
- to handle permissions and symlinks correctly.
- -->
- <mkdir dir="${gwt.build.staging}" />
- <exec executable="tar" failonerror="true">
- <arg value="-xpzf" />
- <arg file="${project.dist}" />
- <arg value="-C" />
- <arg file="${gwt.build.staging}" />
- </exec>
- </then>
- </if>
- </target>
-</project>
=======================================
--- /changes/jat/abstractui/distro-source/windows/build.xml Thu Sep 24
13:55:42 2009
+++ /dev/null
@@ -1,55 +0,0 @@
-<project name="dist-windows" default="build" basedir=".">
- <property name="dist.platform" value="windows" />
- <import file="../common.ant.xml" />
- <property name="project.dist"
location="${gwt.build.dist}/${project.distname}.zip" />
-
- <target name="build" depends="filter" description="Packages the distro">
- <!-- TODO: figure out how to share most of this across platforms -->
- <mkdir dir="${gwt.build.dist}" />
- <mkdir dir="${gwt.build.out}/samples-scripts/${dist.platform}"/>
- <zip destfile="${project.dist}">
- <!-- jars -->
- <zipfileset file="${gwt.build.lib}/gwt-dev-${dist.platform}.jar"
prefix="${project.distname}" />
- <zipfileset file="${gwt.build.lib}/gwt-dev-oophm.jar"
prefix="${project.distname}" />
- <zipfileset file="${gwt.build.lib}/gwt-user.jar"
prefix="${project.distname}" />
- <zipfileset file="${gwt.build.lib}/gwt-servlet.jar"
prefix="${project.distname}" />
- <zipfileset file="${gwt.build.lib}/gwt-benchmark-viewer.war"
prefix="${project.distname}" />
- <zipfileset file="${gwt.build.lib}/gwt-soyc-vis.jar"
prefix="${project.distname}" />
- <zipfileset file="${gwt.build.lib}/gwt-api-checker.jar"
prefix="${project.distname}" />
-
- <!-- jni libs-->
- <zipfileset dir="${gwt.build.jni}/${dist.platform}"
prefix="${project.distname}" />
-
- <!-- raw files -->
- <zipfileset dir="${dist.resources}" prefix="${project.distname}" />
- <zipfileset dir="src" prefix="${project.distname}" />
-
- <!-- doc -->
- <zipfileset dir="${gwt.build.out}" prefix="${project.distname}">
- <include name="doc" />
- <include name="doc/html/**" />
- <include name="doc/css/**" />
- <include name="doc/javadoc/**" />
- </zipfileset>
-
- <!-- samples -->
- <zipfileset dir="${gwt.build.out}" prefix="${project.distname}">
- <include name="samples" />
- <include name="samples/*" />
- <include name="samples/*/src/**" />
- <include name="samples/*/war/**" />
- </zipfileset>
- <zipfileset dir="${gwt.build.out}/samples-scripts/${dist.platform}"
prefix="${project.distname}/samples">
- <include name="*/*" />
- </zipfileset>
- </zip>
-
- <if>
- <isset property="build.host.iswindows" />
- <then>
- <mkdir dir="${gwt.build.staging}" />
- <unzip src="${project.dist}" dest="${gwt.build.staging}" />
- </then>
- </if>
- </target>
-</project>
=======================================
--- /changes/jat/abstractui/branch-info.txt Thu Oct 1 11:39:10 2009
+++ /changes/jat/abstractui/branch-info.txt Thu Oct 8 11:27:39 2009
@@ -4,5 +4,7 @@
https://google-web-toolkit.googlecode.com/svn/branches/farewell...@6280 \
https://google-web-toolkit.googlecode.com/svn/changes/jat/abstractui
-Merged from trunk
-================
+Merges
+======
+svn merge --ignore-ancestry -r6280:6325 \
+ https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt .
=======================================
--- /changes/jat/abstractui/dev/build.xml Wed Sep 30 21:43:14 2009
+++ /changes/jat/abstractui/dev/build.xml Thu Oct 8 11:27:39 2009
@@ -7,6 +7,7 @@
<property name="alldeps.jar" location="${project.build}/alldeps.jar" />
<property name="gwt.junit.testcase.dev.core.includes"
value="**/com/google/**/*Test.class" />
<property name="gwt.junit.testcase.dev.core.excludes" value="" />
+ <property name="htmlunit.libs.temp"
location="${gwt.root}/tools/do-not-commit-to-trunk" />
<target name="clean" description="Cleans this project's intermediate and
output files">
<delete dir="${project.build}" failonerror="false" />
@@ -74,9 +75,6 @@
<include name="apache/commons/commons-io-1.4.jar" />
<include name="apache/commons/commons-lang-2.4.jar" />
<include name="cssparser/cssparser-0.9.5.jar" />
- <include name="htmlunit/htmlunit-2.5.jar" />
- <include name="htmlunit/htmlunit-core-js-2.5.jar" />
- <include name="nekohtml/nekohtml-1.9.12.jar" />
<include name="xalan/xalan-2.7.1.jar" />
<include name="xerces/xerces-2_9_1/serializer.jar" />
<include name="xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar" />
@@ -86,6 +84,11 @@
<include name="sun/swingworker/swing-worker-1.1.jar" />
</fileset>
<fileset file="build.xml"/>
+ <fileset dir="${htmlunit.libs.temp}">
+ <include name="htmlunit.jar" />
+ <include name="htmlunit-core-js.jar" />
+ <include name="nekohtml-1.9.13.jar" />
+ </fileset>
</sourcefiles>
<targetfiles>
<fileset file="${alldeps.jar}"/>
@@ -129,9 +132,9 @@
<zipfileset
src="${gwt.tools.lib}/apache/commons/commons-io-1.4.jar" />
<zipfileset
src="${gwt.tools.lib}/apache/commons/commons-lang-2.4.jar" />
<zipfileset src="${gwt.tools.lib}/cssparser/cssparser-0.9.5.jar"
/>
- <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-2.5.jar" />
- <zipfileset
src="${gwt.tools.lib}/htmlunit/htmlunit-core-js-2.5.jar" />
- <zipfileset src="${gwt.tools.lib}/nekohtml/nekohtml-1.9.12.jar"
/>
+ <zipfileset src="${htmlunit.libs.temp}/htmlunit.jar" />
+ <zipfileset src="${htmlunit.libs.temp}/htmlunit-core-js.jar" />
+ <zipfileset src="${htmlunit.libs.temp}/nekohtml-1.9.13.jar" />
<zipfileset src="${gwt.tools.lib}/xalan/xalan-2.7.1.jar" />
<zipfileset
src="${gwt.tools.lib}/xerces/xerces-2_9_1/serializer.jar" />
<zipfileset
src="${gwt.tools.lib}/xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar" />
=======================================
---
/changes/jat/abstractui/dev/oophm/src/com/google/gwt/dev/shell/HostedModePluginObject.java
Fri Oct 2 16:13:44 2009
+++
/changes/jat/abstractui/dev/oophm/src/com/google/gwt/dev/shell/HostedModePluginObject.java
Thu Oct 8 11:27:39 2009
@@ -15,6 +15,7 @@
*/
package com.google.gwt.dev.shell;
+import com.gargoylesoftware.htmlunit.javascript.JavaScriptEngine;
import com.gargoylesoftware.htmlunit.javascript.host.Window;
import net.sourceforge.htmlunit.corejs.javascript.Context;
@@ -140,8 +141,18 @@
private Scriptable disconnectMethod;
private Scriptable initMethod;
private Window window;
+ private JavaScriptEngine jsEngine;
private BrowserChannelClient browserChannelClient;
+
+ /**
+ * Creates a HostedModePluginObject with the passed-in JavaScriptEngine.
+ *
+ * @param jsEngine The JavaScriptEngine.
+ */
+ public HostedModePluginObject(JavaScriptEngine jsEngine) {
+ this.jsEngine = jsEngine;
+ }
/**
* Initiate a hosted mode connection to the requested port and load the
@@ -163,10 +174,10 @@
// TODO: add whitelist and default-port support?
try {
- HtmlUnitSessionHandler htmlUnitSessionHandler = new
HtmlUnitSessionHandler(window);
- browserChannelClient = new BrowserChannelClient(
- addressParts, url, sessionKey, module, version,
- htmlUnitSessionHandler);
+ HtmlUnitSessionHandler htmlUnitSessionHandler = new
HtmlUnitSessionHandler(
+ window, jsEngine);
+ browserChannelClient = new BrowserChannelClient(addressParts, url,
+ sessionKey, module, version, htmlUnitSessionHandler);
htmlUnitSessionHandler.setSessionData(new SessionData(
htmlUnitSessionHandler, browserChannelClient));
return browserChannelClient.process();
=======================================
---
/changes/jat/abstractui/dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java
Mon Oct 5 15:54:05 2009
+++
/changes/jat/abstractui/dev/oophm/src/com/google/gwt/dev/shell/HtmlUnitSessionHandler.java
Thu Oct 8 11:27:39 2009
@@ -107,10 +107,10 @@
private final Window window;
- HtmlUnitSessionHandler(Window window) {
+ HtmlUnitSessionHandler(Window window, JavaScriptEngine jsEngine) {
this.window = window;
logger.setMaxDetail(TreeLogger.ERROR);
- jsEngine = this.window.getJavaScriptEngine();
+ this.jsEngine = jsEngine;
htmlPage = (HtmlPage) this.window.getWebWindow().getEnclosedPage();
logger.log(TreeLogger.INFO, "jsEngine = " + jsEngine + ", HtmlPage = "
+ htmlPage);
=======================================
--- /changes/jat/abstractui/eclipse/dev/.classpath Mon Sep 21 17:28:33 2009
+++ /changes/jat/abstractui/eclipse/dev/.classpath Thu Oct 8 11:27:39 2009
@@ -40,7 +40,7 @@
<classpathentry kind="var"
path="GWT_TOOLS/lib/tomcat/tomcat-jk2-2.1.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/tomcat/tomcat-util-5.1.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/sun/swingworker/swing-worker-1.1.jar"/>
- <classpathentry kind="var"
path="GWT_TOOLS/lib/htmlunit/htmlunit-core-js-2.5.jar"
sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-core-js-2.5-sources.jar"/>
- <classpathentry kind="var"
path="GWT_TOOLS/lib/htmlunit/htmlunit-2.5.jar"
sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-2.5-sources.jar"/>
+ <classpathentry kind="var"
path="GWT_TRUNK/tools/do-not-commit-to-trunk/htmlunit-core-js.jar"
sourcepath="/GWT_TRUNK/tools/do-not-commit-to-trunk/htmlunit-core-js-sources.jar"/>
+ <classpathentry kind="var"
path="GWT_TRUNK/tools/do-not-commit-to-trunk/htmlunit.jar"
sourcepath="/GWT_TRUNK/tools/do-not-commit-to-trunk/htmlunit-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
=======================================
--- /changes/jat/abstractui/eclipse/user/.classpath Tue Sep 29 11:01:25 2009
+++ /changes/jat/abstractui/eclipse/user/.classpath Thu Oct 8 11:27:39 2009
@@ -16,7 +16,7 @@
<classpathentry kind="var"
path="GWT_TOOLS/lib/tomcat/commons-logging-1.0.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/apache/commons/commons-io-1.4.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/cssparser/cssparser-0.9.5.jar"/>
- <classpathentry kind="var"
path="GWT_TOOLS/lib/nekohtml/nekohtml-1.9.12.jar"/>
+ <classpathentry kind="var"
path="GWT_TRUNK/tools/do-not-commit-to-trunk/nekohtml-1.9.13.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/xalan/xalan-2.7.1.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/xerces/xerces-2_9_1/serializer.jar"/>
@@ -25,7 +25,7 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/w3c/sac/sac-1.3.jar"/>
<classpathentry kind="var"
path="GWT_TOOLS/lib/w3c/flute/flute-1.3.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/>
- <classpathentry kind="var"
path="GWT_TOOLS/lib/htmlunit/htmlunit-2.5.jar"
sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-2.5-sources.jar"/>
- <classpathentry kind="var"
path="GWT_TOOLS/lib/htmlunit/htmlunit-core-js-2.5.jar"
sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-core-js-2.5-sources.jar"/>
+ <classpathentry kind="var"
path="GWT_TRUNK/tools/do-not-commit-to-trunk/htmlunit-core-js.jar"
sourcepath="/GWT_TRUNK/tools/do-not-commit-to-trunk/htmlunit-core-js-sources.jar"/>
+ <classpathentry kind="var"
path="GWT_TRUNK/tools/do-not-commit-to-trunk/htmlunit.jar"
sourcepath="/GWT_TRUNK/tools/do-not-commit-to-trunk/htmlunit-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
=======================================
--- /changes/jat/abstractui/samples/common.ant.xml Sun Sep 20 12:33:31 2009
+++ /changes/jat/abstractui/samples/common.ant.xml Thu Oct 8 11:27:39 2009
@@ -79,17 +79,17 @@
<outofdate>
<sourcefiles />
<targetfiles>
- <pathelement
location="${samples.scripts}/@{platform}/${sample.upper}/build.xml" />
+ <pathelement
location="${samples.scripts}/${sample.upper}/build.xml" />
</targetfiles>
<sequential>
- <mkdir dir="${samples.scripts}/@{platform}/${sample.upper}" />
+ <mkdir dir="${samples.scripts}/${sample.upper}" />
<java classname="com.google.gwt.user.tools.WebAppCreator"
classpath="${gwt.user.jar}:${gwt.dev.jar}" failonerror="true">
<!-- Relative path is important! Paths will be relative in
final distro -->
- <sysproperty key="gwt.devjar"
value="../../gwt-d...@{platform}.jar" />
+ <sysproperty key="gwt.devjar" value="../../gwt-dev.jar" />
<arg value="-XnoEclipse" />
<arg value="-overwrite" />
<arg value="-out" />
- <arg file="${samples.scripts}/@{platform}/${sample.upper}" />
+ <arg file="${samples.scripts}/${sample.upper}" />
<arg
value="com.google.gwt.sample.${sample.lower}.${sample.upper}" />
</java>
</sequential>
=======================================
---
/changes/jat/abstractui/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
Sun Sep 20 12:33:31 2009
+++
/changes/jat/abstractui/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
Thu Oct 8 11:27:39 2009
@@ -122,7 +122,7 @@
webClient.setJavaScriptEngine(hostedEngine);
}
}
-}
+ }
/**
* JavaScriptEngine subclass that provides a hook of initializing the
@@ -143,7 +143,7 @@
super.initialize(webWindow);
Window window = (Window) webWindow.getScriptObject();
window.defineProperty("__gwt_HostedModePlugin",
- new HostedModePluginObject(), ScriptableObject.READONLY);
+ new HostedModePluginObject(this), ScriptableObject.READONLY);
}
}
@@ -184,7 +184,7 @@
public RunStyleHtmlUnit(JUnitShell shell) {
super(shell);
}
-
+
@Override
public boolean initialize(String args) {
if (args == null || args.length() == 0) {
@@ -203,7 +203,7 @@
browsers = Collections.unmodifiableSet(browserSet);
return true;
}
-
+
@Override
public void launchModule(String moduleName) {
for (BrowserVersion browser : browsers) {
=======================================
---
/changes/jat/abstractui/user/src/com/google/gwt/user/tools/README.txtsrc
Fri Mar 20 11:33:42 2009
+++
/changes/jat/abstractui/user/src/com/google/gwt/user/tools/README.txtsrc
Thu Oct 8 11:27:39 2009
@@ -8,6 +8,9 @@
We've tested against Eclipse 3.3 and 3.4. Later versions will likely also
work, earlier versions may not.
+If the directory containing this file does not have a .classpath
or .project
+file, generate them by running 'ant eclipse.generate'
+
In Eclipse, go to the File menu and choose:
File -> Import... -> Existing Projects into Workspace
=======================================
---
/changes/jat/abstractui/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
Mon Aug 24 15:15:54 2009
+++
/changes/jat/abstractui/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
Thu Oct 8 11:27:39 2009
@@ -55,21 +55,6 @@
<!-- Additional arguments like -style PRETTY or -logLevel DEBUG -->
<arg value="@moduleName"/>
</java>
- </target>
-
- <target name="oophm" depends="javac" description="Run OOPHM hosted mode">
- <java failonerror="true" fork="true" classname="@shellClass">
- <classpath>
- <pathelement location="${gwt.sdk}/gwt-dev-oophm.jar"/>
- <pathelement location="src"/>
- <path refid="project.class.path"/>
- </classpath>
- <jvmarg value="-Xmx256M"/>
- <arg value="-startupUrl"/>
- <arg value="@startupUrl"/>
- <!-- Additional arguments like -style PRETTY or -logLevel DEBUG -->
- <arg value="@moduleName"/>
- </java>
</target>@antEclipseRule
<target name="build" depends="gwtc" description="Build this project" />
=======================================
---
/branches/farewellSwt/tools/do-not-commit-to-trunk/htmlunit-core-js-sources.jar
Tue Oct 6 19:22:44 2009
+++
/changes/jat/abstractui/tools/do-not-commit-to-trunk/htmlunit-core-js-sources.jar
Thu Oct 8 11:27:39 2009
Binary file, no diff available.
=======================================
--- /branches/farewellSwt/tools/do-not-commit-to-trunk/htmlunit-core-js.jar
Tue Oct 6 19:22:44 2009
+++
/changes/jat/abstractui/tools/do-not-commit-to-trunk/htmlunit-core-js.jar
Thu Oct 8 11:27:39 2009
Binary file, no diff available.
=======================================
--- /branches/farewellSwt/tools/do-not-commit-to-trunk/htmlunit-sources.jar
Tue Oct 6 19:22:44 2009
+++
/changes/jat/abstractui/tools/do-not-commit-to-trunk/htmlunit-sources.jar
Thu Oct 8 11:27:39 2009
Binary file, no diff available.
=======================================
--- /branches/farewellSwt/tools/do-not-commit-to-trunk/htmlunit.jar Tue
Oct 6 19:22:44 2009
+++ /changes/jat/abstractui/tools/do-not-commit-to-trunk/htmlunit.jar Thu
Oct 8 11:27:39 2009
Binary file, no diff available.
=======================================
--- /branches/farewellSwt/tools/do-not-commit-to-trunk/nekohtml-1.9.13.jar
Tue Oct 6 19:22:44 2009
+++
/changes/jat/abstractui/tools/do-not-commit-to-trunk/nekohtml-1.9.13.jar
Thu Oct 8 11:27:39 2009
Binary file, no diff available.
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
