Author: olamy
Date: Sat Feb 23 16:11:01 2013
New Revision: 1449348
URL: http://svn.apache.org/r1449348
Log:
[MSKINS-78] change parameter name and restore generation per default.
Modified:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/verify.groovy
maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/src/site/site.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/verify.groovy
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/src/site/site.xml?rev=1449348&r1=1449347&r2=1449348&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/src/site/site.xml
(original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/src/site/site.xml Sat
Feb 23 16:11:01 2013
@@ -31,12 +31,6 @@
<version>${skinVersion}</version>
</skin>
- <custom>
- <fluidoSkin>
- <doxiaTimeStamp>true</doxiaTimeStamp>
- </fluidoSkin>
- </custom>
-
<body>
<menu>
<item name="Suppress line wrapping in navigation caused by spaces or
hyphens" href="./"/>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/verify.groovy?rev=1449348&r1=1449347&r2=1449348&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/verify.groovy
(original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-10/verify.groovy Sat Feb
23 16:11:01 2013
@@ -1,3 +1,3 @@
File index = new File( basedir, "target/site/index.html" )
assert index.exists()
-assert 1 == index.getText().count( 'Generated by Apache Maven Doxia')
\ No newline at end of file
+assert 1 == index.getText().count( 'Generated by Apache Maven Doxia at')
\ No newline at end of file
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/src/site/site.xml?rev=1449348&r1=1449347&r2=1449348&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/src/site/site.xml
(original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/src/site/site.xml Sat
Feb 23 16:11:01 2013
@@ -36,6 +36,7 @@
<topBarEnabled>true</topBarEnabled>
<sideBarEnabled>false</sideBarEnabled>
<googleSearch/>
+ <skipGenerationDate>true</skipGenerationDate>
</fluidoSkin>
</custom>
Modified: maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/verify.groovy?rev=1449348&r1=1449347&r2=1449348&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/verify.groovy
(original)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-13/verify.groovy Sat Feb
23 16:11:01 2013
@@ -1,3 +1,3 @@
File index = new File( basedir, "target/site/index.html" )
assert index.exists()
-assert 0 == index.getText().count( 'Generated by Apache Maven Doxia')
\ No newline at end of file
+assert 0 == index.getText().count( 'Generated by Apache Maven Doxia at')
\ No newline at end of file
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1449348&r1=1449347&r2=1449348&view=diff
==============================================================================
---
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Sat Feb 23 16:11:01 2013
@@ -1,9 +1,13 @@
<!DOCTYPE html>
<!--
- #if ( $decoration.custom.getChild( 'fluidoSkin' ) &&
$decoration.custom.getChild( 'fluidoSkin' ).getChild('doxiaTimeStamp')
- && $decoration.custom.getChild( 'fluidoSkin'
).getChild('doxiaTimeStamp').getValue()=='true')
- | Generated by Apache Maven Doxia#if( $doxiaVersion ) $doxiaVersion#end at
$dateFormat.format( $currentDate )
+ #set ( $skipGenerationDate = 'false')
+ #if ( $decoration.custom.getChild( 'fluidoSkin' ) &&
$decoration.custom.getChild( 'fluidoSkin' ).getChild('skipGenerationDate')
+ && $decoration.custom.getChild( 'fluidoSkin'
).getChild('skipGenerationDate').getValue()=='true')
+ #set ( $skipGenerationDate = 'true')
#end
+
+ | Generated by Apache Maven Doxia#if( $doxiaVersion ) $doxiaVersion #end #if
($skipGenerationDate == 'false')at $dateFormat.format( $currentDate ) #end
+
| Rendered using Apache Maven Fluido Skin @project.version@
-->
#macro ( topMenu $menus )
Modified: maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm?rev=1449348&r1=1449347&r2=1449348&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm (original)
+++ maven/skins/trunk/maven-fluido-skin/src/site/apt/index.apt.vm Sat Feb 23
16:11:01 2013
@@ -474,9 +474,9 @@ Welcome to ${project.name}!
By default, it is rendered in the sidebar, if the topbar only is available it
will be rendered there.
-** Doxia Timestamp
+** Skip Generation Date
- Since version <<1.3.1>>, the line containing "Generated by Apache Maven
Doxia at Feb 8, 2013" is not generated anymore per default.
+ Since version <<1.3.1>>, you can skip generation date from the line
"Generated by Apache Maven Doxia at Feb 8, 2013"
To enable it:
+-----+
@@ -484,7 +484,7 @@ Welcome to ${project.name}!
[...]
<custom>
<fluidoSkin>
- <doxiaTimeStamp>true</doxiaTimeStamp>
+ <skipGenerationDate>true</skipGenerationDate>
</fluidoSkin>
</custom>
[...]
