This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch DOXIASITETOOLS-208 in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit 8844b9f2a1555c818a5ec08480459358862f711b Author: Michael Osipov <[email protected]> AuthorDate: Sun Jun 16 22:15:43 2019 +0200 [DOXIASITETOOLS-208] Remove obsolete meta tags for default site template --- .../apache/maven/doxia/siterenderer/resources/default-site.vm | 3 --- .../java/org/apache/maven/doxia/siterenderer/HeadVerifier.java | 9 ++------- 2 files changed, 2 insertions(+), 10 deletions(-) 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 43265f1..8ec00d9 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 @@ -40,9 +40,6 @@ #if ( $documentDate ) <meta name="date" content="$documentDate" /> #end -#if ( $locale ) - <meta http-equiv="Content-Language" content="$locale.language" /> -#end #if( $decoration.body.head ) #**#$render.eval( $decoration.body.head ) #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 ce002f2..687a910 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 @@ -1,7 +1,5 @@ package org.apache.maven.doxia.siterenderer; -import com.gargoylesoftware.htmlunit.html.DomElement; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -29,7 +27,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlStyle; import com.gargoylesoftware.htmlunit.html.HtmlTitle; -import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -52,6 +49,8 @@ public class HeadVerifier HtmlElement html = page.getDocumentElement(); assertNotNull( html ); + assertEquals( "en", html.getAttribute( "lang" ) ); + List<HtmlElement> heads = html.getElementsByTagName( "head" ); assertEquals( 1, heads.size() ); HtmlElement head = heads.get( 0 ); @@ -86,10 +85,6 @@ public class HeadVerifier assertEquals( "John Doe", meta.getAttribute( "content" ).trim() ); meta = (HtmlMeta) elementIterator.next(); - assertEquals( "Content-Language", meta.getAttribute( "http-equiv" ) ); - assertEquals( "en", meta.getAttribute( "content" ) ); - - meta = (HtmlMeta) elementIterator.next(); assertEquals( "description", meta.getAttribute( "name" ) ); assertEquals( "Free Web tutorials", meta.getAttribute( "content" ) );
