Updated HtmlCleaner to 2.10 (see WOOKIE-431). Thanks to Jawwad Farooq for the bug report and testing this out.
git-svn-id: https://svn.apache.org/repos/asf/wookie/branches/wookie-1.0.x@1641345 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ivy.xml b/ivy.xml
index e600726..56431ae 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -74,7 +74,7 @@
</dependency>
<dependency org="dom4j" name="dom4j" rev="1.6.1" conf="deploy->default">
</dependency>
- <dependency org="net.sourceforge.htmlcleaner" name="htmlcleaner" rev="2.2.1" conf="deploy->default">
+ <dependency org="net.sourceforge.htmlcleaner" name="htmlcleaner" rev="2.10" conf="deploy->default">
</dependency>
<dependency org="org.directwebremoting" name="dwr" rev="2.0.10" conf="deploy->default">
</dependency>
diff --git a/src/test/java/org/apache/wookie/tests/HtmlSerializerTest.java b/src/test/java/org/apache/wookie/tests/HtmlSerializerTest.java
index 77e49aa..c244b8c 100644
--- a/src/test/java/org/apache/wookie/tests/HtmlSerializerTest.java
+++ b/src/test/java/org/apache/wookie/tests/HtmlSerializerTest.java
@@ -21,6 +21,7 @@
import org.apache.wookie.util.html.HtmlSerializer;
import org.htmlcleaner.CleanerProperties;
import org.htmlcleaner.HtmlCleaner;
+import org.htmlcleaner.SimpleHtmlSerializer;
import org.htmlcleaner.TagNode;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -39,14 +40,15 @@
properties.setOmitXmlDeclaration(true);
properties.setUseCdataForScriptAndStyle(true);
properties.setUseEmptyElementTags(false);
+ properties.setAddNewlineToHeadAndBody(false);
}
private String parse(String content){
StringWriter writer = new StringWriter();
- HtmlSerializer ser = new HtmlSerializer(properties);
+ SimpleHtmlSerializer ser = new SimpleHtmlSerializer(properties);
try {
TagNode html = cleaner.clean(content);
- ser.writeXml(html, writer, "UTF-8");
+ ser.write(html, writer, "UTF-8");
return writer.getBuffer().toString();
} catch (IOException e) {
return null;
