Reverting changes 5889 through 5892 in tools and trunk,
due to build breakage
svn merge -r5892:5888 .
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@5898 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/build.xml b/dev/core/build.xml
index 658a48d..5d3943e 100755
--- a/dev/core/build.xml
+++ b/dev/core/build.xml
@@ -54,21 +54,6 @@
<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>
@@ -108,21 +93,6 @@
<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>
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath
index 4bb3d4f..ac1ea2e 100644
--- a/eclipse/user/.classpath
+++ b/eclipse/user/.classpath
@@ -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/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/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/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"/>
diff --git a/user/build.xml b/user/build.xml
index 47a0c20..74ddaf2 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -36,6 +36,26 @@
<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" />
@@ -50,6 +70,7 @@
<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>
@@ -76,6 +97,7 @@
<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>
@@ -174,10 +196,10 @@
<target name="test.web.htmlunit" depends="compile, compile.tests" description="Run htmlunit web-mode tests for this project.">
<!-- TODO: add more browsers later -->
- <fileset id="test.web.htmlunit.tests" dir="${javac.junit.out}" includes="${gwt.junit.testcase.web.includes}" excludes="${gwt.junit.testcase.web.excludes}" />
- <gwt.junit test.args="${test.args} -htmlunit FF3" test.out="${junit.out}/${build.host.platform}-htmlunit-web-mode" test.cases="test.web.htmlunit.tests" >
+ <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>
@@ -219,7 +241,8 @@
<antcall target="test.noserver"/>
<antcall target="test.web"/>
<antcall target="test.web.disableClassMetadata"/>
- <antcall target="test.web.htmlunit"/>
+ <!-- TODO(amitmanjhi): uncomment it after fixing the xerces issue -->
+ <!-- <antcall target="test.web.htmlunit"/> -->
<antcall target="test.web.draft"/>
</parallel>
</limit>
