jakarta-jmeter (2.3.4-2) 03_fix_jtidy_call.patch

diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/src/components/org/apache/jmeter/assertions/HTMLAssertion.java jakarta-jmeter-2.3.4.new/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
--- jakarta-jmeter-2.3.4/src/components/org/apache/jmeter/assertions/HTMLAssertion.java	2009-06-17 20:58:59.000000000 +0530
+++ jakarta-jmeter-2.3.4.new/src/components/org/apache/jmeter/assertions/HTMLAssertion.java	2009-07-24 02:33:36.000000000 +0530
@@ -96,7 +96,8 @@
             log.debug("xhtml mode: " + isXHTML());
             log.debug("xml mode: " + isXML());
             tidy = new Tidy();
-            tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
+            tidy.setInputEncoding("UTF-8");
+            tidy.setOutputEncoding("UTF-8");
             tidy.setQuiet(false);
             tidy.setShowWarnings(true);
             tidy.setOnlyErrors(isErrorsOnly());
diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/src/core/org/apache/jmeter/util/XPathUtil.java jakarta-jmeter-2.3.4.new/src/core/org/apache/jmeter/util/XPathUtil.java
--- jakarta-jmeter-2.3.4/src/core/org/apache/jmeter/util/XPathUtil.java	2009-06-17 20:59:36.000000000 +0530
+++ jakarta-jmeter-2.3.4.new/src/core/org/apache/jmeter/util/XPathUtil.java	2009-07-24 02:33:36.000000000 +0530
@@ -208,7 +208,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("UTF-8");
+        tidy.setOutputEncoding("UTF-8");
         tidy.setQuiet(quiet);
         tidy.setShowWarnings(showWarnings);
         tidy.setMakeClean(true);
@@ -251,4 +252,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java jakarta-jmeter-2.3.4.new/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
--- jakarta-jmeter-2.3.4/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java	2009-06-17 20:59:52.000000000 +0530
+++ jakarta-jmeter-2.3.4.new/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java	2009-07-24 02:34:18.000000000 +0530
@@ -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("UTF-8");
+        tidy.setOutputEncoding("UTF-8");
         tidy.setQuiet(true);
         tidy.setShowWarnings(false);
 
diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java jakarta-jmeter-2.3.4.new/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
--- jakarta-jmeter-2.3.4/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java	2009-06-17 20:59:52.000000000 +0530
+++ jakarta-jmeter-2.3.4.new/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java	2009-07-24 02:35:00.000000000 +0530
@@ -194,7 +194,8 @@
     private static Tidy getTidyParser() {
         log.debug("Start : getParser");
         Tidy tidy = new Tidy();
-        tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
+        tidy.setInputEncoding("UTF-8");
+        tidy.setOutputEncoding("UTF-8");
         tidy.setQuiet(true);
         tidy.setShowWarnings(false);
         if (log.isDebugEnabled()) {