[maven-doxia-sitetools] 01/01: [DOXIASITETOOLS-207] Add "generator" meta tag in HTML head for default site template

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch DOXIASITETOOLS-207
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git

commit 352e2d8a790fc3311ba1d0b07df3a46f3e7e09c3
Author: Smaarn <an...@gmail.com>
AuthorDate: Sat Jun 15 14:47:24 2019 +0200

    [DOXIASITETOOLS-207] Add "generator" meta tag in HTML head for default site template
    
    This closes #9
---
 .../apache/maven/doxia/siterenderer/resources/default-site-macros.vm | 5 +++++
 .../org/apache/maven/doxia/siterenderer/resources/default-site.vm    | 3 ++-
 .../test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java  | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm
index bbe5572..056384e 100644
--- a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm
+++ b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm
@@ -490,3 +490,8 @@ $indent      </ul>##
     </script>
 #**##end
 #end
+##
+#macro( generatedBy )
+Apache Maven Doxia Site Renderer#if( $doxiaSiteRendererVersion ) $doxiaSiteRendererVersion#end
+#end
+##
\ No newline at end of file
diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
index de5b3c4..43265f1 100644
--- a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
+++ b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
@@ -17,7 +17,7 @@
 ## under the License.
 ##
 #parse( "default-site-macros.vm" )
-<!-- Generated by Apache Maven Doxia Site Renderer#if( $doxiaSiteRendererVersion ) $doxiaSiteRendererVersion#end##
+<!-- Generated by #generatedBy()
 #if( $docRenderingContext.generator || $docRenderingContext.doxiaSource ) from##
 #if( $docRenderingContext.generator ) $docRenderingContext.generator#end##
 #if( $docRenderingContext.doxiaSource ) $docRenderingContext.doxiaSourcePath#end##
@@ -33,6 +33,7 @@
       @import url("$relativePath/css/site.css");
     </style>
     <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
+    <meta name="generator" content="#generatedBy()" />
 #foreach( $author in $authors )
       <meta name="author" content="$author" />
 #end
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
index 0fa8d68..ce002f2 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
@@ -77,6 +77,11 @@ public class HeadVerifier
         assertNotNull( link );
 
         meta = (HtmlMeta) elementIterator.next();
+        assertEquals( "Unexpected meta entry found generated resource " + file, "generator", meta.getAttribute( "name" ) );
+        String generator = meta.getAttribute("content");
+        assertEquals("Unexpected value found for generator meta entry in generated resource " + file, "Apache Maven Doxia Site Renderer", generator);
+
+        meta = (HtmlMeta) elementIterator.next();
         assertEquals( "author", meta.getAttribute( "name" ) );
         assertEquals( "John Doe", meta.getAttribute( "content" ).trim() );