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 2016/02/08 22:49:36 UTC
svn commit: r1729270 - in /maven/doxia/doxia-sitetools/trunk:
doxia-doc-renderer/src/test/resources/site/apt/ doxia-integration-tools/
doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/
doxia-site-renderer/src/site/apt/ src/site/
Author: hboutemy
Date: Mon Feb 8 21:49:36 2016
New Revision: 1729270
URL: http://svn.apache.org/viewvc?rev=1729270&view=rev
Log:
s/Doxia Site Tools/Doxia Sitetools/
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/test/resources/site/apt/overview.apt
maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/pom.xml
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm
maven/doxia/doxia-sitetools/trunk/src/site/site.xml
Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/test/resources/site/apt/overview.apt
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/test/resources/site/apt/overview.apt?rev=1729270&r1=1729269&r2=1729270&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/test/resources/site/apt/overview.apt (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/test/resources/site/apt/overview.apt Mon Feb 8 21:49:36 2016
@@ -92,9 +92,9 @@ void parse( Reader source, Sink sink )
For more information on modules, read the {{{./modules/index.html}Doxia Module Guide}}.
-*Doxia Site Tools
+*Doxia Sitetools
- The <Site Tools> are a collection of tools to renderer an output. The main tool used by Maven,
+ The <Sitetools> are a collection of tools to renderer an output. The main tool used by Maven,
specifically the {{{http://maven.apache.org/plugins/maven-site-plugin/}Maven Site Plugin}}, is the
<doxia-site-renderer> which renders in HTML any documents wrote with supported markup syntax. It used
{{{http://velocity.apache.org/}Velocity templates}} to customize the renderer and the
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=1729270&r1=1729269&r2=1729270&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/pom.xml Mon Feb 8 21:49:36 2016
@@ -32,7 +32,7 @@
<artifactId>doxia-integration-tools</artifactId>
<name>Doxia :: Integration Tools</name>
- <description>A collection of tools to help the integration of Doxia Site Tools in Maven plugins.</description>
+ <description>A collection of tools to help the integration of Doxia Sitetools in Maven plugins.</description>
<properties>
<mavenVersion>2.2.1</mavenVersion>
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1729270&r1=1729269&r2=1729270&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java Mon Feb 8 21:49:36 2016
@@ -776,7 +776,7 @@ public class DefaultSiteRenderer
&& !matchVersion( current, toolsPrerequisite ) )
{
throw new RendererException( "Cannot use skin: has " + toolsPrerequisite
- + " Doxia Site Tools prerequisite, but current is " + current );
+ + " Doxia Sitetools prerequisite, but current is " + current );
}
}
}
@@ -824,6 +824,12 @@ public class DefaultSiteRenderer
matched = ( compareTo <= 0 );
}
+ if ( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "Skin doxia-site-tools prerequisite: " + prerequisite + ", current: " + current
+ + ", matched = " + matched );
+ }
+
return matched;
}
catch ( InvalidVersionSpecificationException e )
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm?rev=1729270&r1=1729269&r2=1729270&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm Mon Feb 8 21:49:36 2016
@@ -27,7 +27,7 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Doxia Site Tools - Site Renderer
+Doxia Sitetools - Site Renderer
The Site Renderer handles the rendering of sites, assembling a common site decoration (also called <a skin>)
with a collection of documents.
Modified: maven/doxia/doxia-sitetools/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/src/site/site.xml?rev=1729270&r1=1729269&r2=1729270&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/src/site/site.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/src/site/site.xml Mon Feb 8 21:49:36 2016
@@ -21,7 +21,7 @@
*/
-->
-<project name="Doxia Site Tools" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project name="Doxia Sitetools" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<bannerRight>
@@ -42,7 +42,7 @@
<breadcrumbs>
<item name="Doxia" href="http://maven.apache.org/doxia/index.html" />
- <item name="Doxia Site Tools" href="http://maven.apache.org/doxia/doxia-sitetools/index.html" />
+ <item name="Doxia Sitetools" href="http://maven.apache.org/doxia/doxia-sitetools/index.html" />
</breadcrumbs>
<menu name="Overview">