Revision: 6364 Author: [email protected] Date: Tue Oct 13 13:52:35 2009 Log: 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 http://code.google.com/p/google-web-toolkit/source/detail?r=6364 Deleted: /branches/farewellSwt/tools/do-not-commit-to-trunk Modified: /branches/farewellSwt/dev/build.xml /branches/farewellSwt/eclipse/dev/.classpath /branches/farewellSwt/eclipse/user/.classpath ======================================= --- /branches/farewellSwt/dev/build.xml Tue Oct 6 19:22:44 2009 +++ /branches/farewellSwt/dev/build.xml Tue Oct 13 13:52:35 2009 @@ -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" /> ======================================= --- /branches/farewellSwt/eclipse/dev/.classpath Tue Oct 6 19:22:44 2009 +++ /branches/farewellSwt/eclipse/dev/.classpath Tue Oct 13 13:52:35 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_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> ======================================= --- /branches/farewellSwt/eclipse/user/.classpath Tue Oct 6 19:22:44 2009 +++ /branches/farewellSwt/eclipse/user/.classpath Tue Oct 13 13:52:35 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_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> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
