You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by js...@apache.org on 2003/10/01 15:20:59 UTC
cvs commit: maven-plugins/html2xdoc/xdocs changes.xml
jstrachan 2003/10/01 06:20:59
Modified: html2xdoc/src/test/org/apache/maven/html2xdoc
TestHtml2Xdoc.java
html2xdoc/src/main/org/apache/maven/html2xdoc
Html2XdocBean.java
html2xdoc/xdocs changes.xml
Added: html2xdoc/src/test/org/apache/maven/html2xdoc
missingParaBug.xml missingParaBug.html
Log:
Added more details of recent fixes to the change.xml (thanks for the hint dion :)
Also added another failing test case along with a fix
Revision Changes Path
1.5 +1 -0 maven-plugins/html2xdoc/src/test/org/apache/maven/html2xdoc/TestHtml2Xdoc.java
Index: TestHtml2Xdoc.java
===================================================================
RCS file: /home/cvs/maven-plugins/html2xdoc/src/test/org/apache/maven/html2xdoc/TestHtml2Xdoc.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestHtml2Xdoc.java 1 Oct 2003 10:56:30 -0000 1.4
+++ TestHtml2Xdoc.java 1 Oct 2003 13:20:58 -0000 1.5
@@ -101,6 +101,7 @@
// Test cases
//-------------------------------------------------------------------------
public void testOne() throws Exception {
+ assertConversion("missingParaBug.html", "missingParaBug.xml");
assertConversion("linkInHeading.html", "linkInHeading.xml");
assertConversion("codeinpara.html", "codeinpara.xml");
assertConversion("input1.html", "output1.xml");
1.1 maven-plugins/html2xdoc/src/test/org/apache/maven/html2xdoc/missingParaBug.xml
Index: missingParaBug.xml
===================================================================
<document>
<properties>
<title>A title</title>
</properties>
<body>
<section name="Title">
<p class="Pre-requisitelist"><a href="foo.html">Some Text</a>
</p>
</section>
</body>
</document>
1.1 maven-plugins/html2xdoc/src/test/org/apache/maven/html2xdoc/missingParaBug.html
Index: missingParaBug.html
===================================================================
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<title>A title</title>
</head>
<body>
<h3>Title</h3>
<p class="Pre-requisitelist">
<a href="foo.html">Some Text</a></p>
</body>
</html>
1.5 +10 -10 maven-plugins/html2xdoc/src/main/org/apache/maven/html2xdoc/Html2XdocBean.java
Index: Html2XdocBean.java
===================================================================
RCS file: /home/cvs/maven-plugins/html2xdoc/src/main/org/apache/maven/html2xdoc/Html2XdocBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Html2XdocBean.java 1 Oct 2003 10:56:30 -0000 1.4
+++ Html2XdocBean.java 1 Oct 2003 13:20:59 -0000 1.5
@@ -428,16 +428,16 @@
String text = node.getText();
return text.trim().length() <= 0;
}
- if (node instanceof Element) {
- String name = node.getName();
- if (name.equals("p")) {
- String text = node.getText();
- return text.trim().length() <= 0;
- }
- if (name.equals("br")) {
- return true;
- }
- }
+// if (node instanceof Element) {
+// String name = node.getName();
+// if (name.equals("p")) {
+// String text = node.getText();
+// return text.trim().length() <= 0;
+// }
+// if (name.equals("br")) {
+// return true;
+// }
+// }
return false;
}
1.7 +7 -1 maven-plugins/html2xdoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/html2xdoc/xdocs/changes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- changes.xml 1 Oct 2003 12:42:15 -0000 1.6
+++ changes.xml 1 Oct 2003 13:20:59 -0000 1.7
@@ -11,7 +11,13 @@
<action dev="dion" type="update">
Only try to find files if the source directory exists
</action>
- <!-- JAMES PUT STUFF HERE -->
+ <action dev="jstrachan" type="update">
+ Numerous bug fixes have been made. A new HTML converter bean is now used
+ for every page to avoid contamination across pages. Also various invalid
+ transformations have been fixed, such as headings containing
+ either 'span' or 'a' elements, or paragraphs containing just images
+ or 'a' elements.
+ </action>
</release>
<release version="1.1" date="2003-09-29">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org