Author: trygvis
Date: Thu Jul 13 07:35:35 2006
New Revision: 421642
URL: http://svn.apache.org/viewvc?rev=421642&view=rev
Log:
o Improving Xdoc XML output. Switched to using content() so the text would be
properly escaped.
o Fixing a bug in the mojo.
Modified:
maven/doxia/trunk/doxia-sandbox/doxia-book/pom.xml
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/indexer/BookIndexingSink.java
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/XdocBookSink.java
maven/doxia/trunk/doxia-sandbox/doxia-maven-plugin/pom.xml
maven/doxia/trunk/doxia-sandbox/doxia-maven-plugin/src/main/java/org/apache/maven/doxia/plugin/DoxiaRenderBooksMojo.java
Modified: maven/doxia/trunk/doxia-sandbox/doxia-book/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-sandbox/doxia-book/pom.xml?rev=421642&r1=421641&r2=421642&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-sandbox/doxia-book/pom.xml (original)
+++ maven/doxia/trunk/doxia-sandbox/doxia-book/pom.xml Thu Jul 13 07:35:35 2006
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia</artifactId>
- <version>1.0-alpha-8-SNAPSHOT</version>
+ <version>1.0-alpha-9-SNAPSHOT</version>
</parent>
<artifactId>doxia-book</artifactId>
<version>1.0-alpha-1-SNAPSHOT</version>
@@ -41,20 +41,17 @@
</configuration>
<executions>
<execution>
+ <id>site-docs</id>
+ <phase>pre-site</phase>
<goals>
- <goal>java</goal>
- <goal>xpp3-reader</goal>
+ <goal>xdoc</goal>
+ <goal>xsd</goal>
</goals>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>java</goal>
+ <goal>xpp3-reader</goal>
</goals>
</execution>
</executions>
Modified:
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/indexer/BookIndexingSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/indexer/BookIndexingSink.java?rev=421642&r1=421641&r2=421642&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/indexer/BookIndexingSink.java
(original)
+++
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/indexer/BookIndexingSink.java
Thu Jul 13 07:35:35 2006
@@ -137,7 +137,11 @@
// Sanitize the id. The most important step is to remove any
blanks
//
-----------------------------------------------------------------------
- String id = text.toLowerCase().replace( ' ', '_' );
+ String id = text;
+ id = id.toLowerCase();
+ id = id.replace( '\'', '_' );
+ id = id.replace( '\"', '_' );
+ id = id.replace( ' ', '_' );
//
-----------------------------------------------------------------------
//
Modified:
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/XdocBookSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/XdocBookSink.java?rev=421642&r1=421641&r2=421642&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/XdocBookSink.java
(original)
+++
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/XdocBookSink.java
Thu Jul 13 07:35:35 2006
@@ -80,11 +80,13 @@
IndexEntry prevEntry = indexEntry.getPrevEntry();
- String string;
+ markup( "<td><div align='left'>" );
if ( prevEntry != null )
{
- string = "Previous: <a href='" + prevEntry.getId() + ".html'>" +
prevEntry.getTitle() + "</a>";
+ markup( "Previous: <a href='" + prevEntry.getId() + ".html'>" );
+ content( prevEntry.getTitle() );
+ markup( "</a>" );
}
else
{
@@ -92,16 +94,19 @@
if ( prevChapter == null )
{
- string = "<i>Start of book</i>";
+ markup( "<i>Start of book</i>" );
}
else
{
IndexEntry lastEntry = prevChapter.getLastEntry();
- string = "Previous: <a href='" + lastEntry.getId() + ".html'>"
+ lastEntry.getTitle() + "</a>";
+
+ markup( "Previous: <a href='" + lastEntry.getId() + ".html'>"
);
+ content( lastEntry.getTitle() );
+ markup( "</a>" );
}
}
- markup( "<td><div align='left'>" + string + "</div></td>" + EOL );
+ markup( "</div></td>" + EOL );
//
-----------------------------------------------------------------------
// Parent
@@ -115,9 +120,13 @@
IndexEntry nextEntry = indexEntry.getNextEntry();
+ markup( "<td><div align='right'>" );
+
if ( nextEntry != null )
{
- string = "Next: <a href='" + nextEntry.getId() + ".html'>" +
nextEntry.getTitle() + "</a>";
+ markup( "Next: <a href='" + nextEntry.getId() + ".html'>" );
+ content( nextEntry.getTitle() );
+ markup( "</a>" );
}
else
{
@@ -125,16 +134,18 @@
if ( nextChapter == null )
{
- string = "<i>End of book</i>";
+ markup( "<i>End of book</i>" );
}
else
{
IndexEntry firstEntry = nextChapter.getFirstEntry();
- string = "Next: <a href='" + firstEntry.getId() + ".html'>" +
firstEntry.getTitle() + "</a>";
+ markup( "Next: <a href='" + firstEntry.getId() + ".html'>" );
+ content( firstEntry.getTitle() );
+ markup( "</a>" );
}
}
- markup( "<td><div align='right'>" + string + "</div></td>" + EOL );
+ markup( "</div></td>" + EOL );
//
-----------------------------------------------------------------------
//
Modified: maven/doxia/trunk/doxia-sandbox/doxia-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-sandbox/doxia-maven-plugin/pom.xml?rev=421642&r1=421641&r2=421642&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-sandbox/doxia-maven-plugin/pom.xml (original)
+++ maven/doxia/trunk/doxia-sandbox/doxia-maven-plugin/pom.xml Thu Jul 13
07:35:35 2006
@@ -6,7 +6,7 @@
<version>1.0-alpha-9-SNAPSHOT</version>
</parent>
<artifactId>doxia-maven-plugin</artifactId>
- <version>1.0-alpha-1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Doxia Maven Plugin</name>
<dependencies>
Modified:
maven/doxia/trunk/doxia-sandbox/doxia-maven-plugin/src/main/java/org/apache/maven/doxia/plugin/DoxiaRenderBooksMojo.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-sandbox/doxia-maven-plugin/src/main/java/org/apache/maven/doxia/plugin/DoxiaRenderBooksMojo.java?rev=421642&r1=421641&r2=421642&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-sandbox/doxia-maven-plugin/src/main/java/org/apache/maven/doxia/plugin/DoxiaRenderBooksMojo.java
(original)
+++
maven/doxia/trunk/doxia-sandbox/doxia-maven-plugin/src/main/java/org/apache/maven/doxia/plugin/DoxiaRenderBooksMojo.java
Thu Jul 13 07:35:35 2006
@@ -66,7 +66,7 @@
// Validate
//
----------------------------------------------------------------------
- if ( StringUtils.isEmpty( book.getDirectory() ) )
+ if ( StringUtils.isEmpty( book.getDescriptor() ) )
{
throw new MojoFailureException( "Invalid configuration: The
book is required to have a descriptor set." );
}
