svn commit: r566666 - /maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java
Author: vsiveton Date: Thu Aug 16 04:54:46 2007 New Revision: 56 URL: http://svn.apache.org/viewvc?view=rev&rev=56 Log: o added CDATA constant Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java?view=diff&rev=56&r1=55&r2=56 == --- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java (original) +++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java Thu Aug 16 04:54:46 2007 @@ -35,4 +35,11 @@ /** bang character: '!' */ char BANG = '!'; + +// -- +// Xml constants +// -- + +/** CDATA string: "CDATA" */ +String CDATA = "CDATA"; }
svn commit: r566667 - /maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
Author: vsiveton
Date: Thu Aug 16 04:57:23 2007
New Revision: 57
URL: http://svn.apache.org/viewvc?view=rev&rev=57
Log:
o added some TODO to handle cdsect, comment and entity
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java?view=diff&rev=57&r1=56&r2=57
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
Thu Aug 16 04:57:23 2007
@@ -95,6 +95,21 @@
{
handleText( parser, sink );
}
+else if ( eventType == XmlPullParser.CDSECT )
+{
+// TODO
+// handleCdsect( parser, sink );
+}
+else if ( eventType == XmlPullParser.COMMENT )
+{
+// TODO
+// handleComment( parser, sink );
+}
+else if ( eventType == XmlPullParser.ENTITY_REF )
+{
+// TODO
+// handleEntity( parser, sink );
+}
try
{
svn commit: r566668 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
Author: vsiveton
Date: Thu Aug 16 04:58:32 2007
New Revision: 58
URL: http://svn.apache.org/viewvc?view=rev&rev=58
Log:
o fixed javadoc
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java?view=diff&rev=58&r1=57&r2=58
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
Thu Aug 16 04:58:32 2007
@@ -25,22 +25,24 @@
* @author mailto:[EMAIL PROTECTED]">Jason van Zyl
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule"
- * role-hint="confluence"
+ * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule"
role-hint="confluence"
*/
public class ConfluenceSiteModule
extends AbstractSiteModule
{
+/** [EMAIL PROTECTED] */
public String getSourceDirectory()
{
return "confluence";
}
+/** [EMAIL PROTECTED] */
public String getExtension()
{
return "confluence";
}
+/** [EMAIL PROTECTED] */
public String getParserId()
{
return "confluence";
svn commit: r566673 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
Author: ltheussl
Date: Thu Aug 16 05:08:14 2007
New Revision: 566673
URL: http://svn.apache.org/viewvc?view=rev&rev=566673
Log:
LatexSink should extend AbstractTextSink
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java?view=diff&rev=566673&r1=566672&r2=566673
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
Thu Aug 16 05:08:14 2007
@@ -20,7 +20,7 @@
*/
import org.apache.maven.doxia.parser.Parser;
-import org.apache.maven.doxia.sink.SinkAdapter;
+import org.apache.maven.doxia.sink.AbstractTextSink;
import org.apache.maven.doxia.util.LineBreaker;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
@@ -30,10 +30,8 @@
import java.io.Writer;
public class LatexSink
-extends SinkAdapter
+extends AbstractTextSink
{
-private static final String EOL = System.getProperty( "line.separator" );
-
/**
* Flag that indicates if the document to be written is only a fragment.
*
svn commit: r566679 - /maven/doxia/site/pom.xml
Author: vsiveton Date: Thu Aug 16 05:27:25 2007 New Revision: 566679 URL: http://svn.apache.org/viewvc?view=rev&rev=566679 Log: o bumped to the last release of maven-parent Modified: maven/doxia/site/pom.xml Modified: maven/doxia/site/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?view=diff&rev=566679&r1=566678&r2=566679 == --- maven/doxia/site/pom.xml (original) +++ maven/doxia/site/pom.xml Thu Aug 16 05:27:25 2007 @@ -28,7 +28,7 @@ org.apache.maven maven-parent -6-SNAPSHOT +6 ../pom/maven/pom.xml
svn commit: r566701 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
Author: vsiveton
Date: Thu Aug 16 06:12:43 2007
New Revision: 566701
URL: http://svn.apache.org/viewvc?view=rev&rev=566701
Log:
o fixed javadoc
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java?view=diff&rev=566701&r1=566700&r2=566701
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
Thu Aug 16 06:12:43 2007
@@ -24,20 +24,21 @@
import org.apache.maven.doxia.module.latex.LatexSink;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.AbstractSinkTest;
-import org.apache.maven.doxia.parser.Parser;
/**
* @author mailto:[EMAIL PROTECTED]">Jason van Zyl
- * @version $Id:LatexSinkTest.java 348605 2005-11-24 12:02:44 +1100 (Thu, 24
Nov 2005) brett $
+ * @version $Id$
*/
public class LatexSinkTest
extends AbstractSinkTest
{
+/** [EMAIL PROTECTED] */
protected String outputExtension()
{
return "tex";
}
+/** [EMAIL PROTECTED] */
protected Sink createSink( Writer writer )
{
return new LatexSink( writer );
@@ -223,5 +224,4 @@
// TODO: not implemented
return "";
}
-
}
svn commit: r566704 - /maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
Author: vsiveton
Date: Thu Aug 16 06:19:48 2007
New Revision: 566704
URL: http://svn.apache.org/viewvc?view=rev&rev=566704
Log:
o fixed build for Windows due to r566673
o be sure that line.separator is unix one to prevent test failures on windows
(see noNewLine(...))
o added javadoc
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java?view=diff&rev=566704&r1=566703&r2=566704
==
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
Thu Aug 16 06:19:48 2007
@@ -29,6 +29,9 @@
/**
* Abstract base class to test sinks.
+ *
+ * @version $Id$
+ * @since 1.0
*/
public abstract class AbstractSinkTest
extends AbstractModuleTest
@@ -38,10 +41,18 @@
/**
* Resets the writer and creates a new sink with it.
+ *
+ * Set the system property line.separator to \n
(Unix) to prevent
+ * failure on windows.
+ *
+ * @see #noNewLine(String)
*/
protected void setUp()
throws Exception
{
+// Safety
+System.setProperty( "line.separator", "\n" );
+
super.setUp();
writer.reset();
@@ -642,7 +653,7 @@
// Utility methods
// --
-private String noNewLine( String text )
+protected String noNewLine( String text )
{
String EOL = System.getProperty( "line.separator" );
return text.replaceAll( EOL, "" );
@@ -888,7 +899,7 @@
/**
* Returns a NonBreakingSpace block generated by this sink.
- * @return The result of invoking a NonBreakingSpace block
+ * @return The result of invoking a NonBreakingSpace block
* on the current sink.
* @see #testNonBreakingSpace()
*/
svn commit: r566741 - in /maven/doxia/doxia/trunk/doxia-core/src: main/java/org/apache/maven/doxia/macro/manager/ main/java/org/apache/maven/doxia/module/site/manager/ main/java/org/apache/maven/doxia
Author: ltheussl Date: Thu Aug 16 08:01:27 2007 New Revision: 566741 URL: http://svn.apache.org/viewvc?view=rev&rev=566741 Log: Fix javadoc warnings Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroNotFoundException.java maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException.java maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/ParseException.java maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/ParserNotFoundException.java maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSink.java maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroNotFoundException.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroNotFoundException.java?view=diff&rev=566741&r1=566740&r2=566741 == --- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroNotFoundException.java (original) +++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroNotFoundException.java Thu Aug 16 08:01:27 2007 @@ -41,8 +41,8 @@ } /** - * Constructs a new MacroNotFoundException with the specified cause - * and a detail message of (cause == null ? null : cause.toString() ). + * Constructs a new MacroNotFoundException with the specified cause. + * The error message is (cause == null ? null : cause.toString() ). * * @param cause the cause. This can be retrieved later by the * Throwable.getCause() method. (A null value is permitted, and indicates Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException.java?view=diff&rev=566741&r1=566740&r2=566741 == --- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException.java (original) +++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException.java Thu Aug 16 08:01:27 2007 @@ -43,8 +43,8 @@ } /** - * Constructs a new SiteModuleNotFoundException with the specified cause - * and a detail message of (cause == null ? null : cause.toString() ). + * Constructs a new SiteModuleNotFoundException with the specified cause. + * The error message is (cause == null ? null : cause.toString() ). * * @param cause the cause. This can be retrieved later by the * Throwable.getCause() method. (A null value is permitted, and indicates Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/ParseException.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/ParseException.java?view=diff&rev=566741&r1=566740&r2=566741 == --- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/ParseException.java (original) +++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/ParseException.java Thu Aug 16 08:01:27 2007 @@ -64,7 +64,7 @@ } /** - * Constructs a new exception with the specified cause and a detail message of + * Constructs a new exception with the specified cause. The error message is * (cause == null ? null : cause.toString() ). * * @param e the cause. This can be retrieved later by the Throwable.getCause() method. Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/ParserNotFoundException.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/ParserNotFoundException.java?view=diff&rev=566741&r1=566740&r2=566741 == --- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/ParserNotFoundException.java (original) +++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/ParserNotFoundException.java Thu Aug 16 08:01:27 2007 @@ -41,8 +41,8 @@ } /** -
svn commit: r566748 - /maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
Author: ltheussl Date: Thu Aug 16 08:24:39 2007 New Revision: 566748 URL: http://svn.apache.org/viewvc?view=rev&rev=566748 Log: Fix javadoc warnings. Add section level constants. Modified: maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java Modified: maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java?view=diff&rev=566748&r1=566747&r2=566748 == --- maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java (original) +++ maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java Thu Aug 16 08:24:39 2007 @@ -22,7 +22,12 @@ /** * A Sink consumes Doxia events in a resultant output format like * Docbook, PDF, or XHTML. - * + * + * Doxia allows you to parse any supported input document format + * (ie for which a parser exists) and generate any supported output + * document format (ie for which a sink exists). + * + * * The upshot is that you can parse any front-end format, the parser is * responsible for emitting the standard Doxia events which can then be * consumed by any Doxia Sink. This is what allow us to parse the front- @@ -31,8 +36,9 @@ * documents being parsed results in a stream of Doxia events * (paragraph, bold, italic, text) which are then fed in the XHTML sink * which results in a set of XHTML pages. - * - * A sink if ultimately responsible for the final format and structure. + * + * + * A sink is ultimately responsible for the final format and structure. * So, for example, you can take a series of APT documents and have that * be fed into a Sink which makes a single PDF, a book, a site, or a * Word document. The Sink is fully responsible for the final output. @@ -40,6 +46,7 @@ * you wanted to integrate your custom XML format, or custom Wiki * format, you would create a Doxia parser which could then be fed into * any Sink to produce your desired final output. + * * * @since 1.0 * @author mailto:[EMAIL PROTECTED]">Jason van Zyl @@ -57,31 +64,61 @@ * A numbering to handle a number list. * @see #numberedList(int) */ -static final int NUMBERING_DECIMAL = 0; +int NUMBERING_DECIMAL = 0; /** * A numbering to handle a lower alpha list. * @see #numberedList(int) */ -static final int NUMBERING_LOWER_ALPHA = 1; +int NUMBERING_LOWER_ALPHA = 1; /** * A numbering to handle a upper alpha list. * @see #numberedList(int) */ -static final int NUMBERING_UPPER_ALPHA = 2; +int NUMBERING_UPPER_ALPHA = 2; /** * A numbering to handle a lower roman list. * @see #numberedList(int) */ -static final int NUMBERING_LOWER_ROMAN = 3; +int NUMBERING_LOWER_ROMAN = 3; /** * A numbering to handle a upper roman list. * @see #numberedList(int) */ -static final int NUMBERING_UPPER_ROMAN = 4; +int NUMBERING_UPPER_ROMAN = 4; + +/** + * A level 1 section (section). + * @see #section1() + */ +int SECTION_LEVEL_1 = 1; + +/** + * A level 2 section (subsection). + * @see #section2() + */ +int SECTION_LEVEL_2 = 2; + +/** + * A level 3 section (sub-subsection). + * @see #section3() + */ +int SECTION_LEVEL_3 = 3; + +/** + * A level 4 section (sub-sub-subsection). + * @see #section4() + */ +int SECTION_LEVEL_4 = 4; + +/** + * A level 5 section (sub-sub-sub-subsection). + * @see #section5() + */ +int SECTION_LEVEL_5 = 5; /** * Starting the head element which contains information about the current document, @@ -527,21 +564,21 @@ void lineBreak(); /** - * Adding a non breaking space, i.e. a space without any special formatting operations. + * Adding a non breaking space, ie a space without any special formatting operations. */ void nonBreakingSpace(); /** * Adding a text. * - * @param text + * @param text The text to write. */ void text( String text ); /** - * Adding a raw text, i.e. a text without any special formatting operations. + * Adding a raw text, ie a text without any special formatting operations. * - * @param text + * @param text The text to write. */ void rawText( String text );
svn commit: r566791 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
Author: ltheussl
Date: Thu Aug 16 11:06:01 2007
New Revision: 566791
URL: http://svn.apache.org/viewvc?view=rev&rev=566791
Log:
Fix javadoc warnings
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java?view=diff&rev=566791&r1=566790&r2=566791
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
Thu Aug 16 11:06:01 2007
@@ -626,8 +626,12 @@
tableCell_( true );
}
-/** [EMAIL PROTECTED] */
-public void tableCell_( boolean headerRow )
+/**
+ * Ends a table cell.
+ *
+ * @param headerRow If this cell is part of a header row.
+ */
+private void tableCell_( boolean headerRow )
{
buffer.append( TABLE_CELL_SEPARATOR_MARKUP );
cellCount++;
@@ -690,7 +694,12 @@
}
}
-/** [EMAIL PROTECTED] */
+/**
+ * A link with a target.
+ *
+ * @param name The name of the link.
+ * @param target The link target.
+ */
public void link( String name, String target )
{
if ( !headerFlag )
