You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2010/01/09 22:09:03 UTC
svn commit: r897546 - in /jakarta/jmeter/trunk: ./ lib/
src/components/org/apache/jmeter/assertions/ src/core/org/apache/jmeter/util/
src/protocol/http/org/apache/jmeter/protocol/http/parser/ xdocs/
Author: sebb
Date: Sat Jan 9 21:09:02 2010
New Revision: 897546
URL: http://svn.apache.org/viewvc?rev=897546&view=rev
Log:
Update JTidy to r938, which is compatible with Java 1.5
Modified:
jakarta/jmeter/trunk/build.properties
jakarta/jmeter/trunk/eclipse.classpath
jakarta/jmeter/trunk/lib/ (props changed)
jakarta/jmeter/trunk/lib/aareadme.txt
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified: jakarta/jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.properties?rev=897546&r1=897545&r2=897546&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.properties (original)
+++ jakarta/jmeter/trunk/build.properties Sat Jan 9 21:09:02 2010
@@ -139,15 +139,9 @@
soap.loc = http://repo1.maven.org/maven2/soap/soap/2.3.1
soap.md5 = AA1845E01FEE94FE4A63BBCAA55AD486
-tidy.jar = Tidy.jar
-tidy.md5 = 7256D79D8BA656A791926378E4ECF608
-
-# Unfortunately, the r820 release requires Java 1.6 (though it builds fine with Java 1.4)
-# Cannot find a download for Java 1.5+ compatible version of tidy
-#tidy.jar = jtidy-r820.jar
-# Note: the trailing ? is a hack to ignore the appended jar name
-#tidy.loc = http://sourceforge.net/projects/jtidy/files/JTidy/r820/jtidy-r820.jar/download?
-#tidy.md5 = 6BBE8D9E4A75A201754FC831CFCB177A
+tidy.jar = jtidy-r938.jar
+tidy.loc = http://downloads.sourceforge.net/project/jtidy/JTidy/r938
+tidy.md5 = 0270AA6F887C1E3EF48F102439708DFC
# XStream can be found at: http://xstream.codehaus.org/
xstream.jar = xstream-1.3.1.jar
Modified: jakarta/jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/eclipse.classpath?rev=897546&r1=897545&r2=897546&view=diff
==============================================================================
--- jakarta/jmeter/trunk/eclipse.classpath (original)
+++ jakarta/jmeter/trunk/eclipse.classpath Sat Jan 9 21:09:02 2010
@@ -42,12 +42,12 @@
<classpathentry kind="lib" path="lib/jCharts-0.7.5.jar"/>
<classpathentry kind="lib" path="lib/jdom-1.1.jar"/>
<classpathentry kind="lib" path="lib/js-1.6R5.jar"/>
+ <classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
<classpathentry kind="lib" path="lib/junit-4.7.jar"/>
<classpathentry kind="lib" path="lib/logkit-2.0.jar"/>
<classpathentry kind="lib" path="lib/oro-2.0.8.jar"/>
<classpathentry kind="lib" path="lib/serializer-2.7.1.jar"/>
<classpathentry kind="lib" path="lib/soap-2.3.1.jar"/>
- <classpathentry kind="lib" path="lib/Tidy.jar"/>
<classpathentry kind="lib" path="lib/xalan-2.7.1.jar"/>
<classpathentry kind="lib" path="lib/xercesImpl-2.9.1.jar"/>
<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>
Propchange: jakarta/jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 9 21:09:02 2010
@@ -38,3 +38,4 @@
xmlgraphics-commons-1.3.1.jar
xpp3_min-1.1.4c.jar
bsf-api-3.0.jar
+jtidy-r*.jar
Modified: jakarta/jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/lib/aareadme.txt?rev=897546&r1=897545&r2=897546&view=diff
==============================================================================
--- jakarta/jmeter/trunk/lib/aareadme.txt (original)
+++ jakarta/jmeter/trunk/lib/aareadme.txt Sat Jan 9 21:09:02 2010
@@ -121,7 +121,7 @@
----------
- WebServiceSampler ONLY
-Tidy
+jTidy-r938
----
- http: various modules for parsing html
- org.xml.sax - various
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java?rev=897546&r1=897545&r2=897546&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java Sat Jan 9 21:09:02 2010
@@ -98,7 +98,8 @@
log.debug("xml mode: " + isXML());
}
tidy = new Tidy();
- tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
+ tidy.setInputEncoding("UTF8");
+ tidy.setOutputEncoding("UTF8");
tidy.setQuiet(false);
tidy.setShowWarnings(true);
tidy.setOnlyErrors(isErrorsOnly());
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java?rev=897546&r1=897545&r2=897546&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java Sat Jan 9 21:09:02 2010
@@ -171,7 +171,8 @@
*/
public static Tidy makeTidyParser(boolean quiet, boolean showWarnings, boolean isXml, StringWriter stringWriter) {
Tidy tidy = new Tidy();
- tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
+ tidy.setInputEncoding("UTF8");
+ tidy.setOutputEncoding("UTF8");
tidy.setQuiet(quiet);
tidy.setShowWarnings(showWarnings);
tidy.setMakeClean(true);
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java?rev=897546&r1=897545&r2=897546&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java Sat Jan 9 21:09:02 2010
@@ -208,7 +208,8 @@
public static Tidy getParser() {
log.debug("Start : getParser1");
Tidy tidy = new Tidy();
- tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
+ tidy.setInputEncoding("UTF8");
+ tidy.setOutputEncoding("UTF8");
tidy.setQuiet(true);
tidy.setShowWarnings(false);
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java?rev=897546&r1=897545&r2=897546&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java Sat Jan 9 21:09:02 2010
@@ -196,7 +196,8 @@
private static Tidy getTidyParser() {
log.debug("Start : getParser");
Tidy tidy = new Tidy();
- tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
+ tidy.setInputEncoding("UTF8");
+ tidy.setOutputEncoding("UTF8");
tidy.setQuiet(true);
tidy.setShowWarnings(false);
if (log.isDebugEnabled()) {
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=897546&r1=897545&r2=897546&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Sat Jan 9 21:09:02 2010
@@ -202,6 +202,7 @@
<li>BeanShell - 2.0b4 => 2.0b5</li>
<li>Commons Codec - 1.3 => 1.4</li>
<li>Commons-Collections - 3.2 => 3.2.1</li>
+<li>JTidy => r938</li>
<li>JUnit - 3.8.2 => 4.7</li>
<li>Logkit - 1.2 => 2.0</li>
<li>Xalan Serializer = 2.7.1 (previously erroneously shown as 2.9.1)</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org