svn commit: r784074 - in /maven/doxia/doxia-tools/trunk/doxia-converter: pom.xml src/main/java/org/apache/maven/doxia/DefaultConverter.java src/test/java/org/apache/maven/doxia/ConverterTest.java

[ltheussl]

Author: ltheussl
Date: Fri Jun 12 11:14:35 2009
New Revision: 784074

URL: http://svn.apache.org/viewvc?rev=784074&view=rev
Log:
Switch do doxia-1.1.1-snap. Docbook works on trunk now, remove warning and 
uncomment test case.

Modified:
    maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml
    
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
    
maven/doxia/doxia-tools/trunk/doxia-converter/src/test/java/org/apache/maven/doxia/ConverterTest.java

Modified: maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml?rev=784074&r1=784073&r2=784074&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml Fri Jun 12 11:14:35 
2009
@@ -141,7 +141,7 @@
   </dependencies>
 
   <properties>
-    <doxiaVersion>1.1</doxiaVersion>
+    <doxiaVersion>1.1.1-SNAPSHOT</doxiaVersion>
   </properties>
 
   <build>

Modified: 
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java?rev=784074&r1=784073&r2=784074&view=diff
==============================================================================
--- 
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
 (original)
+++ 
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
 Fri Jun 12 11:14:35 2009
@@ -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 );

Modified: 
maven/doxia/doxia-tools/trunk/doxia-converter/src/test/java/org/apache/maven/doxia/ConverterTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/src/test/java/org/apache/maven/doxia/ConverterTest.java?rev=784074&r1=784073&r2=784074&view=diff
==============================================================================
--- 
maven/doxia/doxia-tools/trunk/doxia-converter/src/test/java/org/apache/maven/doxia/ConverterTest.java
 (original)
+++ 
maven/doxia/doxia-tools/trunk/doxia-converter/src/test/java/org/apache/maven/doxia/ConverterTest.java
 Fri Jun 12 11:14:35 2009
@@ -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() );
     }
 
     /**