Switch do doxia-1.1.1-snap. Docbook works on trunk now, remove warning and uncomment test case.
git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk@784074 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 15a06b4..48016c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
</dependencies>
<properties>
- <doxiaVersion>1.1</doxiaVersion>
+ <doxiaVersion>1.1.1-SNAPSHOT</doxiaVersion>
</properties>
<build>
diff --git a/src/main/java/org/apache/maven/doxia/DefaultConverter.java b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
index 5a42a02..ceccdba 100644
--- a/src/main/java/org/apache/maven/doxia/DefaultConverter.java
+++ b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
@@ -291,7 +291,7 @@
getLog().debug( "Sink used: " + sink.getClass().getName() );
}
- parse( parser, input.getFormat(), input.getReader(), sink );
+ parse( parser, input.getReader(), sink );
}
finally
{
@@ -440,7 +440,7 @@
getLog().debug( "Sink used: " + sink.getClass().getName() );
}
- parse( parser, inputFormat, reader, sink );
+ parse( parser, reader, sink );
if ( formatOutput && ( output.getFormat().equals( DOCBOOK_SINK ) || output.getFormat().equals( FO_SINK )
|| output.getFormat().equals( ITEXT_SINK ) || output.getFormat().equals( XDOC_SINK )
@@ -478,20 +478,11 @@
* @param parser not null
* @param reader not null
* @param sink not null
- * @param writer not null
* @throws ConverterException if any
*/
- private void parse( Parser parser, String inputFormat, Reader reader, Sink sink )
+ private void parse( Parser parser, Reader reader, Sink sink )
throws ConverterException
{
- // add warnings
- if ( inputFormat.equals( DOCBOOK_PARSER ) && getLog().isWarnEnabled() )
- {
- getLog().warn(
- "Docbook parser has some known issues. "
- + "Please refer to http://jira.codehaus.org/browse/DOXIA-184" );
- }
-
try
{
parser.parse( reader, sink );
diff --git a/src/test/java/org/apache/maven/doxia/ConverterTest.java b/src/test/java/org/apache/maven/doxia/ConverterTest.java
index afcf39f..17f2821 100644
--- a/src/test/java/org/apache/maven/doxia/ConverterTest.java
+++ b/src/test/java/org/apache/maven/doxia/ConverterTest.java
@@ -240,18 +240,17 @@
assertTrue( new File( out ).exists() );
assertTrue( new File( out ).length() != 0 );
- // TODO: docbook output is still crap, see DOXIA-184
- // in = getBasedir() + "/target/unit/file/docbook/test.docbook.xhtml";
- // from = "xhtml";
- // out = getBasedir() + "/target/unit/file/docbook/test.docbook";
- // to = "docbook";
- //
- // input = InputFileWrapper.valueOf( in, from, converter.getInputFormats() );
- // output = OutputFileWrapper.valueOf( out, to, converter.getOutputFormats() );
- //
- // converter.setFormatOutput( formatOutput );
- // converter.convert( input, output );
- // assertTrue( new File( out ).exists() );
+ in = getBasedir() + "/target/unit/file/docbook/test.docbook.xhtml";
+ from = "xhtml";
+ out = getBasedir() + "/target/unit/file/docbook/test.docbook";
+ to = "docbook";
+
+ input = InputFileWrapper.valueOf( in, from, converter.getInputFormats() );
+ output = OutputFileWrapper.valueOf( out, to, converter.getOutputFormats() );
+
+ converter.setFormatOutput( formatOutput );
+ converter.convert( input, output );
+ assertTrue( new File( out ).exists() );
}
/**
