Revision: 6310 Author: [email protected] Date: Tue Oct 6 19:22:44 2009 Log: Patch to enable upgrade to latest HtmlUnit snapshots. Created a temporary dir where various HtmlUnit snapshots could be tried without polluting GWT_TOOLS.
IMPORTANT: 1. To test bug-fixes for Gwt 2.0 MS1, this commit needs to be reverted. 2. The do-not-commit-to-trunk dir should not be merged into trunk. Patch by: amitmanjhi http://code.google.com/p/google-web-toolkit/source/detail?r=6310 Added: /branches/farewellSwt/tools/do-not-commit-to-trunk /branches/farewellSwt/tools/do-not-commit-to-trunk/README /branches/farewellSwt/tools/do-not-commit-to-trunk/htmlunit-core-js-sources.jar /branches/farewellSwt/tools/do-not-commit-to-trunk/htmlunit-core-js.jar /branches/farewellSwt/tools/do-not-commit-to-trunk/htmlunit-sources.jar /branches/farewellSwt/tools/do-not-commit-to-trunk/htmlunit.jar /branches/farewellSwt/tools/do-not-commit-to-trunk/nekohtml-1.9.13.jar Modified: /branches/farewellSwt/dev/build.xml /branches/farewellSwt/eclipse/dev/.classpath /branches/farewellSwt/eclipse/user/.classpath ======================================= --- /dev/null +++ /branches/farewellSwt/tools/do-not-commit-to-trunk/README Tue Oct 6 19:22:44 2009 @@ -0,0 +1,34 @@ +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: 5053 + ======================================= --- /dev/null +++ /branches/farewellSwt/tools/do-not-commit-to-trunk/htmlunit-core-js-sources.jar Tue Oct 6 19:22:44 2009 Binary file, no diff available. ======================================= --- /dev/null +++ /branches/farewellSwt/tools/do-not-commit-to-trunk/htmlunit-core-js.jar Tue Oct 6 19:22:44 2009 Binary file, no diff available. ======================================= --- /dev/null +++ /branches/farewellSwt/tools/do-not-commit-to-trunk/htmlunit-sources.jar Tue Oct 6 19:22:44 2009 Binary file, no diff available. ======================================= --- /dev/null +++ /branches/farewellSwt/tools/do-not-commit-to-trunk/htmlunit.jar Tue Oct 6 19:22:44 2009 Binary file, no diff available. ======================================= --- /dev/null +++ /branches/farewellSwt/tools/do-not-commit-to-trunk/nekohtml-1.9.13.jar Tue Oct 6 19:22:44 2009 Binary file, no diff available. ======================================= --- /branches/farewellSwt/dev/build.xml Wed Sep 30 21:43:14 2009 +++ /branches/farewellSwt/dev/build.xml Tue Oct 6 19:22:44 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" /> ======================================= --- /branches/farewellSwt/eclipse/dev/.classpath Mon Sep 21 17:28:33 2009 +++ /branches/farewellSwt/eclipse/dev/.classpath Tue Oct 6 19:22:44 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> ======================================= --- /branches/farewellSwt/eclipse/user/.classpath Tue Sep 29 11:01:25 2009 +++ /branches/farewellSwt/eclipse/user/.classpath Tue Oct 6 19:22:44 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> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
