Merge pull request #2 from apache/master
Merge from master
diff --git a/doxia-decoration-model/pom.xml b/doxia-decoration-model/pom.xml
index 63a1901..b6fb0f3 100644
--- a/doxia-decoration-model/pom.xml
+++ b/doxia-decoration-model/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sitetools</artifactId>
- <version>1.8.2-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/doxia-doc-renderer/pom.xml b/doxia-doc-renderer/pom.xml
index c5ab42c..d89056e 100644
--- a/doxia-doc-renderer/pom.xml
+++ b/doxia-doc-renderer/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>doxia-sitetools</artifactId>
<groupId>org.apache.maven.doxia</groupId>
- <version>1.8.2-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
index 6b580af..0d2ed50 100644
--- a/doxia-integration-tools/pom.xml
+++ b/doxia-integration-tools/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sitetools</artifactId>
- <version>1.8.2-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -48,7 +48,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
</dependency>
<!-- maven -->
diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
index 7ee07f1..362411b 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sitetools</artifactId>
- <version>1.8.2-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -132,7 +132,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -149,7 +149,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
index f487a6e..7896abc 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
@@ -179,7 +179,7 @@
p = (HtmlParagraph) elementIterator.next();
element = elementIterator.next();
- assertEquals( "tt", element.getTagName() );
+ assertEquals( "code", element.getTagName() );
assertEquals( "<source></source>", element.asText().trim() );
div = (HtmlDivision) elementIterator.next();
diff --git a/doxia-skin-model/pom.xml b/doxia-skin-model/pom.xml
index 4bbca87..2514a72 100644
--- a/doxia-skin-model/pom.xml
+++ b/doxia-skin-model/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sitetools</artifactId>
- <version>1.8.2-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 5ef49fb..2f8aad0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sitetools</artifactId>
- <version>1.8.2-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Doxia Sitetools</name>
@@ -69,7 +69,8 @@
</distributionManagement>
<properties>
- <doxiaVersion>1.8</doxiaVersion>
+ <javaVersion>7</javaVersion>
+ <doxiaVersion>1.9</doxiaVersion>
<maven.site.path>doxia-sitetools-archives/doxia-sitetools-LATEST</maven.site.path>
</properties>
@@ -136,6 +137,12 @@
<artifactId>doxia-skin-model</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- Commons -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.6</version>
+ </dependency>
<!-- Plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/src/site/resources/images/doxia-sitetools-deps.png b/src/site/resources/images/doxia-sitetools-deps.png
index a1555f8..410e33a 100644
--- a/src/site/resources/images/doxia-sitetools-deps.png
+++ b/src/site/resources/images/doxia-sitetools-deps.png
Binary files differ
diff --git a/src/site/xdoc/doxia-sitetools-deps.odg b/src/site/xdoc/doxia-sitetools-deps.odg
index dd50293..af3825b 100644
--- a/src/site/xdoc/doxia-sitetools-deps.odg
+++ b/src/site/xdoc/doxia-sitetools-deps.odg
Binary files differ
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 6e1c72a..818a2a6 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -32,24 +32,28 @@
<section name="Doxia Sitetools">
- <p>Doxia Sitetools is an extension of <a href="../doxia">base Doxia component</a> that generates either <b>HTML sites</b>,
- consisting of decoration and content that was generated by Doxia, or <b>documents</b> like RTF or PDF.</p>
+ <p>Doxia Sitetools is an extension of <a href="../doxia">base Doxia component</a> that generates:</p>
+ <ul>
+ <li>either <b>HTML sites</b>, adding decoration (header, footer, navigation bar, menu, ...) to content that was generated by Doxia:
+ a decoration is defined in a <b>site skin</b>,</li>
+ <li>or <b>documents</b> like RTF or PDF.</li>
+ </ul>
<p>In addition, Doxia Sitetools processes files with extra <code>.vm</code> extension with <a href="http://velocity.apache.org/">Velocity</a>.</p>
<p>
- <img src="images/doxia-sitetools-deps.png" width="599" height="250" border="0" usemap="#Doxia_sitetools_dependencies" alt="Doxia Sitetools Dependencies"/>
+ <img src="images/doxia-sitetools-deps.png" width="670" height="370" border="0" usemap="#Doxia_sitetools_dependencies" alt="Doxia Sitetools Dependencies"/>
<map name="Doxia_sitetools_dependencies" id="Doxia_sitetools_dependencies">
- <area shape="rect" coords="0,0,160,34" href="doxia-integration-tools/index.html" alt="Doxia Integration Tools"/>
- <area shape="rect" coords="166,0,306,34" href="doxia-site-renderer/index.html" alt="Doxia Site Renderer"/>
- <area shape="rect" coords="0,77,164,111" href="doxia-decoration-model/index.html" alt="Doxia Decoration Model"/>
- <area shape="rect" coords="115,121,231,154" href="doxia-skin-model/index.html" alt="Doxia Skin Model"/>
- <area shape="rect" coords="392,0,529,34" href="doxia-doc-renderer/index.html" alt="Doxia Document Renderer"/>
- <area shape="rect" coords="267,76,423,111" href="http://codehaus-plexus.github.io/plexus-velocity/" alt="Plexus Velocity"/>
- <area shape="rect" coords="297,133,393,168" href="http://velocity.apache.org" alt="Velocity"/>
- <area shape="rect" coords="166,182,306,217" href="/doxia/doxia/doxia-modules/doxia-module-xhtml/index.html" alt="Doxia Module XHTML"/>
- <area shape="rect" coords="339,183,453,217" href="/doxia/doxia/doxia-modules/doxia-module-fo/index.html" alt="Doxia Module FO"/>
- <area shape="rect" coords="456,183,590,217" href="/doxia/doxia/doxia-modules/doxia-module-itext/index.html" alt="Doxia Module iText"/>
- <area shape="rect" coords="158,178,598,249" href="/doxia/doxia/doxia-modules/index.html" alt="Doxia Modules"/>
+ <area shape="rect" coords="133,63,274,97" href="doxia-site-renderer/index.html" alt="Doxia Site Renderer"/>
+ <area shape="rect" coords="2,119,162,153" href="doxia-integration-tools/index.html" alt="Doxia Integration Tools"/>
+ <area shape="rect" coords="32,232,199,267" href="doxia-decoration-model/index.html" alt="Doxia Decoration Model"/>
+ <area shape="rect" coords="207,232,324,267" href="doxia-skin-model/index.html" alt="Doxia Skin Model"/>
+ <area shape="rect" coords="459,63,596,97" href="doxia-doc-renderer/index.html" alt="Doxia Document Renderer"/>
+ <area shape="rect" coords="288,123,444,159" href="http://codehaus-plexus.github.io/plexus-velocity/" alt="Plexus Velocity"/>
+ <area shape="rect" coords="318,180,414,214" href="http://velocity.apache.org" alt="Velocity"/>
+ <area shape="rect" coords="134,301,274,337" href="/doxia/doxia/doxia-modules/doxia-module-xhtml/index.html" alt="Doxia Module XHTML"/>
+ <area shape="rect" coords="409,301,524,336" href="/doxia/doxia/doxia-modules/doxia-module-fo/index.html" alt="Doxia Module FO"/>
+ <area shape="rect" coords="527,302,663,337" href="/doxia/doxia/doxia-modules/doxia-module-itext/index.html" alt="Doxia Module iText"/>
+ <area shape="rect" coords="126,297,669,369" href="/doxia/doxia/doxia-modules/index.html" alt="Doxia Modules"/>
</map>
</p>
