svn commit: r634947 - /maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java

[vsiveton]

Author: vsiveton
Date: Sat Mar  8 05:05:56 2008
New Revision: 634947

URL: http://svn.apache.org/viewvc?rev=634947view=rev
Log:
o added twiki

Modified:

maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.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=634947r1=634946r2=634947view=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
 Sat Mar  8 05:05:56 2008
@@ -249,6 +249,10 @@
 {
 return new FmlParser();
 }
+else if ( format.equals( TWIKI_PARSER ) )
+{
+return new TWikiParser();
+}
 else if ( format.equals( XDOC_PARSER ) )
 {
 return new XdocParser();

svn commit: r634948 - /maven/doxia/doxia-tools/trunk/doxia-converter/src/site/apt/usage.apt

[vsiveton]

Author: vsiveton
Date: Sat Mar  8 05:06:47 2008
New Revision: 634948

URL: http://svn.apache.org/viewvc?rev=634948view=rev
Log:
o improved usage

Modified:
maven/doxia/doxia-tools/trunk/doxia-converter/src/site/apt/usage.apt

Modified: maven/doxia/doxia-tools/trunk/doxia-converter/src/site/apt/usage.apt
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/src/site/apt/usage.apt?rev=634948r1=634947r2=634948view=diff
==
--- maven/doxia/doxia-tools/trunk/doxia-converter/src/site/apt/usage.apt 
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-converter/src/site/apt/usage.apt Sat 
Mar  8 05:06:47 2008
@@ -30,7 +30,7 @@
 
  The following examples describe the basic usage of the Doxia Converter.
 
-* Display Help
+* Command Line Help
 
 +-+
 # java -jar target/apache-doxia-1.0-SNAPSHOT-jar-with-dependencies.jar -h
@@ -53,7 +53,7 @@
 out: apt, docbook, fo, itext, latex, rtf, xdoc, xhtml
 +-+
 
-* Executes Conversion
+* Command Line Execution
 
 +-+
 # java -jar target/apache-doxia-1.0-SNAPSHOT-jar-with-dependencies.jar \
@@ -61,4 +61,33 @@
 -from xhtml \
 -out /path/to/outputdir \
 -to apt
++-+
+
+  Note: from parameter could be empty. In this case, Doxia converter 
try to autodetect the from
+  input from the in file parameter.
+
+* Java Usage
+
++-+
+String in = ...;
+String from = ...;
+String out = ...;
+String to = ...;
+
+Converter converter = new DefaultConverter();
+try
+{
+InputFile input = InputFile.valueOf( in, from, converter.getInputFormats() 
);
+OutputFile output = OutputFile.valueOf( out, to, 
converter.getOutputFormats() );
+
+converter.convert( input, output );
+}
+catch ( UnsupportedFormatException e )
+{
+e.printStackTrace();
+}
+catch ( ConverterException e )
+{
+e.printStackTrace();
+}
 +-+

svn commit: r634949 - /maven/doxia/doxia-tools/trunk/doxia-converter/

[vsiveton]

Author: vsiveton
Date: Sat Mar  8 05:07:47 2008
New Revision: 634949

URL: http://svn.apache.org/viewvc?rev=634949view=rev
Log:
o ignored target and ide files

Modified:
maven/doxia/doxia-tools/trunk/doxia-converter/   (props changed)

Propchange: maven/doxia/doxia-tools/trunk/doxia-converter/
--
--- svn:ignore (added)
+++ svn:ignore Sat Mar  8 05:07:47 2008
@@ -0,0 +1,7 @@
+.settings
+target
+.classpath
+.project
+doxia-converter.iml
+doxia-converter.ipr
+doxia-converter.iws