Hi Vincent,
Is there any special reason for this 'innocent' change? I am concerned
about backward compatibility (yes, really! ;) ). As illustrated by the
problem that Arnaud encountered [1], these things are hard to track down...
-Lukas
[1] http://www.nabble.com/Adding-a-module-td14997185.html
[EMAIL PROTECTED] wrote:
Author: vsiveton
Date: Sun Sep 21 07:29:52 2008
New Revision: 697524
URL: http://svn.apache.org/viewvc?rev=697524&view=rev
Log:
o unify docbook lookup
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java?rev=697524&r1=697523&r2=697524&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
Sun Sep 21 07:29:52 2008
@@ -42,7 +42,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.parser.Parser"
role-hint="doc-book"
+ * @plexus.component role="org.apache.maven.doxia.parser.Parser"
role-hint="docbook"
*/
public class DocBookParser
extends AbstractXmlParser
@@ -734,10 +734,10 @@
/*
* NOTE: Don't do any whitespace trimming here. Whitespace
normalization has already been performed by the
* parser so any whitespace that makes it here is significant.
- */
+ */
if ( StringUtils.isNotEmpty( text ) )
{
- // Emit separate text events for different lines, e.g. the input
+ // Emit separate text events for different lines, e.g. the input
// "\nLine1\n\nLine2\n\n" should deliver the event sequence "\n", "Line1\n", "\n",
"Line2\n", "\n".
// In other words, the concatenation of the text events must
deliver the input sequence.
// (according to section 2.11 of the XML spec, parsers must normalize line
breaks to "\n")
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java?rev=697524&r1=697523&r2=697524&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
Sun Sep 21 07:29:52 2008
@@ -25,7 +25,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule"
role-hint="doc-book"
+ * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule"
role-hint="docbook"
*/
public class DocBookSiteModule
extends AbstractSiteModule
