Author: simonetripodi
Date: Tue Oct 18 15:19:33 2011
New Revision: 1185717
URL: http://svn.apache.org/viewvc?rev=1185717&view=rev
Log:
DOXIA-150 resolved, no needs to implement turnaround anymore!
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Modified:
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1185717&r1=1185716&r2=1185717&view=diff
==============================================================================
---
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Tue Oct 18 15:19:33 2011
@@ -1,12 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<!-- Generated by Apache Maven Doxia at $dateFormat.format( $currentDate ) -->
-## Remove extraneous header from custom entries
-## See DOXIA-150
-#set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' )
-#macro ( removeheader $text )
-#set ( $text = $StringUtils.replace( $text, $documentHeader, '' ) )
-#end
-
#macro ( topMenu $menus )
#foreach( $menu in $menus )
#if ( $menu.name )
@@ -507,12 +500,7 @@
#if ( $decoration.body.head )
#foreach( $item in $decoration.body.head.getChildren() )
- ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
- ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
- ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
-
#set ( $head = $item.toString().trim() )
- #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' )
#if ( $item.name == "script" )
#set ( $head = $StringUtils.replace( $item.toUnescapedString(),
$documentHeader, "" ) )
@@ -641,7 +629,6 @@
#if ( $decoration.custom.getChild("footer") )
#foreach( $item in
$decoration.custom.getChild("footer").getChildren() )
#set ( $foot = $item.toString().trim() )
- #removeheader ( $foot )
<p>$StringUtils.replace( $foot, '@project.name@', ${project.name}
)</p>
#end
#end
