Reviewers: cromwellian, skybrian,
Message:
Another dependency packaging issue.
Description:
Issue 7428: include the StreamHtmlParser within gwt-servlet.jar
Also moves from gwt-dev.jar to gwt-user.jar, where it should have always
been.
Please review this at https://gwt-code-reviews.appspot.com/1741803/
Affected files:
M dev/build.xml
M servlet/build.xml
M user/build.xml
Index: dev/build.xml
diff --git a/dev/build.xml b/dev/build.xml
index
7d99466dffebae2343eb47390d90f8c81ccd239e..c5a53905793849a93576fcf6502f0ae652d85b15
100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -101,7 +101,6 @@
<include name="htmlunit/htmlunit-2.9/htmlunit-v2.9.jar" />
<include name="htmlunit/htmlunit-2.9/htmlunit-core-js-v2.9.jar"
/>
<include name="nekohtml/nekohtml-1.9.15.jar" />
- <include
name="streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"
/>
<include name="cup/java-cup-11a.jar" />
<include name="xalan/xalan-2.7.1-nocup.jar" />
<include name="xerces/xerces-2_9_1/serializer.jar" />
@@ -131,7 +130,6 @@
<zipfileset src="${gwt.tools.lib}/jetty/jetty-6.1.11.jar" />
<zipfileset src="${gwt.tools.lib}/icu4j/4.4.2/icu4j.jar" />
<zipfileset
src="${gwt.tools.lib}/protobuf/protobuf-2.2.0/protobuf-java-rebased-2.2.0.jar"
/>
- <zipfileset
src="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"
/>
<zipfileset src="${gwt.tools.lib}/tomcat/ant-launcher-1.6.5.jar"
/>
<zipfileset src="${gwt.tools.lib}/tomcat/catalina-1.0.jar" />
<zipfileset
src="${gwt.tools.lib}/tomcat/catalina-optional-1.0.jar" />
Index: servlet/build.xml
diff --git a/servlet/build.xml b/servlet/build.xml
index
e35993e3b6816296ae42e7ae5e87f415568e0408..690c1e17723493339fdfa48015fb70d7d8cfaa42
100755
--- a/servlet/build.xml
+++ b/servlet/build.xml
@@ -54,6 +54,8 @@
<zipfileset src="${gwt.tools.redist}/json/r2_20080312/json-1.5.jar"
/>
<zipfileset
src="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
<zipfileset src="${gwt.tools.lib}/jscomp/sourcemap-rebased.jar" />
+ <zipfileset
src="${gwt.tools.lib}/guava/guava-10.0.1/guava-10.0.1-rebased.jar" />
+ <zipfileset
src="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"
/>
</gwt.jar>
</target>
</project>
Index: user/build.xml
diff --git a/user/build.xml b/user/build.xml
index
fa0903b8fbd329e0ce4145a91f9f19c2d2373c77..21f9801d8970bad1591a8473a8b461b423c069a0
100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -74,6 +74,7 @@
<pathelement
location="${gwt.tools.lib}/slf4j/slf4j-api/slf4j-api-1.6.1.jar" />
<pathelement
location="${gwt.tools.lib}/slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar" />
<pathelement
location="${gwt.tools}/redist/json/r2_20080312/json-1.5.jar" />
+ <pathelement
location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"
/>
<!-- TCK jars -->
<pathelement
location="${gwt.tools.lib}/hibernate/validator/tck/jsr303-tck-1.0.3.GA-sources.jar"
/>
<pathelement
location="${gwt.tools.lib}/hibernate/validator/tck/jsr303-tck-1.0.3.GA.jar"
/>
@@ -108,6 +109,7 @@
<pathelement
location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final-sources.jar"
/>
<!-- Bootstrap support needed for obfuscated type tokens for JRE
runtime -->
<pathelement
location="${gwt.tools.lib}/requestfactory/requestfactory-apt.jar" />
+ <pathelement
location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"
/>
<pathelement location="${gwt.dev.jar}" />
</classpath>
</gwt.javac>
@@ -215,6 +217,7 @@
<zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.5.jar"
excludes="**/*.java"/>
<zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
<zipfileset src="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
+ <zipfileset
src="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"
/>
</gwt.jar>
</target>
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
