You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2015/12/09 12:55:42 UTC
svn commit: r1718824 - in /maven/doxia/doxia-sitetools/trunk: ./
doxia-decoration-model/ doxia-integration-tools/ src/site/resources/images/
src/site/xdoc/
Author: hboutemy
Date: Wed Dec 9 11:55:42 2015
New Revision: 1718824
URL: http://svn.apache.org/viewvc?rev=1718824&view=rev
Log:
[DOXIATOOLS-53] moved doxia-integration-tools to doxia-sitetools
Added:
maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/
- copied from r1718819, maven/doxia/doxia-tools/trunk/doxia-integration-tools/
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml
maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/pom.xml
maven/doxia/doxia-sitetools/trunk/pom.xml
maven/doxia/doxia-sitetools/trunk/src/site/resources/images/doxia-sitetools-deps.png
maven/doxia/doxia-sitetools/trunk/src/site/xdoc/doxia-sitetools-deps.odg
maven/doxia/doxia-sitetools/trunk/src/site/xdoc/index.xml
Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml?rev=1718824&r1=1718823&r2=1718824&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml Wed Dec 9 11:55:42 2015
@@ -23,8 +23,8 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>doxia-sitetools</artifactId>
<groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sitetools</artifactId>
<version>1.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/pom.xml?rev=1718824&r1=1718819&r2=1718824&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/pom.xml Wed Dec 9 11:55:42 2015
@@ -24,40 +24,17 @@
<parent>
<groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-tools</artifactId>
- <version>30-SNAPSHOT</version>
- <relativePath>../../../pom/maven/doxia-tools/pom.xml</relativePath>
+ <artifactId>doxia-sitetools</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>doxia-integration-tools</artifactId>
- <version>1.7-SNAPSHOT</version>
<name>Doxia :: Integration Tools</name>
- <description>A collection of tools to help the integration of Doxia in Maven plugins.</description>
-
- <prerequisites>
- <maven>2.2.1</maven>
- </prerequisites>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-integration-tools/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-integration-tools/</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/</url>
- </scm>
- <issueManagement>
- <system>jira</system>
- <url>https://issues.apache.org/jira/browse/DOXIATOOLS/component/12326008</url>
- </issueManagement>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven-doxia/content/${maven.site.path}</url>
- </site>
- </distributionManagement>
+ <description>A collection of tools to help the integration of Doxia Site Tools in Maven plugins.</description>
<properties>
- <doxiaVersion>1.6</doxiaVersion>
- <doxiaSitetoolsVersion>1.6</doxiaSitetoolsVersion>
<mavenVersion>2.2.1</mavenVersion>
</properties>
@@ -107,14 +84,12 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-logging-api</artifactId>
- <version>${doxiaVersion}</version>
</dependency>
<!-- doxia-sitetools -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-decoration-model</artifactId>
- <version>${doxiaSitetoolsVersion}</version>
</dependency>
<!-- Plexus -->
Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=1718824&r1=1718823&r2=1718824&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Wed Dec 9 11:55:42 2015
@@ -46,6 +46,7 @@ under the License.
<modules>
<module>doxia-decoration-model</module>
<module>doxia-doc-renderer</module>
+ <module>doxia-integration-tools</module>
<module>doxia-site-renderer</module>
</modules>
Modified: maven/doxia/doxia-sitetools/trunk/src/site/resources/images/doxia-sitetools-deps.png
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/src/site/resources/images/doxia-sitetools-deps.png?rev=1718824&r1=1718823&r2=1718824&view=diff
==============================================================================
Binary files - no diff available.
Modified: maven/doxia/doxia-sitetools/trunk/src/site/xdoc/doxia-sitetools-deps.odg
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/src/site/xdoc/doxia-sitetools-deps.odg?rev=1718824&r1=1718823&r2=1718824&view=diff
==============================================================================
Binary files - no diff available.
Modified: maven/doxia/doxia-sitetools/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/src/site/xdoc/index.xml?rev=1718824&r1=1718823&r2=1718824&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/src/site/xdoc/index.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/src/site/xdoc/index.xml Wed Dec 9 11:55:42 2015
@@ -32,22 +32,23 @@
<section name="Doxia Sitetools">
- <p>Doxia Sitetools is an extension of <a href="../doxia">base Doxia component</a> that generates either sites,
- consisting of decoration and content that was generated by Doxia, or documents like RTF or PDF.</p>
+ <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>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="508" height="201" border="0" usemap="#Doxia_sitetools_dependencies" alt="Doxia Sitetools Dependencies"/>
+ <img src="images/doxia-sitetools-deps.png" width="599" height="250" border="0" usemap="#Doxia_sitetools_dependencies" alt="Doxia Sitetools Dependencies"/>
<map name="Doxia_sitetools_dependencies" id="Doxia_sitetools_dependencies">
- <area shape="rect" coords="19,0,146,32" href="doxia-site-renderer/" alt="Doxia Site Renderer"/>
- <area shape="rect" coords="322,0,445,32" href="doxia-doc-renderer/" alt="Doxia Document Renderer"/>
- <area shape="rect" coords="0,169,165,201" href="doxia-decoration-model/" alt="Doxia Decoration Model"/>
- <area shape="rect" coords="163,0,304,32" href="http://plexus.codehaus.org/plexus-components/plexus-velocity/" alt="Plexus Velocity"/>
- <area shape="rect" coords="190,49,277,81" href="http://velocity.apache.org" alt="Velocity"/>
- <area shape="rect" coords="111,91,236,123" href="/doxia/doxia/doxia-modules/doxia-module-xhtml/" alt="Doxia Module XHTML"/>
- <area shape="rect" coords="273,91,376,123" href="/doxia/doxia/doxia-modules/doxia-module-fo/" alt="Doxia Module FO"/>
- <area shape="rect" coords="379,91,501,123" href="/doxia/doxia/doxia-modules/doxia-module-itext/" alt="Doxia Module iText"/>
- <area shape="rect" coords="103,86,508,153" href="/doxia/doxia/doxia-modules/" alt="Doxia Modules"/>
+ <area shape="rect" coords="0,0,160,34" href="doxia-integration-tools/" alt="Doxia Integration Tools"/>
+ <area shape="rect" coords="166,0,306,34" href="doxia-site-renderer/" alt="Doxia Site Renderer"/>
+ <area shape="rect" coords="66,76,231,110" href="doxia-decoration-model/" alt="Doxia Decoration Model"/>
+ <area shape="rect" coords="392,0,529,34" href="doxia-doc-renderer/" 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/" alt="Doxia Module XHTML"/>
+ <area shape="rect" coords="339,183,453,217" href="/doxia/doxia/doxia-modules/doxia-module-fo/" alt="Doxia Module FO"/>
+ <area shape="rect" coords="456,183,590,217" href="/doxia/doxia/doxia-modules/doxia-module-itext/" alt="Doxia Module iText"/>
+ <area shape="rect" coords="158,178,598,249" href="/doxia/doxia/doxia-modules/" alt="Doxia Modules"/>
</map>
</p>