Reverted c6310 (which created a temporary directory for updating HtmlUnit,
possibly multiple times, without polluting TOOLS)
svn merge -r6310:6309 .
and (a) updated all references to htmlunit-2.5 to htmlunit-r5070, (b) updated
the nekohtml depedency.
Patch by: amitmanjhi
git-svn-id: https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt@6364 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/build.xml b/dev/build.xml
index dfb8ab1..1fb3ecf 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -7,7 +7,6 @@
<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" />
@@ -75,6 +74,9 @@
<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-r5070.jar" />
+ <include name="htmlunit/htmlunit-core-js-r5070.jar" />
+ <include name="nekohtml/nekohtml-1.9.13.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" />
@@ -84,11 +86,6 @@
<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}"/>
@@ -132,9 +129,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="${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}/htmlunit/htmlunit-r5070.jar" />
+ <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-core-js-r5070.jar" />
+ <zipfileset src="${gwt.tools.lib}/nekohtml/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" />
diff --git a/eclipse/dev/.classpath b/eclipse/dev/.classpath
index bfe75e3..5e1f3db 100644
--- a/eclipse/dev/.classpath
+++ b/eclipse/dev/.classpath
@@ -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_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="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-core-js-r5070.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-core-js-r5070-sources.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5070.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5070-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath
index 8261a1c..be87999 100644
--- a/eclipse/user/.classpath
+++ b/eclipse/user/.classpath
@@ -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_TRUNK/tools/do-not-commit-to-trunk/nekohtml-1.9.13.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/nekohtml/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_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="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-r5070.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-r5070-sources.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-core-js-r5070.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-core-js-r5070-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tools/do-not-commit-to-trunk/README b/tools/do-not-commit-to-trunk/README
deleted file mode 100644
index 8a9e8af..0000000
--- a/tools/do-not-commit-to-trunk/README
+++ /dev/null
@@ -1,34 +0,0 @@
-The purpose of this temporary directory is to hold the HtmlUnit jars while
-we upgrade to HtmlUnit-2.7 and beyond, and revisit all the Gwt tests that are
-currently ignored on HtmlUnit.
-
-The htmlunit jar names are to be removed of all identifying information because
-we don't want multiple copies.
-
-For updating HtmlUnit, here is the algorithm to use (vetted by HtmlUnit
-committers):
-
-* Check the main Cl page (http://build.canoo.com/htmlunit/). Find the last
-build that was successful. Find the svn revision (click on the "XML Log File"
-tab, and scroll down to the last "revision" XML tag. search for <revision>).
-Download the htmlunit.jar, htmlunit-sources.jar and htmlunit-core-js.jar (and
-other dependencies if they have changed) from the artifacts page. Note that
-SNAPSHOT artifacts only get generated if all unit tests pass. So the artifacts
-correspond to the last successful build.
-
-* Download the htmlunit-core-js-sources.jar from
-http://htmlunit.sourceforge.net/m2-repo-snapshots/net/sourceforge/htmlunit/htmlunit-core-js/2.7-SNAPSHOT/
-(verify that the core-js.jar are the same as in the previous step).
-
-
-Files in this dir
- htmlunit.jar
- htmlunit-sources.jar
- htmlunit-core-js.jar
- htmlunit-core-js-sources.jar
-
-HtmlUnit's dependencies (not already in GWT_TOOLS/lib):
- nekohtml-1.9.13.jar
-
-svn revision: 5070
-
diff --git a/tools/do-not-commit-to-trunk/htmlunit-core-js-sources.jar b/tools/do-not-commit-to-trunk/htmlunit-core-js-sources.jar
deleted file mode 100644
index ff0f301..0000000
--- a/tools/do-not-commit-to-trunk/htmlunit-core-js-sources.jar
+++ /dev/null
Binary files differ
diff --git a/tools/do-not-commit-to-trunk/htmlunit-core-js.jar b/tools/do-not-commit-to-trunk/htmlunit-core-js.jar
deleted file mode 100644
index 4e7af26..0000000
--- a/tools/do-not-commit-to-trunk/htmlunit-core-js.jar
+++ /dev/null
Binary files differ
diff --git a/tools/do-not-commit-to-trunk/htmlunit-sources.jar b/tools/do-not-commit-to-trunk/htmlunit-sources.jar
deleted file mode 100644
index 49b1c78..0000000
--- a/tools/do-not-commit-to-trunk/htmlunit-sources.jar
+++ /dev/null
Binary files differ
diff --git a/tools/do-not-commit-to-trunk/htmlunit.jar b/tools/do-not-commit-to-trunk/htmlunit.jar
deleted file mode 100644
index 3d3d6f7..0000000
--- a/tools/do-not-commit-to-trunk/htmlunit.jar
+++ /dev/null
Binary files differ
diff --git a/tools/do-not-commit-to-trunk/nekohtml-1.9.13.jar b/tools/do-not-commit-to-trunk/nekohtml-1.9.13.jar
deleted file mode 100644
index 26d2b80..0000000
--- a/tools/do-not-commit-to-trunk/nekohtml-1.9.13.jar
+++ /dev/null
Binary files differ
