Author: hboutemy
Date: Wed Dec 30 02:23:49 2015
New Revision: 1722259
URL: http://svn.apache.org/viewvc?rev=1722259&view=rev
Log:
[DOXIASITETOOLS-101] removed isoDateFormat from Velocity site rendering context
since $date generic tool makes the job
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm
maven/plugins/trunk/maven-site-plugin/src/it/template-skin/src/main/resources/META-INF/maven/site.vm
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm?rev=1722259&r1=1722258&r2=1722259&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm
Wed Dec 30 02:23:49 2015
@@ -39,9 +39,8 @@ Doxia Site Renderer Velocity Context
*-----------------------+-------------------------------------------------------+
| <<<decoration>>> | <<<decoration.name>>> = <<<$decoration.name>>>
*-----------------------+-------------------------------------------------------+
-| <<<currentDate>>> | = <<<$currentDate>>>
+| <<<currentDate>>> | = <<<$currentDate>>> \
| | <<<dateFormat.format(currentDate)>>> =
<<<$dateFormat.format($currentDate)>>>
-| | <<<isoDateFormat.format(currentDate)>>> =
<<<$isoDateFormat.format($currentDate)>>>
*-----------------------+-------------------------------------------------------+
| <<<currentFileName>>> | = <<<$currentFileName>>>
*-----------------------+-------------------------------------------------------+
@@ -51,8 +50,6 @@ Doxia Site Renderer Velocity Context
*-----------------------+-------------------------------------------------------+
| <<<doxiaSiteRendererVersion>>> | = <<<$doxiaSiteRendererVersion>>>
*-----------------------+-------------------------------------------------------+
-| <<<isoDateFormat>>> | = <<<$isoDateFormat>>>
-*-----------------------+-------------------------------------------------------+
| <<<locale>>> | = <<<$locale>>>
*-----------------------+-------------------------------------------------------+
| <<<publishDate>>> | = <<<$publishDate>>>
@@ -85,7 +82,7 @@ Doxia Site Renderer Velocity Context
*-----------------------+-------------------------------------------------------+
| <<<outputEncoding>>> | = <<<$outputEncoding>>>
*-----------------------+-------------------------------------------------------+
-| <<<project>>> | = <<<$project>>>,
+| <<<project>>> | = <<<$project>>>, \
| | <<<project.version>>> = <<<$project.version>>>
*-----------------------+-------------------------------------------------------+
| <<<property-project-version>>> | = <<<${property-project-version}>>>
@@ -106,7 +103,8 @@ Doxia Site Renderer Velocity Context
*-----------------------+-------------------------------------------------------+
| <<<convert>>> | = <<<$convert>>>
*-----------------------+-------------------------------------------------------+
-| <<<date>>> | = <<<$date>>>
+| <<<date>>> | = <<<$date>>> \
+| | <<<\$date.format('yyyy-MM-dd', \$currentDate) =
$date.format('yyyy-MM-dd', $currentDate)>>>
*-----------------------+-------------------------------------------------------+
| <<<display>>> | = <<<$display>>>
*-----------------------+-------------------------------------------------------+
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/template-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/template-skin/src/main/resources/META-INF/maven/site.vm?rev=1722259&r1=1722258&r2=1722259&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/template-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/template-skin/src/main/resources/META-INF/maven/site.vm
Wed Dec 30 02:23:49 2015
@@ -65,6 +65,7 @@ xml=$xml
context (cause NullPointerException)
link (cause NullPointerException)
</pre>
+\$date.format('yyyy-MM-dd', \$currentDate) = $date.format('yyyy-MM-dd',
$currentDate)
<h3>Site template-specific variables</h3>
<pre>
