You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by vs...@apache.org on 2008/10/21 12:54:34 UTC
svn commit: r706575 - in /maven/doxia/doxia-tools/trunk/doxia-converter/src:
main/java/org/apache/maven/doxia/DefaultConverter.java
main/resources/META-INF/plexus/components.xml
test/java/org/apache/maven/doxia/ConverterTest.java
Author: vsiveton
Date: Tue Oct 21 03:54:33 2008
New Revision: 706575
URL: http://svn.apache.org/viewvc?rev=706575&view=rev
Log:
o added Confluence support
Modified:
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/resources/META-INF/plexus/components.xml
maven/doxia/doxia-tools/trunk/doxia-converter/src/test/java/org/apache/maven/doxia/ConverterTest.java
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=706575&r1=706574&r2=706575&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 Tue Oct 21 03:54:33 2008
@@ -93,6 +93,8 @@
private static final String APT_SINK = "apt";
+ private static final String CONFLUENCE_SINK = "confluence";
+
private static final String DOCBOOK_SINK = "docbook";
private static final String FO_SINK = "fo";
@@ -111,7 +113,7 @@
/** Supported output format, i.e. supported Doxia Sink */
public static final String[] SUPPORTED_TO_FORMAT =
- { APT_SINK, DOCBOOK_SINK, FO_SINK, ITEXT_SINK, LATEX_SINK, RTF_SINK, TWIKI_SINK, XDOC_SINK, XHTML_SINK };
+ { APT_SINK, CONFLUENCE_SINK, DOCBOOK_SINK, FO_SINK, ITEXT_SINK, LATEX_SINK, RTF_SINK, TWIKI_SINK, XDOC_SINK, XHTML_SINK };
/** Plexus container */
private PlexusContainer plexus;
Modified: maven/doxia/doxia-tools/trunk/doxia-converter/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/src/main/resources/META-INF/plexus/components.xml?rev=706575&r1=706574&r2=706575&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-converter/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-converter/src/main/resources/META-INF/plexus/components.xml Tue Oct 21 03:54:33 2008
@@ -99,6 +99,12 @@
<implementation>org.apache.maven.doxia.module.confluence.ConfluenceParser</implementation>
<description>Parse the <a href="http://www.</description>
</component>
+ <component>
+ <role>org.apache.maven.doxia.sink.SinkFactory</role>
+ <role-hint>confluence</role-hint>
+ <implementation>org.apache.maven.doxia.module.confluence.ConfluenceSinkFactory</implementation>
+ <description>Confluence implementation of the Sink factory.</description>
+ </component>
<!-- Doxia docbook -->
<component>
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=706575&r1=706574&r2=706575&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 Tue Oct 21 03:54:33 2008
@@ -197,19 +197,10 @@
out = getBasedir() + "/target/unit/file/confluence/test.confluence";
to = "confluence";
- try
- {
- input = InputFileWrapper.valueOf( in, from, ReaderFactory.UTF_8, converter.getInputFormats() );
- output = OutputFileWrapper.valueOf( out, to, WriterFactory.UTF_8, converter.getOutputFormats() );
-
- converter.convert( input, output );
+ input = InputFileWrapper.valueOf( in, from, ReaderFactory.UTF_8, converter.getInputFormats() );
+ output = OutputFileWrapper.valueOf( out, to, WriterFactory.UTF_8, converter.getOutputFormats() );
- assertFalse( true );
- }
- catch ( UnsupportedFormatException e )
- {
- assertTrue( true );
- }
+ converter.convert( input, output );
}
/**