Revision: 5923 Author: [email protected] Date: Fri Aug 7 16:05:37 2009 Log: Merging in HTMLUnit changes from trunk, c5916, c5917, c5919, c5922. These are all the trunk changes in this range, so a single merge command sufficed:
svn merge -r5915:5922 https://google-web-toolkit.googlecode.com/svn/trunk . Reviewed by amitmanjhi http://code.google.com/p/google-web-toolkit/source/detail?r=5923 Modified: /branches/snapshot-2009.08.04-ihm-r5888/branch-info.txt /branches/snapshot-2009.08.04-ihm-r5888/dev/core/build.xml /branches/snapshot-2009.08.04-ihm-r5888/dev/core/src/com/google/gwt/dev/shell/tomcat/EmbeddedTomcatServer.java /branches/snapshot-2009.08.04-ihm-r5888/eclipse/user/.classpath /branches/snapshot-2009.08.04-ihm-r5888/user/build.xml /branches/snapshot-2009.08.04-ihm-r5888/user/test/com/google/gwt/uibinder/client/UiBinderTest.java ======================================= --- /branches/snapshot-2009.08.04-ihm-r5888/branch-info.txt Fri Aug 7 15:17:40 2009 +++ /branches/snapshot-2009.08.04-ihm-r5888/branch-info.txt Fri Aug 7 16:05:37 2009 @@ -10,3 +10,7 @@ /trunk r5910:5912 was merged into this branch OOPHM wire protocol change (http://gwt-code-reviews.appspot.com/51835) svn merge -r5910:5912 https://google-web-toolkit.googlecode.com/svn/trunk . + +/trunk r5915:5922 was merged into this branch + HTLMUnit changes + svn merge -r5915:5922 https://google-web-toolkit.googlecode.com/svn/trunk . ======================================= --- /branches/snapshot-2009.08.04-ihm-r5888/dev/core/build.xml Wed Aug 5 12:55:36 2009 +++ /branches/snapshot-2009.08.04-ihm-r5888/dev/core/build.xml Fri Aug 7 16:05:37 2009 @@ -54,6 +54,21 @@ <include name="tomcat/tomcat-http11-1.0.jar" /> <include name="tomcat/tomcat-jk2-2.1.jar" /> <include name="tomcat/tomcat-util-5.1.jar" /> + <!-- htmlunit dependencies not already included: BEGIN --> + <include name="apache/commons/commons-codec-1.3.jar" /> + <include name="apache/commons/commons-httpclient-3.1.jar" /> + <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.jar" /> + <include name="xerces/xerces-2_9_1/xml-apis.jar" /> + <include name="w3c/sac/sac-1.3.jar" /> + <!-- htmlunit dependencies not already included: END --> </fileset> <fileset file="build.xml"/> </sourcefiles> @@ -93,6 +108,21 @@ <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-http11-1.0.jar" /> <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-jk2-2.1.jar" /> <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-util-5.1.jar" /> + <!-- htmlunit dependencies not already included: BEGIN --> + <zipfileset src="${gwt.tools.lib}/apache/commons/commons-codec-1.3.jar" /> + <zipfileset src="${gwt.tools.lib}/apache/commons/commons-httpclient-3.1.jar" /> + <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="${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.jar" /> + <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/xml-apis.jar" /> + <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" /> + <!-- htmlunit dependencies not already included: END --> </gwt.jar> </sequential> </outofdate> ======================================= --- /branches/snapshot-2009.08.04-ihm-r5888/dev/core/src/com/google/gwt/dev/shell/tomcat/EmbeddedTomcatServer.java Fri Mar 27 08:09:11 2009 +++ /branches/snapshot-2009.08.04-ihm-r5888/dev/core/src/com/google/gwt/dev/shell/tomcat/EmbeddedTomcatServer.java Fri Aug 7 16:05:37 2009 @@ -177,6 +177,15 @@ // File topWorkDir = new File(System.getProperty("user.dir")); + /* + * set property explicitly so that addition of the xercesImpl lib, when java + * 1.5 is used, does not affect tomcat. + */ + if ("1.5".equals(System.getProperty("java.specification.version"))) { + System.setProperty("javax.xml.parsers.DocumentBuilderFactory", + "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"); + } + // Tell Tomcat its base directory so that it won't complain. // String catBase = System.getProperty("catalina.base"); ======================================= --- /branches/snapshot-2009.08.04-ihm-r5888/eclipse/user/.classpath Thu Jul 30 13:47:31 2009 +++ /branches/snapshot-2009.08.04-ihm-r5888/eclipse/user/.classpath Fri Aug 7 16:05:37 2009 @@ -19,9 +19,9 @@ <classpathentry kind="var" path="GWT_TOOLS/lib/nekohtml/nekohtml-1.9.12.jar" /> <classpathentry kind="var" path="GWT_TOOLS/lib/selenium/selenium-java-client-driver.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/xalan/xalan-2.7.1.jar" /> - <classpathentry kind="var" path="GWT_TOOLS/lib/xerces/serializer-2.7.1.jar" /> - <classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xercesImpl-2.8.1.jar" /> - <classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xml-apis-1.3.04.jar" /> + <classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xerces-2_9_1/serializer.jar" /> + <classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xerces-2_9_1/xercesImpl.jar" /> + <classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xerces-2_9_1/xml-apis.jar" /> <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-windows"/> ======================================= --- /branches/snapshot-2009.08.04-ihm-r5888/user/build.xml Wed Aug 5 15:18:29 2009 +++ /branches/snapshot-2009.08.04-ihm-r5888/user/build.xml Fri Aug 7 16:05:37 2009 @@ -36,26 +36,6 @@ <pathelement location="test_i18n_${gwt.i18n.test.InnerClassChar}" /> </path> - <!-- - Classpaths added for htmlunit libs - --> - <path id="htmlunit.libs"> - <pathelement location="${gwt.tools.lib}/apache/commons/commons-codec-1.3.jar" /> - <pathelement location="${gwt.tools.lib}/tomcat/commons-collections-3.1.jar" /> - <pathelement location="${gwt.tools.lib}/apache/commons/commons-httpclient-3.1.jar" /> - <pathelement location="${gwt.tools.lib}/apache/commons/commons-io-1.4.jar" /> - <pathelement location="${gwt.tools.lib}/apache/commons/commons-lang-2.4.jar" /> - <pathelement location="${gwt.tools.lib}/tomcat/commons-logging-1.0.jar" /> - <pathelement location="${gwt.tools.lib}/cssparser/cssparser-0.9.5.jar" /> - <pathelement location="${gwt.tools.lib}/htmlunit/htmlunit-2.5.jar" /> - <pathelement location="${gwt.tools.lib}/htmlunit/htmlunit-core-js-2.5.jar" /> - <pathelement location="${gwt.tools.lib}/nekohtml/nekohtml-1.9.12.jar" /> - <pathelement location="${gwt.tools.lib}/xalan/xalan-2.7.1.jar" /> - <pathelement location="${gwt.tools.lib}/xerces/serializer-2.7.1.jar" /> - <pathelement location="${gwt.tools.lib}/xerces/xercesImpl-2.8.1.jar" /> - <pathelement location="${gwt.tools.lib}/xerces/xml-apis-1.3.04.jar" /> - <pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" /> - </path> <!-- Platform shouldn't matter here, just picking one --> <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar" /> @@ -70,7 +50,6 @@ <pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" /> <pathelement location="${gwt.tools.lib}/w3c/flute/flute-1.3.jar" /> <pathelement location="${gwt.dev.jar}" /> - <path refid="htmlunit.libs" /> </classpath> </gwt.javac> @@ -97,7 +76,6 @@ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" /> <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" /> <pathelement location="${gwt.dev.jar}" /> - <path refid="htmlunit.libs" /> </classpath> </gwt.javac> </target> @@ -199,7 +177,6 @@ <gwt.junit test.args="${test.args} -htmlunit FF3" test.out="${junit.out}/${build.host.platform}-htmlunit-web-mode" test.cases="default.web.tests" > <extraclasspaths> <path refid="test.extraclasspath" /> - <path refid="htmlunit.libs" /> </extraclasspaths> </gwt.junit> </target> @@ -241,8 +218,7 @@ <antcall target="test.noserver"/> <antcall target="test.web"/> <antcall target="test.web.disableClassMetadata"/> - <!-- TODO(amitmanjhi): uncomment it after fixing the xerces issue --> - <!-- <antcall target="test.web.htmlunit"/> --> + <antcall target="test.web.htmlunit"/> <antcall target="test.web.draft"/> </parallel> </limit> ======================================= --- /branches/snapshot-2009.08.04-ihm-r5888/user/test/com/google/gwt/uibinder/client/UiBinderTest.java Thu Aug 6 15:39:10 2009 +++ /branches/snapshot-2009.08.04-ihm-r5888/user/test/com/google/gwt/uibinder/client/UiBinderTest.java Fri Aug 7 16:05:37 2009 @@ -21,6 +21,8 @@ import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.ParagraphElement; import com.google.gwt.dom.client.SpanElement; +import com.google.gwt.junit.DoNotRunWith; +import com.google.gwt.junit.Platform; import com.google.gwt.junit.client.GWTTestCase; import com.google.gwt.uibinder.sample.client.ClickyLink; import com.google.gwt.uibinder.sample.client.DomBasedUi; @@ -244,6 +246,7 @@ assertTrue(((HTML) north).getHTML().contains("Title area")); } + @DoNotRunWith(Platform.Htmlunit) public void testRadioButton() { RadioButton able = widgetUi.getMyRadioAble(); RadioButton baker = widgetUi.getMyRadioBaker(); --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
