Modified: 
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/xref/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.html
==============================================================================
--- 
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/xref/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.html
 (original)
+++ 
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/xref/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.html
 Mon Dec 28 15:13:00 2015
@@ -99,7 +99,7 @@
 <a class="jxr_linenumber" name="L91" href="#L91">91</a>  <em 
class="jxr_javadoccomment"> *</em>
 <a class="jxr_linenumber" name="L92" href="#L92">92</a>  <em 
class="jxr_javadoccomment"> * @author &lt;a href="<a 
href="mailto:eveni...@codehaus.org"; 
target="alexandria_uri">mailto:eveni...@codehaus.org</a>"&gt;Emmanuel 
Venisse&lt;/a&gt;</em>
 <a class="jxr_linenumber" name="L93" href="#L93">93</a>  <em 
class="jxr_javadoccomment"> * @author &lt;a href="<a 
href="mailto:vincent.sive...@gmail.com"; 
target="alexandria_uri">mailto:vincent.sive...@gmail.com</a>"&gt;Vincent 
Siveton&lt;/a&gt;</em>
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>  <em 
class="jxr_javadoccomment"> * @version $Id: DefaultSiteRenderer.java 1720954 
2015-12-19 17:36:18Z hboutemy $</em>
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  <em 
class="jxr_javadoccomment"> * @version $Id: DefaultSiteRenderer.java 1721932 
2015-12-28 15:06:53Z hboutemy $</em>
 <a class="jxr_linenumber" name="L95" href="#L95">95</a>  <em 
class="jxr_javadoccomment"> * @since 1.0</em>
 <a class="jxr_linenumber" name="L96" href="#L96">96</a>  <em 
class="jxr_javadoccomment"> */</em>
 <a class="jxr_linenumber" name="L97" href="#L97">97</a>  @Component( role = 
Renderer.<strong class="jxr_keyword">class</strong> )
@@ -346,611 +346,654 @@
 <a class="jxr_linenumber" name="L338" href="#L338">338</a>                 {
 <a class="jxr_linenumber" name="L339" href="#L339">339</a>                     
SiteResourceLoader.setResource( resource );
 <a class="jxr_linenumber" name="L340" href="#L340">340</a> 
-<a class="jxr_linenumber" name="L341" href="#L341">341</a>                     
Context vc = createDocumentVelocityContext( sink, siteContext );
+<a class="jxr_linenumber" name="L341" href="#L341">341</a>                     
Context vc = createDocumentVelocityContext( renderingContext, siteContext );
 <a class="jxr_linenumber" name="L342" href="#L342">342</a> 
 <a class="jxr_linenumber" name="L343" href="#L343">343</a>                     
StringWriter sw = <strong class="jxr_keyword">new</strong> StringWriter();
 <a class="jxr_linenumber" name="L344" href="#L344">344</a> 
 <a class="jxr_linenumber" name="L345" href="#L345">345</a>                     
velocity.getEngine().mergeTemplate( resource, siteContext.getInputEncoding(), 
vc, sw );
 <a class="jxr_linenumber" name="L346" href="#L346">346</a> 
-<a class="jxr_linenumber" name="L347" href="#L347">347</a>                     
reader = <strong class="jxr_keyword">new</strong> StringReader( sw.toString() );
-<a class="jxr_linenumber" name="L348" href="#L348">348</a>                     
<strong class="jxr_keyword">if</strong> ( parser.getType() == Parser.XML_TYPE 
&amp;&amp; siteContext.isValidate() )
-<a class="jxr_linenumber" name="L349" href="#L349">349</a>                     
{
-<a class="jxr_linenumber" name="L350" href="#L350">350</a>                     
    reader = validate( reader, resource );
-<a class="jxr_linenumber" name="L351" href="#L351">351</a>                     
}
-<a class="jxr_linenumber" name="L352" href="#L352">352</a>                 }
-<a class="jxr_linenumber" name="L353" href="#L353">353</a>                 
<strong class="jxr_keyword">catch</strong> ( Exception e )
-<a class="jxr_linenumber" name="L354" href="#L354">354</a>                 {
-<a class="jxr_linenumber" name="L355" href="#L355">355</a>                     
<strong class="jxr_keyword">if</strong> ( getLogger().isDebugEnabled() )
-<a class="jxr_linenumber" name="L356" href="#L356">356</a>                     
{
-<a class="jxr_linenumber" name="L357" href="#L357">357</a>                     
    getLogger().error( <span class="jxr_string">"Error parsing "</span> + 
resource + <span class="jxr_string">" as a velocity template, using as 
text."</span>, e );
-<a class="jxr_linenumber" name="L358" href="#L358">358</a>                     
}
-<a class="jxr_linenumber" name="L359" href="#L359">359</a>                     
<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L360" href="#L360">360</a>                     
{
-<a class="jxr_linenumber" name="L361" href="#L361">361</a>                     
    getLogger().error( <span class="jxr_string">"Error parsing "</span> + 
resource + <span class="jxr_string">" as a velocity template, using as 
text."</span> );
-<a class="jxr_linenumber" name="L362" href="#L362">362</a>                     
}
-<a class="jxr_linenumber" name="L363" href="#L363">363</a>                 }
-<a class="jxr_linenumber" name="L364" href="#L364">364</a>             }
-<a class="jxr_linenumber" name="L365" href="#L365">365</a>             <strong 
class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L366" href="#L366">366</a>             {
-<a class="jxr_linenumber" name="L367" href="#L367">367</a>                 
<strong class="jxr_keyword">switch</strong> ( parser.getType() )
-<a class="jxr_linenumber" name="L368" href="#L368">368</a>                 {
-<a class="jxr_linenumber" name="L369" href="#L369">369</a>                     
<strong class="jxr_keyword">case</strong> Parser.XML_TYPE:
-<a class="jxr_linenumber" name="L370" href="#L370">370</a>                     
    reader = ReaderFactory.newXmlReader( doc );
-<a class="jxr_linenumber" name="L371" href="#L371">371</a>                     
    <strong class="jxr_keyword">if</strong> ( siteContext.isValidate() )
-<a class="jxr_linenumber" name="L372" href="#L372">372</a>                     
    {
-<a class="jxr_linenumber" name="L373" href="#L373">373</a>                     
        reader = validate( reader, resource );
-<a class="jxr_linenumber" name="L374" href="#L374">374</a>                     
    }
-<a class="jxr_linenumber" name="L375" href="#L375">375</a>                     
    <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> 
-<a class="jxr_linenumber" name="L377" href="#L377">377</a>                     
<strong class="jxr_keyword">case</strong> Parser.TXT_TYPE:
-<a class="jxr_linenumber" name="L378" href="#L378">378</a>                     
<strong class="jxr_keyword">case</strong> Parser.UNKNOWN_TYPE:
-<a class="jxr_linenumber" name="L379" href="#L379">379</a>                     
<strong class="jxr_keyword">default</strong>:
-<a class="jxr_linenumber" name="L380" href="#L380">380</a>                     
    reader = ReaderFactory.newReader( doc, siteContext.getInputEncoding() );
-<a class="jxr_linenumber" name="L381" href="#L381">381</a>                 }
-<a class="jxr_linenumber" name="L382" href="#L382">382</a>             }
-<a class="jxr_linenumber" name="L383" href="#L383">383</a>             
sink.enableLogging( <strong class="jxr_keyword">new</strong> 
PlexusLoggerWrapper( getLogger() ) );
-<a class="jxr_linenumber" name="L384" href="#L384">384</a> 
-<a class="jxr_linenumber" name="L385" href="#L385">385</a>             <strong 
class="jxr_keyword">if</strong> ( reader == <strong 
class="jxr_keyword">null</strong> ) <em class="jxr_comment">// can happen if 
velocity throws above</em>
-<a class="jxr_linenumber" name="L386" href="#L386">386</a>             {
-<a class="jxr_linenumber" name="L387" href="#L387">387</a>                 
<strong class="jxr_keyword">throw</strong> <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>(
 <span class="jxr_string">"Error getting a parser for '"</span> + doc + <span 
class="jxr_string">"'"</span> );
+<a class="jxr_linenumber" name="L347" href="#L347">347</a>                     
String doxiaContent = sw.toString();
+<a class="jxr_linenumber" name="L348" href="#L348">348</a> 
+<a class="jxr_linenumber" name="L349" href="#L349">349</a>                     
<strong class="jxr_keyword">if</strong> ( 
siteContext.getVelocityDocumentOutput() != <strong 
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L350" href="#L350">350</a>                     
{
+<a class="jxr_linenumber" name="L351" href="#L351">351</a>                     
    <em class="jxr_comment">// save Velocity processing result, ie the Doxia 
content that will be parsed after</em>
+<a class="jxr_linenumber" name="L352" href="#L352">352</a>                     
    <strong class="jxr_keyword">if</strong> ( 
!siteContext.getVelocityDocumentOutput().exists() )
+<a class="jxr_linenumber" name="L353" href="#L353">353</a>                     
    {
+<a class="jxr_linenumber" name="L354" href="#L354">354</a>                     
        siteContext.getVelocityDocumentOutput().mkdirs();
+<a class="jxr_linenumber" name="L355" href="#L355">355</a>                     
    }
+<a class="jxr_linenumber" name="L356" href="#L356">356</a> 
+<a class="jxr_linenumber" name="L357" href="#L357">357</a>                     
    String input = renderingContext.getInputName();
+<a class="jxr_linenumber" name="L358" href="#L358">358</a>                     
    File outputFile = <strong class="jxr_keyword">new</strong> File( 
siteContext.getVelocityDocumentOutput(),
+<a class="jxr_linenumber" name="L359" href="#L359">359</a>                     
                                input.substring( 0, input.length() - 3 ) );
+<a class="jxr_linenumber" name="L360" href="#L360">360</a> 
+<a class="jxr_linenumber" name="L361" href="#L361">361</a>                     
    File outputParent = outputFile.getParentFile();
+<a class="jxr_linenumber" name="L362" href="#L362">362</a>                     
    <strong class="jxr_keyword">if</strong> ( !outputParent.exists() )
+<a class="jxr_linenumber" name="L363" href="#L363">363</a>                     
    {
+<a class="jxr_linenumber" name="L364" href="#L364">364</a>                     
        outputParent.mkdirs();
+<a class="jxr_linenumber" name="L365" href="#L365">365</a>                     
    }
+<a class="jxr_linenumber" name="L366" href="#L366">366</a> 
+<a class="jxr_linenumber" name="L367" href="#L367">367</a>                     
    FileUtils.fileWrite( outputFile, siteContext.getInputEncoding(), 
doxiaContent );
+<a class="jxr_linenumber" name="L368" href="#L368">368</a>                     
}
+<a class="jxr_linenumber" name="L369" href="#L369">369</a> 
+<a class="jxr_linenumber" name="L370" href="#L370">370</a>                     
reader = <strong class="jxr_keyword">new</strong> StringReader( doxiaContent );
+<a class="jxr_linenumber" name="L371" href="#L371">371</a>                 }
+<a class="jxr_linenumber" name="L372" href="#L372">372</a>                 
<strong class="jxr_keyword">catch</strong> ( Exception e )
+<a class="jxr_linenumber" name="L373" href="#L373">373</a>                 {
+<a class="jxr_linenumber" name="L374" href="#L374">374</a>                     
<strong class="jxr_keyword">if</strong> ( getLogger().isDebugEnabled() )
+<a class="jxr_linenumber" name="L375" href="#L375">375</a>                     
{
+<a class="jxr_linenumber" name="L376" href="#L376">376</a>                     
    getLogger().error( <span class="jxr_string">"Error parsing "</span> + 
resource + <span class="jxr_string">" as a velocity template, using as 
text."</span>, e );
+<a class="jxr_linenumber" name="L377" href="#L377">377</a>                     
}
+<a class="jxr_linenumber" name="L378" href="#L378">378</a>                     
<strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L379" href="#L379">379</a>                     
{
+<a class="jxr_linenumber" name="L380" href="#L380">380</a>                     
    getLogger().error( <span class="jxr_string">"Error parsing "</span> + 
resource + <span class="jxr_string">" as a velocity template, using as 
text."</span> );
+<a class="jxr_linenumber" name="L381" href="#L381">381</a>                     
}
+<a class="jxr_linenumber" name="L382" href="#L382">382</a>                 }
+<a class="jxr_linenumber" name="L383" href="#L383">383</a> 
+<a class="jxr_linenumber" name="L384" href="#L384">384</a>                 
<strong class="jxr_keyword">if</strong> ( parser.getType() == Parser.XML_TYPE 
&amp;&amp; siteContext.isValidate() )
+<a class="jxr_linenumber" name="L385" href="#L385">385</a>                 {
+<a class="jxr_linenumber" name="L386" href="#L386">386</a>                     
reader = validate( reader, resource );
+<a class="jxr_linenumber" name="L387" href="#L387">387</a>                 }
 <a class="jxr_linenumber" name="L388" href="#L388">388</a>             }
-<a class="jxr_linenumber" name="L389" href="#L389">389</a>             
doxia.parse( reader, renderingContext.getParserId(), sink );
-<a class="jxr_linenumber" name="L390" href="#L390">390</a>         }
-<a class="jxr_linenumber" name="L391" href="#L391">391</a>         <strong 
class="jxr_keyword">catch</strong> ( ParserNotFoundException e )
-<a class="jxr_linenumber" name="L392" href="#L392">392</a>         {
-<a class="jxr_linenumber" name="L393" href="#L393">393</a>             <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>(
 <span class="jxr_string">"Error getting a parser for '"</span> + doc + <span 
class="jxr_string">"': "</span> + e.getMessage(), e );
-<a class="jxr_linenumber" name="L394" href="#L394">394</a>         }
-<a class="jxr_linenumber" name="L395" href="#L395">395</a>         <strong 
class="jxr_keyword">catch</strong> ( ParseException e )
-<a class="jxr_linenumber" name="L396" href="#L396">396</a>         {
-<a class="jxr_linenumber" name="L397" href="#L397">397</a>             <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>(
 <span class="jxr_string">"Error parsing '"</span>
-<a class="jxr_linenumber" name="L398" href="#L398">398</a>                     
+ doc + <span class="jxr_string">"': line ["</span> + e.getLineNumber() + <span 
class="jxr_string">"] "</span> + e.getMessage(), e );
-<a class="jxr_linenumber" name="L399" href="#L399">399</a>         }
-<a class="jxr_linenumber" name="L400" href="#L400">400</a>         <strong 
class="jxr_keyword">catch</strong> ( IOException e )
-<a class="jxr_linenumber" name="L401" href="#L401">401</a>         {
-<a class="jxr_linenumber" name="L402" href="#L402">402</a>             <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>(
 <span class="jxr_string">"IOException when processing '"</span> + doc + <span 
class="jxr_string">"'"</span>, e );
-<a class="jxr_linenumber" name="L403" href="#L403">403</a>         }
-<a class="jxr_linenumber" name="L404" href="#L404">404</a>         <strong 
class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L405" href="#L405">405</a>         {
-<a class="jxr_linenumber" name="L406" href="#L406">406</a>             
sink.flush();
-<a class="jxr_linenumber" name="L407" href="#L407">407</a> 
-<a class="jxr_linenumber" name="L408" href="#L408">408</a>             
sink.close();
-<a class="jxr_linenumber" name="L409" href="#L409">409</a> 
-<a class="jxr_linenumber" name="L410" href="#L410">410</a>             
IOUtil.close( reader );
-<a class="jxr_linenumber" name="L411" href="#L411">411</a>         }
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> 
-<a class="jxr_linenumber" name="L413" href="#L413">413</a>         
generateDocument( writer, sink, siteContext );
-<a class="jxr_linenumber" name="L414" href="#L414">414</a>     }
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> 
-<a class="jxr_linenumber" name="L416" href="#L416">416</a>     <em 
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> <em 
class="jxr_javadoccomment">     * Create a Velocity Context for a Doxia 
document, containing every information about rendered document.</em>
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> <em 
class="jxr_javadoccomment">     * </em>
-<a class="jxr_linenumber" name="L419" href="#L419">419</a> <em 
class="jxr_javadoccomment">     * @param sink the site renderer sink for the 
document</em>
-<a class="jxr_linenumber" name="L420" href="#L420">420</a> <em 
class="jxr_javadoccomment">     * @param siteRenderingContext the site 
rendering context</em>
-<a class="jxr_linenumber" name="L421" href="#L421">421</a> <em 
class="jxr_javadoccomment">     * @return</em>
-<a class="jxr_linenumber" name="L422" href="#L422">422</a> <em 
class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L423" href="#L423">423</a>     <strong 
class="jxr_keyword">protected</strong> Context createDocumentVelocityContext( 
SiteRendererSink sink, SiteRenderingContext siteRenderingContext )
-<a class="jxr_linenumber" name="L424" href="#L424">424</a>     {
-<a class="jxr_linenumber" name="L425" href="#L425">425</a>         ToolManager 
toolManager = <strong class="jxr_keyword">new</strong> ToolManager( <strong 
class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="L426" href="#L426">426</a>         Context 
context = toolManager.createContext();
-<a class="jxr_linenumber" name="L427" href="#L427">427</a> 
-<a class="jxr_linenumber" name="L428" href="#L428">428</a>         <em 
class="jxr_comment">// 
----------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L429" href="#L429">429</a>         <em 
class="jxr_comment">// Data objects</em>
-<a class="jxr_linenumber" name="L430" href="#L430">430</a>         <em 
class="jxr_comment">// 
----------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L389" href="#L389">389</a>             <strong 
class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L390" href="#L390">390</a>             {
+<a class="jxr_linenumber" name="L391" href="#L391">391</a>                 
<strong class="jxr_keyword">switch</strong> ( parser.getType() )
+<a class="jxr_linenumber" name="L392" href="#L392">392</a>                 {
+<a class="jxr_linenumber" name="L393" href="#L393">393</a>                     
<strong class="jxr_keyword">case</strong> Parser.XML_TYPE:
+<a class="jxr_linenumber" name="L394" href="#L394">394</a>                     
    reader = ReaderFactory.newXmlReader( doc );
+<a class="jxr_linenumber" name="L395" href="#L395">395</a>                     
    <strong class="jxr_keyword">if</strong> ( siteContext.isValidate() )
+<a class="jxr_linenumber" name="L396" href="#L396">396</a>                     
    {
+<a class="jxr_linenumber" name="L397" href="#L397">397</a>                     
        reader = validate( reader, resource );
+<a class="jxr_linenumber" name="L398" href="#L398">398</a>                     
    }
+<a class="jxr_linenumber" name="L399" href="#L399">399</a>                     
    <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> 
+<a class="jxr_linenumber" name="L401" href="#L401">401</a>                     
<strong class="jxr_keyword">case</strong> Parser.TXT_TYPE:
+<a class="jxr_linenumber" name="L402" href="#L402">402</a>                     
<strong class="jxr_keyword">case</strong> Parser.UNKNOWN_TYPE:
+<a class="jxr_linenumber" name="L403" href="#L403">403</a>                     
<strong class="jxr_keyword">default</strong>:
+<a class="jxr_linenumber" name="L404" href="#L404">404</a>                     
    reader = ReaderFactory.newReader( doc, siteContext.getInputEncoding() );
+<a class="jxr_linenumber" name="L405" href="#L405">405</a>                 }
+<a class="jxr_linenumber" name="L406" href="#L406">406</a>             }
+<a class="jxr_linenumber" name="L407" href="#L407">407</a>             
sink.enableLogging( <strong class="jxr_keyword">new</strong> 
PlexusLoggerWrapper( getLogger() ) );
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> 
+<a class="jxr_linenumber" name="L409" href="#L409">409</a>             <strong 
class="jxr_keyword">if</strong> ( reader == <strong 
class="jxr_keyword">null</strong> ) <em class="jxr_comment">// can happen if 
velocity throws above</em>
+<a class="jxr_linenumber" name="L410" href="#L410">410</a>             {
+<a class="jxr_linenumber" name="L411" href="#L411">411</a>                 
<strong class="jxr_keyword">throw</strong> <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>(
 <span class="jxr_string">"Error getting a parser for '"</span> + doc + <span 
class="jxr_string">"'"</span> );
+<a class="jxr_linenumber" name="L412" href="#L412">412</a>             }
+<a class="jxr_linenumber" name="L413" href="#L413">413</a>             
doxia.parse( reader, renderingContext.getParserId(), sink );
+<a class="jxr_linenumber" name="L414" href="#L414">414</a>         }
+<a class="jxr_linenumber" name="L415" href="#L415">415</a>         <strong 
class="jxr_keyword">catch</strong> ( ParserNotFoundException e )
+<a class="jxr_linenumber" name="L416" href="#L416">416</a>         {
+<a class="jxr_linenumber" name="L417" href="#L417">417</a>             <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>(
 <span class="jxr_string">"Error getting a parser for '"</span> + doc + <span 
class="jxr_string">"': "</span> + e.getMessage(), e );
+<a class="jxr_linenumber" name="L418" href="#L418">418</a>         }
+<a class="jxr_linenumber" name="L419" href="#L419">419</a>         <strong 
class="jxr_keyword">catch</strong> ( ParseException e )
+<a class="jxr_linenumber" name="L420" href="#L420">420</a>         {
+<a class="jxr_linenumber" name="L421" href="#L421">421</a>             <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>(
 <span class="jxr_string">"Error parsing '"</span>
+<a class="jxr_linenumber" name="L422" href="#L422">422</a>                     
+ doc + <span class="jxr_string">"': line ["</span> + e.getLineNumber() + <span 
class="jxr_string">"] "</span> + e.getMessage(), e );
+<a class="jxr_linenumber" name="L423" href="#L423">423</a>         }
+<a class="jxr_linenumber" name="L424" href="#L424">424</a>         <strong 
class="jxr_keyword">catch</strong> ( IOException e )
+<a class="jxr_linenumber" name="L425" href="#L425">425</a>         {
+<a class="jxr_linenumber" name="L426" href="#L426">426</a>             <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>(
 <span class="jxr_string">"IOException when processing '"</span> + doc + <span 
class="jxr_string">"'"</span>, e );
+<a class="jxr_linenumber" name="L427" href="#L427">427</a>         }
+<a class="jxr_linenumber" name="L428" href="#L428">428</a>         <strong 
class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="L429" href="#L429">429</a>         {
+<a class="jxr_linenumber" name="L430" href="#L430">430</a>             
sink.flush();
 <a class="jxr_linenumber" name="L431" href="#L431">431</a> 
-<a class="jxr_linenumber" name="L432" href="#L432">432</a>         <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RenderingContext.html">RenderingContext</a>
 renderingContext = sink.getRenderingContext();
-<a class="jxr_linenumber" name="L433" href="#L433">433</a>         
context.put( <span class="jxr_string">"relativePath"</span>, 
renderingContext.getRelativePath() );
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> 
-<a class="jxr_linenumber" name="L435" href="#L435">435</a>         String 
currentFileName = renderingContext.getOutputName().replace( '&#92;&#92;', '/' );
-<a class="jxr_linenumber" name="L436" href="#L436">436</a>         
context.put( <span class="jxr_string">"currentFileName"</span>, currentFileName 
);
-<a class="jxr_linenumber" name="L437" href="#L437">437</a> 
-<a class="jxr_linenumber" name="L438" href="#L438">438</a>         
context.put( <span class="jxr_string">"alignedFileName"</span>, 
PathTool.calculateLink( currentFileName, renderingContext.getRelativePath() ) );
+<a class="jxr_linenumber" name="L432" href="#L432">432</a>             
sink.close();
+<a class="jxr_linenumber" name="L433" href="#L433">433</a> 
+<a class="jxr_linenumber" name="L434" href="#L434">434</a>             
IOUtil.close( reader );
+<a class="jxr_linenumber" name="L435" href="#L435">435</a>         }
+<a class="jxr_linenumber" name="L436" href="#L436">436</a> 
+<a class="jxr_linenumber" name="L437" href="#L437">437</a>         
generateDocument( writer, sink, siteContext );
+<a class="jxr_linenumber" name="L438" href="#L438">438</a>     }
 <a class="jxr_linenumber" name="L439" href="#L439">439</a> 
-<a class="jxr_linenumber" name="L440" href="#L440">440</a>         
context.put( <span class="jxr_string">"decoration"</span>, 
siteRenderingContext.getDecoration() );
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> 
-<a class="jxr_linenumber" name="L442" href="#L442">442</a>         Locale 
locale = siteRenderingContext.getLocale();
-<a class="jxr_linenumber" name="L443" href="#L443">443</a>         
context.put( <span class="jxr_string">"locale"</span>, locale );
-<a class="jxr_linenumber" name="L444" href="#L444">444</a>         
context.put( <span class="jxr_string">"supportedLocales"</span>, 
Collections.unmodifiableList( siteRenderingContext.getSiteLocales() ) );
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> 
-<a class="jxr_linenumber" name="L446" href="#L446">446</a>         
context.put( <span class="jxr_string">"currentDate"</span>, <strong 
class="jxr_keyword">new</strong> Date() );
-<a class="jxr_linenumber" name="L447" href="#L447">447</a>         
SimpleDateFormat sdf = <strong class="jxr_keyword">new</strong> 
SimpleDateFormat( <span class="jxr_string">"yyyyMMdd"</span> );
-<a class="jxr_linenumber" name="L448" href="#L448">448</a>         
context.put( <span class="jxr_string">"dateRevision"</span>, sdf.format( 
<strong class="jxr_keyword">new</strong> Date() ) );
-<a class="jxr_linenumber" name="L449" href="#L449">449</a> 
-<a class="jxr_linenumber" name="L450" href="#L450">450</a>         
context.put( <span class="jxr_string">"publishDate"</span>, 
siteRenderingContext.getPublishDate() );
-<a class="jxr_linenumber" name="L451" href="#L451">451</a> 
-<a class="jxr_linenumber" name="L452" href="#L452">452</a>         DateFormat 
dateFormat = DateFormat.getDateInstance( DateFormat.DEFAULT, locale );
-<a class="jxr_linenumber" name="L453" href="#L453">453</a>         <a 
href="../../../../../org/apache/maven/doxia/site/decoration/PublishDate.html">PublishDate</a>
 publishDate = siteRenderingContext.getDecoration().getPublishDate();
-<a class="jxr_linenumber" name="L454" href="#L454">454</a>         <strong 
class="jxr_keyword">if</strong> ( publishDate != <strong 
class="jxr_keyword">null</strong> &amp;&amp; StringUtils.isNotBlank( 
publishDate.getFormat() ) )
-<a class="jxr_linenumber" name="L455" href="#L455">455</a>         {
-<a class="jxr_linenumber" name="L456" href="#L456">456</a>             
dateFormat = <strong class="jxr_keyword">new</strong> SimpleDateFormat( 
publishDate.getFormat(), locale );
-<a class="jxr_linenumber" name="L457" href="#L457">457</a>         }
-<a class="jxr_linenumber" name="L458" href="#L458">458</a>         
context.put( <span class="jxr_string">"dateFormat"</span>, dateFormat );
-<a class="jxr_linenumber" name="L459" href="#L459">459</a> 
-<a class="jxr_linenumber" name="L460" href="#L460">460</a>         <em 
class="jxr_comment">// doxiaSiteRendererVersion</em>
-<a class="jxr_linenumber" name="L461" href="#L461">461</a>         InputStream 
inputStream = <strong 
class="jxr_keyword">this</strong>.getClass().getResourceAsStream( <span 
class="jxr_string">"/META-INF/"</span>
-<a class="jxr_linenumber" name="L462" href="#L462">462</a>             + <span 
class="jxr_string">"maven/org.apache.maven.doxia/doxia-site-renderer/pom.properties"</span>
 );
-<a class="jxr_linenumber" name="L463" href="#L463">463</a>         Properties 
properties = PropertyUtils.loadProperties( inputStream );
-<a class="jxr_linenumber" name="L464" href="#L464">464</a>         <strong 
class="jxr_keyword">if</strong> ( inputStream == <strong 
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L465" href="#L465">465</a>         {
-<a class="jxr_linenumber" name="L466" href="#L466">466</a>             
getLogger().debug( <span class="jxr_string">"pom.properties for 
doxia-site-renderer could not be found."</span> );
-<a class="jxr_linenumber" name="L467" href="#L467">467</a>         }
-<a class="jxr_linenumber" name="L468" href="#L468">468</a>         <strong 
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( 
properties == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L469" href="#L469">469</a>         {
-<a class="jxr_linenumber" name="L470" href="#L470">470</a>             
getLogger().debug( <span class="jxr_string">"Failed to load pom.properties, so 
doxiaVersion is not available"</span>
-<a class="jxr_linenumber" name="L471" href="#L471">471</a>                 + 
<span class="jxr_string">" in the Velocity context."</span> );
-<a class="jxr_linenumber" name="L472" href="#L472">472</a>         }
-<a class="jxr_linenumber" name="L473" href="#L473">473</a>         <strong 
class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L474" href="#L474">474</a>         {
-<a class="jxr_linenumber" name="L475" href="#L475">475</a>             
context.put( <span class="jxr_string">"doxiaSiteRendererVersion"</span>, 
properties.getProperty( <span class="jxr_string">"version"</span> ) );
-<a class="jxr_linenumber" name="L476" href="#L476">476</a>         }
-<a class="jxr_linenumber" name="L477" href="#L477">477</a> 
-<a class="jxr_linenumber" name="L478" href="#L478">478</a>         <em 
class="jxr_comment">// Add user properties</em>
-<a class="jxr_linenumber" name="L479" href="#L479">479</a>         
Map&lt;String, ?&gt; templateProperties = 
siteRenderingContext.getTemplateProperties();
-<a class="jxr_linenumber" name="L480" href="#L480">480</a> 
-<a class="jxr_linenumber" name="L481" href="#L481">481</a>         <strong 
class="jxr_keyword">if</strong> ( templateProperties != <strong 
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L482" href="#L482">482</a>         {
-<a class="jxr_linenumber" name="L483" href="#L483">483</a>             <strong 
class="jxr_keyword">for</strong> ( Map.Entry&lt;String, ?&gt; entry : 
templateProperties.entrySet() )
-<a class="jxr_linenumber" name="L484" href="#L484">484</a>             {
-<a class="jxr_linenumber" name="L485" href="#L485">485</a>                 
context.put( entry.getKey(), entry.getValue() );
-<a class="jxr_linenumber" name="L486" href="#L486">486</a>             }
-<a class="jxr_linenumber" name="L487" href="#L487">487</a>         }
-<a class="jxr_linenumber" name="L488" href="#L488">488</a> 
-<a class="jxr_linenumber" name="L489" href="#L489">489</a>         <em 
class="jxr_comment">// 
----------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L490" href="#L490">490</a>         <em 
class="jxr_comment">// Tools</em>
-<a class="jxr_linenumber" name="L491" href="#L491">491</a>         <em 
class="jxr_comment">// 
----------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> 
-<a class="jxr_linenumber" name="L493" href="#L493">493</a>         
context.put( <span class="jxr_string">"PathTool"</span>, <strong 
class="jxr_keyword">new</strong> PathTool() );
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> 
-<a class="jxr_linenumber" name="L495" href="#L495">495</a>         
context.put( <span class="jxr_string">"FileUtils"</span>, <strong 
class="jxr_keyword">new</strong> FileUtils() );
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> 
-<a class="jxr_linenumber" name="L497" href="#L497">497</a>         
context.put( <span class="jxr_string">"StringUtils"</span>, <strong 
class="jxr_keyword">new</strong> StringUtils() );
-<a class="jxr_linenumber" name="L498" href="#L498">498</a> 
-<a class="jxr_linenumber" name="L499" href="#L499">499</a>         
context.put( <span class="jxr_string">"i18n"</span>, i18n );
-<a class="jxr_linenumber" name="L500" href="#L500">500</a> 
-<a class="jxr_linenumber" name="L501" href="#L501">501</a>         <strong 
class="jxr_keyword">return</strong> context;
-<a class="jxr_linenumber" name="L502" href="#L502">502</a>     }
-<a class="jxr_linenumber" name="L503" href="#L503">503</a> 
-<a class="jxr_linenumber" name="L504" href="#L504">504</a>     <em 
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L505" href="#L505">505</a> <em 
class="jxr_javadoccomment">     * Create a Velocity Context for the site 
template decorating the document. In addition to all the informations</em>
-<a class="jxr_linenumber" name="L506" href="#L506">506</a> <em 
class="jxr_javadoccomment">     * from the document, this context contains data 
gathered in {@link SiteRendererSink} during document rendering.</em>
-<a class="jxr_linenumber" name="L507" href="#L507">507</a> <em 
class="jxr_javadoccomment">     * </em>
-<a class="jxr_linenumber" name="L508" href="#L508">508</a> <em 
class="jxr_javadoccomment">     * @param sink the site renderer sink for the 
document</em>
-<a class="jxr_linenumber" name="L509" href="#L509">509</a> <em 
class="jxr_javadoccomment">     * @param siteRenderingContext the site 
rendering context</em>
-<a class="jxr_linenumber" name="L510" href="#L510">510</a> <em 
class="jxr_javadoccomment">     * @return</em>
-<a class="jxr_linenumber" name="L511" href="#L511">511</a> <em 
class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L512" href="#L512">512</a>     <strong 
class="jxr_keyword">protected</strong> Context 
createSiteTemplateVelocityContext( SiteRendererSink sink,
-<a class="jxr_linenumber" name="L513" href="#L513">513</a>                     
                                     <a 
href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a>
 siteRenderingContext )
-<a class="jxr_linenumber" name="L514" href="#L514">514</a>     {
-<a class="jxr_linenumber" name="L515" href="#L515">515</a>         <em 
class="jxr_comment">// first get the context from Doxia source</em>
-<a class="jxr_linenumber" name="L516" href="#L516">516</a>         Context 
context = createDocumentVelocityContext( sink, siteRenderingContext );
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> 
-<a class="jxr_linenumber" name="L518" href="#L518">518</a>         <em 
class="jxr_comment">// then add data objects from rendered document</em>
-<a class="jxr_linenumber" name="L519" href="#L519">519</a> 
-<a class="jxr_linenumber" name="L520" href="#L520">520</a>         <em 
class="jxr_comment">// Add infos from document</em>
-<a class="jxr_linenumber" name="L521" href="#L521">521</a>         
context.put( <span class="jxr_string">"authors"</span>, sink.getAuthors() );
+<a class="jxr_linenumber" name="L440" href="#L440">440</a>     <em 
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L441" href="#L441">441</a> <em 
class="jxr_javadoccomment">     * Create a Velocity Context for a Doxia 
document, containing every information about rendered document.</em>
+<a class="jxr_linenumber" name="L442" href="#L442">442</a> <em 
class="jxr_javadoccomment">     * </em>
+<a class="jxr_linenumber" name="L443" href="#L443">443</a> <em 
class="jxr_javadoccomment">     * @param sink the site renderer sink for the 
document</em>
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> <em 
class="jxr_javadoccomment">     * @param siteRenderingContext the site 
rendering context</em>
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> <em 
class="jxr_javadoccomment">     * @return</em>
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> <em 
class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L447" href="#L447">447</a>     <strong 
class="jxr_keyword">protected</strong> Context createDocumentVelocityContext( 
RenderingContext renderingContext,
+<a class="jxr_linenumber" name="L448" href="#L448">448</a>                     
                                 <a 
href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a>
 siteRenderingContext )
+<a class="jxr_linenumber" name="L449" href="#L449">449</a>     {
+<a class="jxr_linenumber" name="L450" href="#L450">450</a>         ToolManager 
toolManager = <strong class="jxr_keyword">new</strong> ToolManager( <strong 
class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L451" href="#L451">451</a>         Context 
context = toolManager.createContext();
+<a class="jxr_linenumber" name="L452" href="#L452">452</a> 
+<a class="jxr_linenumber" name="L453" href="#L453">453</a>         <em 
class="jxr_comment">// 
----------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L454" href="#L454">454</a>         <em 
class="jxr_comment">// Data objects</em>
+<a class="jxr_linenumber" name="L455" href="#L455">455</a>         <em 
class="jxr_comment">// 
----------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> 
+<a class="jxr_linenumber" name="L457" href="#L457">457</a>         
context.put( <span class="jxr_string">"relativePath"</span>, 
renderingContext.getRelativePath() );
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> 
+<a class="jxr_linenumber" name="L459" href="#L459">459</a>         String 
currentFileName = renderingContext.getOutputName().replace( '&#92;&#92;', '/' );
+<a class="jxr_linenumber" name="L460" href="#L460">460</a>         
context.put( <span class="jxr_string">"currentFileName"</span>, currentFileName 
);
+<a class="jxr_linenumber" name="L461" href="#L461">461</a> 
+<a class="jxr_linenumber" name="L462" href="#L462">462</a>         
context.put( <span class="jxr_string">"alignedFileName"</span>, 
PathTool.calculateLink( currentFileName, renderingContext.getRelativePath() ) );
+<a class="jxr_linenumber" name="L463" href="#L463">463</a> 
+<a class="jxr_linenumber" name="L464" href="#L464">464</a>         
context.put( <span class="jxr_string">"decoration"</span>, 
siteRenderingContext.getDecoration() );
+<a class="jxr_linenumber" name="L465" href="#L465">465</a> 
+<a class="jxr_linenumber" name="L466" href="#L466">466</a>         Locale 
locale = siteRenderingContext.getLocale();
+<a class="jxr_linenumber" name="L467" href="#L467">467</a>         
context.put( <span class="jxr_string">"locale"</span>, locale );
+<a class="jxr_linenumber" name="L468" href="#L468">468</a>         
context.put( <span class="jxr_string">"supportedLocales"</span>, 
Collections.unmodifiableList( siteRenderingContext.getSiteLocales() ) );
+<a class="jxr_linenumber" name="L469" href="#L469">469</a> 
+<a class="jxr_linenumber" name="L470" href="#L470">470</a>         
context.put( <span class="jxr_string">"currentDate"</span>, <strong 
class="jxr_keyword">new</strong> Date() );
+<a class="jxr_linenumber" name="L471" href="#L471">471</a>         
SimpleDateFormat sdf = <strong class="jxr_keyword">new</strong> 
SimpleDateFormat( <span class="jxr_string">"yyyyMMdd"</span> );
+<a class="jxr_linenumber" name="L472" href="#L472">472</a>         
context.put( <span class="jxr_string">"dateRevision"</span>, sdf.format( 
<strong class="jxr_keyword">new</strong> Date() ) );
+<a class="jxr_linenumber" name="L473" href="#L473">473</a> 
+<a class="jxr_linenumber" name="L474" href="#L474">474</a>         
context.put( <span class="jxr_string">"publishDate"</span>, 
siteRenderingContext.getPublishDate() );
+<a class="jxr_linenumber" name="L475" href="#L475">475</a> 
+<a class="jxr_linenumber" name="L476" href="#L476">476</a>         DateFormat 
dateFormat = DateFormat.getDateInstance( DateFormat.DEFAULT, locale );
+<a class="jxr_linenumber" name="L477" href="#L477">477</a>         <a 
href="../../../../../org/apache/maven/doxia/site/decoration/PublishDate.html">PublishDate</a>
 publishDate = siteRenderingContext.getDecoration().getPublishDate();
+<a class="jxr_linenumber" name="L478" href="#L478">478</a>         <strong 
class="jxr_keyword">if</strong> ( publishDate != <strong 
class="jxr_keyword">null</strong> &amp;&amp; StringUtils.isNotBlank( 
publishDate.getFormat() ) )
+<a class="jxr_linenumber" name="L479" href="#L479">479</a>         {
+<a class="jxr_linenumber" name="L480" href="#L480">480</a>             
dateFormat = <strong class="jxr_keyword">new</strong> SimpleDateFormat( 
publishDate.getFormat(), locale );
+<a class="jxr_linenumber" name="L481" href="#L481">481</a>         }
+<a class="jxr_linenumber" name="L482" href="#L482">482</a>         
context.put( <span class="jxr_string">"dateFormat"</span>, dateFormat );
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> 
+<a class="jxr_linenumber" name="L484" href="#L484">484</a>         <em 
class="jxr_comment">// doxiaSiteRendererVersion</em>
+<a class="jxr_linenumber" name="L485" href="#L485">485</a>         InputStream 
inputStream = <strong 
class="jxr_keyword">this</strong>.getClass().getResourceAsStream( <span 
class="jxr_string">"/META-INF/"</span>
+<a class="jxr_linenumber" name="L486" href="#L486">486</a>             + <span 
class="jxr_string">"maven/org.apache.maven.doxia/doxia-site-renderer/pom.properties"</span>
 );
+<a class="jxr_linenumber" name="L487" href="#L487">487</a>         Properties 
properties = PropertyUtils.loadProperties( inputStream );
+<a class="jxr_linenumber" name="L488" href="#L488">488</a>         <strong 
class="jxr_keyword">if</strong> ( inputStream == <strong 
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L489" href="#L489">489</a>         {
+<a class="jxr_linenumber" name="L490" href="#L490">490</a>             
getLogger().debug( <span class="jxr_string">"pom.properties for 
doxia-site-renderer could not be found."</span> );
+<a class="jxr_linenumber" name="L491" href="#L491">491</a>         }
+<a class="jxr_linenumber" name="L492" href="#L492">492</a>         <strong 
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( 
properties == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L493" href="#L493">493</a>         {
+<a class="jxr_linenumber" name="L494" href="#L494">494</a>             
getLogger().debug( <span class="jxr_string">"Failed to load pom.properties, so 
doxiaVersion is not available"</span>
+<a class="jxr_linenumber" name="L495" href="#L495">495</a>                 + 
<span class="jxr_string">" in the Velocity context."</span> );
+<a class="jxr_linenumber" name="L496" href="#L496">496</a>         }
+<a class="jxr_linenumber" name="L497" href="#L497">497</a>         <strong 
class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L498" href="#L498">498</a>         {
+<a class="jxr_linenumber" name="L499" href="#L499">499</a>             
context.put( <span class="jxr_string">"doxiaSiteRendererVersion"</span>, 
properties.getProperty( <span class="jxr_string">"version"</span> ) );
+<a class="jxr_linenumber" name="L500" href="#L500">500</a>         }
+<a class="jxr_linenumber" name="L501" href="#L501">501</a> 
+<a class="jxr_linenumber" name="L502" href="#L502">502</a>         <em 
class="jxr_comment">// Add user properties</em>
+<a class="jxr_linenumber" name="L503" href="#L503">503</a>         
Map&lt;String, ?&gt; templateProperties = 
siteRenderingContext.getTemplateProperties();
+<a class="jxr_linenumber" name="L504" href="#L504">504</a> 
+<a class="jxr_linenumber" name="L505" href="#L505">505</a>         <strong 
class="jxr_keyword">if</strong> ( templateProperties != <strong 
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L506" href="#L506">506</a>         {
+<a class="jxr_linenumber" name="L507" href="#L507">507</a>             <strong 
class="jxr_keyword">for</strong> ( Map.Entry&lt;String, ?&gt; entry : 
templateProperties.entrySet() )
+<a class="jxr_linenumber" name="L508" href="#L508">508</a>             {
+<a class="jxr_linenumber" name="L509" href="#L509">509</a>                 
context.put( entry.getKey(), entry.getValue() );
+<a class="jxr_linenumber" name="L510" href="#L510">510</a>             }
+<a class="jxr_linenumber" name="L511" href="#L511">511</a>         }
+<a class="jxr_linenumber" name="L512" href="#L512">512</a> 
+<a class="jxr_linenumber" name="L513" href="#L513">513</a>         <em 
class="jxr_comment">// 
----------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L514" href="#L514">514</a>         <em 
class="jxr_comment">// Tools</em>
+<a class="jxr_linenumber" name="L515" href="#L515">515</a>         <em 
class="jxr_comment">// 
----------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L516" href="#L516">516</a> 
+<a class="jxr_linenumber" name="L517" href="#L517">517</a>         
context.put( <span class="jxr_string">"PathTool"</span>, <strong 
class="jxr_keyword">new</strong> PathTool() );
+<a class="jxr_linenumber" name="L518" href="#L518">518</a> 
+<a class="jxr_linenumber" name="L519" href="#L519">519</a>         
context.put( <span class="jxr_string">"FileUtils"</span>, <strong 
class="jxr_keyword">new</strong> FileUtils() );
+<a class="jxr_linenumber" name="L520" href="#L520">520</a> 
+<a class="jxr_linenumber" name="L521" href="#L521">521</a>         
context.put( <span class="jxr_string">"StringUtils"</span>, <strong 
class="jxr_keyword">new</strong> StringUtils() );
 <a class="jxr_linenumber" name="L522" href="#L522">522</a> 
-<a class="jxr_linenumber" name="L523" href="#L523">523</a>         
context.put( <span class="jxr_string">"shortTitle"</span>, sink.getTitle() );
+<a class="jxr_linenumber" name="L523" href="#L523">523</a>         
context.put( <span class="jxr_string">"i18n"</span>, i18n );
 <a class="jxr_linenumber" name="L524" href="#L524">524</a> 
-<a class="jxr_linenumber" name="L525" href="#L525">525</a>         <em 
class="jxr_comment">// DOXIASITETOOLS-70: Prepend the project name to the 
title, if any</em>
-<a class="jxr_linenumber" name="L526" href="#L526">526</a>         String 
title = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L527" href="#L527">527</a>         <strong 
class="jxr_keyword">if</strong> ( siteRenderingContext.getDecoration() != 
<strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L528" href="#L528">528</a>                 
&amp;&amp; siteRenderingContext.getDecoration().getName() != <strong 
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L529" href="#L529">529</a>         {
-<a class="jxr_linenumber" name="L530" href="#L530">530</a>             title = 
siteRenderingContext.getDecoration().getName();
-<a class="jxr_linenumber" name="L531" href="#L531">531</a>         }
-<a class="jxr_linenumber" name="L532" href="#L532">532</a>         <strong 
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( 
siteRenderingContext.getDefaultWindowTitle() != <strong 
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L533" href="#L533">533</a>         {
-<a class="jxr_linenumber" name="L534" href="#L534">534</a>             title = 
siteRenderingContext.getDefaultWindowTitle();
-<a class="jxr_linenumber" name="L535" href="#L535">535</a>         }
-<a class="jxr_linenumber" name="L536" href="#L536">536</a> 
-<a class="jxr_linenumber" name="L537" href="#L537">537</a>         <strong 
class="jxr_keyword">if</strong> ( title.length() &gt; 0 )
-<a class="jxr_linenumber" name="L538" href="#L538">538</a>         {
-<a class="jxr_linenumber" name="L539" href="#L539">539</a>             title 
+= <span class="jxr_string">" &amp;#x2013; "</span>;
-<a class="jxr_linenumber" name="L540" href="#L540">540</a>         }
-<a class="jxr_linenumber" name="L541" href="#L541">541</a>         title += 
sink.getTitle();
-<a class="jxr_linenumber" name="L542" href="#L542">542</a> 
-<a class="jxr_linenumber" name="L543" href="#L543">543</a>         
context.put( <span class="jxr_string">"title"</span>, title );
-<a class="jxr_linenumber" name="L544" href="#L544">544</a> 
-<a class="jxr_linenumber" name="L545" href="#L545">545</a>         
context.put( <span class="jxr_string">"headContent"</span>, sink.getHead() );
+<a class="jxr_linenumber" name="L525" href="#L525">525</a>         <strong 
class="jxr_keyword">return</strong> context;
+<a class="jxr_linenumber" name="L526" href="#L526">526</a>     }
+<a class="jxr_linenumber" name="L527" href="#L527">527</a> 
+<a class="jxr_linenumber" name="L528" href="#L528">528</a>     <em 
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L529" href="#L529">529</a> <em 
class="jxr_javadoccomment">     * Create a Velocity Context for the site 
template decorating the document. In addition to all the informations</em>
+<a class="jxr_linenumber" name="L530" href="#L530">530</a> <em 
class="jxr_javadoccomment">     * from the document, this context contains data 
gathered in {@link SiteRendererSink} during document rendering.</em>
+<a class="jxr_linenumber" name="L531" href="#L531">531</a> <em 
class="jxr_javadoccomment">     * </em>
+<a class="jxr_linenumber" name="L532" href="#L532">532</a> <em 
class="jxr_javadoccomment">     * @param siteRendererSink the site renderer 
sink for the document</em>
+<a class="jxr_linenumber" name="L533" href="#L533">533</a> <em 
class="jxr_javadoccomment">     * @param siteRenderingContext the site 
rendering context</em>
+<a class="jxr_linenumber" name="L534" href="#L534">534</a> <em 
class="jxr_javadoccomment">     * @return</em>
+<a class="jxr_linenumber" name="L535" href="#L535">535</a> <em 
class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L536" href="#L536">536</a>     <strong 
class="jxr_keyword">protected</strong> Context 
createSiteTemplateVelocityContext( SiteRendererSink siteRendererSink,
+<a class="jxr_linenumber" name="L537" href="#L537">537</a>                     
                                     <a 
href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a>
 siteRenderingContext )
+<a class="jxr_linenumber" name="L538" href="#L538">538</a>     {
+<a class="jxr_linenumber" name="L539" href="#L539">539</a>         <em 
class="jxr_comment">// first get the context from document</em>
+<a class="jxr_linenumber" name="L540" href="#L540">540</a>         Context 
context = createDocumentVelocityContext( 
siteRendererSink.getRenderingContext(), siteRenderingContext );
+<a class="jxr_linenumber" name="L541" href="#L541">541</a> 
+<a class="jxr_linenumber" name="L542" href="#L542">542</a>         <em 
class="jxr_comment">// then add data objects from rendered document</em>
+<a class="jxr_linenumber" name="L543" href="#L543">543</a> 
+<a class="jxr_linenumber" name="L544" href="#L544">544</a>         <em 
class="jxr_comment">// Add infos from document</em>
+<a class="jxr_linenumber" name="L545" href="#L545">545</a>         
context.put( <span class="jxr_string">"authors"</span>, 
siteRendererSink.getAuthors() );
 <a class="jxr_linenumber" name="L546" href="#L546">546</a> 
-<a class="jxr_linenumber" name="L547" href="#L547">547</a>         
context.put( <span class="jxr_string">"bodyContent"</span>, sink.getBody() );
+<a class="jxr_linenumber" name="L547" href="#L547">547</a>         
context.put( <span class="jxr_string">"shortTitle"</span>, 
siteRendererSink.getTitle() );
 <a class="jxr_linenumber" name="L548" href="#L548">548</a> 
-<a class="jxr_linenumber" name="L549" href="#L549">549</a>         
SimpleDateFormat sdf = <strong class="jxr_keyword">new</strong> 
SimpleDateFormat( <span class="jxr_string">"yyyyMMdd"</span> );
-<a class="jxr_linenumber" name="L550" href="#L550">550</a>         <strong 
class="jxr_keyword">if</strong> ( StringUtils.isNotEmpty( sink.getDate() ) )
-<a class="jxr_linenumber" name="L551" href="#L551">551</a>         {
-<a class="jxr_linenumber" name="L552" href="#L552">552</a>             <strong 
class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L553" href="#L553">553</a>             {
-<a class="jxr_linenumber" name="L554" href="#L554">554</a>                 <em 
class="jxr_comment">// we support only ISO-8601 date</em>
-<a class="jxr_linenumber" name="L555" href="#L555">555</a>                 
context.put( <span class="jxr_string">"dateCreation"</span>,
-<a class="jxr_linenumber" name="L556" href="#L556">556</a>                     
    sdf.format( <strong class="jxr_keyword">new</strong> SimpleDateFormat( 
<span class="jxr_string">"yyyy-MM-dd"</span> ).parse( sink.getDate() ) ) );
-<a class="jxr_linenumber" name="L557" href="#L557">557</a>             }
-<a class="jxr_linenumber" name="L558" href="#L558">558</a>             <strong 
class="jxr_keyword">catch</strong> ( java.text.ParseException e )
-<a class="jxr_linenumber" name="L559" href="#L559">559</a>             {
-<a class="jxr_linenumber" name="L560" href="#L560">560</a>                 
getLogger().debug( <span class="jxr_string">"Could not parse date: "</span> + 
sink.getDate() + <span class="jxr_string">", ignoring!"</span>, e );
-<a class="jxr_linenumber" name="L561" href="#L561">561</a>             }
-<a class="jxr_linenumber" name="L562" href="#L562">562</a>         }
-<a class="jxr_linenumber" name="L563" href="#L563">563</a> 
-<a class="jxr_linenumber" name="L564" href="#L564">564</a>         <strong 
class="jxr_keyword">return</strong> context;
-<a class="jxr_linenumber" name="L565" href="#L565">565</a>     }
+<a class="jxr_linenumber" name="L549" href="#L549">549</a>         <em 
class="jxr_comment">// DOXIASITETOOLS-70: Prepend the project name to the 
title, if any</em>
+<a class="jxr_linenumber" name="L550" href="#L550">550</a>         String 
title = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L551" href="#L551">551</a>         <strong 
class="jxr_keyword">if</strong> ( siteRenderingContext.getDecoration() != 
<strong class="jxr_keyword">null</strong>
+<a class="jxr_linenumber" name="L552" href="#L552">552</a>                 
&amp;&amp; siteRenderingContext.getDecoration().getName() != <strong 
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L553" href="#L553">553</a>         {
+<a class="jxr_linenumber" name="L554" href="#L554">554</a>             title = 
siteRenderingContext.getDecoration().getName();
+<a class="jxr_linenumber" name="L555" href="#L555">555</a>         }
+<a class="jxr_linenumber" name="L556" href="#L556">556</a>         <strong 
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( 
siteRenderingContext.getDefaultWindowTitle() != <strong 
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L557" href="#L557">557</a>         {
+<a class="jxr_linenumber" name="L558" href="#L558">558</a>             title = 
siteRenderingContext.getDefaultWindowTitle();
+<a class="jxr_linenumber" name="L559" href="#L559">559</a>         }
+<a class="jxr_linenumber" name="L560" href="#L560">560</a> 
+<a class="jxr_linenumber" name="L561" href="#L561">561</a>         <strong 
class="jxr_keyword">if</strong> ( title.length() &gt; 0 )
+<a class="jxr_linenumber" name="L562" href="#L562">562</a>         {
+<a class="jxr_linenumber" name="L563" href="#L563">563</a>             title 
+= <span class="jxr_string">" &amp;#x2013; "</span>; <em class="jxr_comment">// 
Symbol Name: En Dash, Html Entity: &amp;ndash;</em>
+<a class="jxr_linenumber" name="L564" href="#L564">564</a>         }
+<a class="jxr_linenumber" name="L565" href="#L565">565</a>         title += 
siteRendererSink.getTitle();
 <a class="jxr_linenumber" name="L566" href="#L566">566</a> 
-<a class="jxr_linenumber" name="L567" href="#L567">567</a>     <em 
class="jxr_javadoccomment">/** {@inheritDoc} */</em>
-<a class="jxr_linenumber" name="L568" href="#L568">568</a>     <strong 
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> 
generateDocument( Writer writer, SiteRendererSink sink, SiteRenderingContext 
siteRenderingContext )
-<a class="jxr_linenumber" name="L569" href="#L569">569</a>             <strong 
class="jxr_keyword">throws</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>
-<a class="jxr_linenumber" name="L570" href="#L570">570</a>     {
-<a class="jxr_linenumber" name="L571" href="#L571">571</a>         String 
templateName = siteRenderingContext.getTemplateName();
+<a class="jxr_linenumber" name="L567" href="#L567">567</a>         
context.put( <span class="jxr_string">"title"</span>, title );
+<a class="jxr_linenumber" name="L568" href="#L568">568</a> 
+<a class="jxr_linenumber" name="L569" href="#L569">569</a>         
context.put( <span class="jxr_string">"headContent"</span>, 
siteRendererSink.getHead() );
+<a class="jxr_linenumber" name="L570" href="#L570">570</a> 
+<a class="jxr_linenumber" name="L571" href="#L571">571</a>         
context.put( <span class="jxr_string">"bodyContent"</span>, 
siteRendererSink.getBody() );
 <a class="jxr_linenumber" name="L572" href="#L572">572</a> 
-<a class="jxr_linenumber" name="L573" href="#L573">573</a>         
getLogger().debug( <span class="jxr_string">"Processing Velocity for template 
"</span> + templateName + <span class="jxr_string">" on "</span>
-<a class="jxr_linenumber" name="L574" href="#L574">574</a>             + 
sink.getRenderingContext().getInputName() );
-<a class="jxr_linenumber" name="L575" href="#L575">575</a> 
-<a class="jxr_linenumber" name="L576" href="#L576">576</a>         Context 
context = createSiteTemplateVelocityContext( sink, siteRenderingContext );
+<a class="jxr_linenumber" name="L573" href="#L573">573</a>         
SimpleDateFormat sdf = <strong class="jxr_keyword">new</strong> 
SimpleDateFormat( <span class="jxr_string">"yyyyMMdd"</span> );
+<a class="jxr_linenumber" name="L574" href="#L574">574</a>         <strong 
class="jxr_keyword">if</strong> ( StringUtils.isNotEmpty( 
siteRendererSink.getDate() ) )
+<a class="jxr_linenumber" name="L575" href="#L575">575</a>         {
+<a class="jxr_linenumber" name="L576" href="#L576">576</a>             String 
documentDate = siteRendererSink.getDate();
 <a class="jxr_linenumber" name="L577" href="#L577">577</a> 
-<a class="jxr_linenumber" name="L578" href="#L578">578</a>         ClassLoader 
old = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L579" href="#L579">579</a> 
-<a class="jxr_linenumber" name="L580" href="#L580">580</a>         <strong 
class="jxr_keyword">if</strong> ( siteRenderingContext.getTemplateClassLoader() 
!= <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L581" href="#L581">581</a>         {
-<a class="jxr_linenumber" name="L582" href="#L582">582</a>             <em 
class="jxr_comment">// 
-------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L583" href="#L583">583</a>             <em 
class="jxr_comment">// If no template classloader was set we'll just use the 
context classloader</em>
-<a class="jxr_linenumber" name="L584" href="#L584">584</a>             <em 
class="jxr_comment">// 
-------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L585" href="#L585">585</a> 
-<a class="jxr_linenumber" name="L586" href="#L586">586</a>             old = 
Thread.currentThread().getContextClassLoader();
-<a class="jxr_linenumber" name="L587" href="#L587">587</a> 
-<a class="jxr_linenumber" name="L588" href="#L588">588</a>             
Thread.currentThread().setContextClassLoader( 
siteRenderingContext.getTemplateClassLoader() );
-<a class="jxr_linenumber" name="L589" href="#L589">589</a>         }
-<a class="jxr_linenumber" name="L590" href="#L590">590</a> 
-<a class="jxr_linenumber" name="L591" href="#L591">591</a>         <strong 
class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L592" href="#L592">592</a>         {
-<a class="jxr_linenumber" name="L593" href="#L593">593</a>             
Template template;
-<a class="jxr_linenumber" name="L594" href="#L594">594</a> 
-<a class="jxr_linenumber" name="L595" href="#L595">595</a>             <strong 
class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L596" href="#L596">596</a>             {
-<a class="jxr_linenumber" name="L597" href="#L597">597</a>                 
template = velocity.getEngine().getTemplate( templateName );
-<a class="jxr_linenumber" name="L598" href="#L598">598</a>             }
-<a class="jxr_linenumber" name="L599" href="#L599">599</a>             <strong 
class="jxr_keyword">catch</strong> ( Exception e )
-<a class="jxr_linenumber" name="L600" href="#L600">600</a>             {
-<a class="jxr_linenumber" name="L601" href="#L601">601</a>                 
<strong class="jxr_keyword">throw</strong> <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>(
 <span class="jxr_string">"Could not find the site decoration template 
'"</span> + templateName + <span class="jxr_string">"'"</span>, e );
-<a class="jxr_linenumber" name="L602" href="#L602">602</a>             }
-<a class="jxr_linenumber" name="L603" href="#L603">603</a> 
-<a class="jxr_linenumber" name="L604" href="#L604">604</a>             <strong 
class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L605" href="#L605">605</a>             {
-<a class="jxr_linenumber" name="L606" href="#L606">606</a>                 
template.merge( context, writer );
-<a class="jxr_linenumber" name="L607" href="#L607">607</a>             }
-<a class="jxr_linenumber" name="L608" href="#L608">608</a>             <strong 
class="jxr_keyword">catch</strong> ( Exception e )
-<a class="jxr_linenumber" name="L609" href="#L609">609</a>             {
-<a class="jxr_linenumber" name="L610" href="#L610">610</a>                 
<strong class="jxr_keyword">throw</strong> <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>(
 <span class="jxr_string">"Error while merging site decoration 
template."</span>, e );
-<a class="jxr_linenumber" name="L611" href="#L611">611</a>             }
-<a class="jxr_linenumber" name="L612" href="#L612">612</a>         }
-<a class="jxr_linenumber" name="L613" href="#L613">613</a>         <strong 
class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L614" href="#L614">614</a>         {
-<a class="jxr_linenumber" name="L615" href="#L615">615</a>             
IOUtil.close( writer );
+<a class="jxr_linenumber" name="L578" href="#L578">578</a>             <strong 
class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L579" href="#L579">579</a>             {
+<a class="jxr_linenumber" name="L580" href="#L580">580</a>                 <em 
class="jxr_comment">// we support only ISO-8601 date</em>
+<a class="jxr_linenumber" name="L581" href="#L581">581</a>                 
Date dateCreation = <strong class="jxr_keyword">new</strong> SimpleDateFormat( 
<span class="jxr_string">"yyyy-MM-dd"</span> ).parse( documentDate );
+<a class="jxr_linenumber" name="L582" href="#L582">582</a> 
+<a class="jxr_linenumber" name="L583" href="#L583">583</a>                 
context.put( <span class="jxr_string">"dateCreation"</span>, sdf.format( 
dateCreation ) );
+<a class="jxr_linenumber" name="L584" href="#L584">584</a>             }
+<a class="jxr_linenumber" name="L585" href="#L585">585</a>             <strong 
class="jxr_keyword">catch</strong> ( java.text.ParseException e )
+<a class="jxr_linenumber" name="L586" href="#L586">586</a>             {
+<a class="jxr_linenumber" name="L587" href="#L587">587</a>                 
getLogger().warn( <span class="jxr_string">"Could not parse date '"</span> + 
documentDate + <span class="jxr_string">"' from "</span>
+<a class="jxr_linenumber" name="L588" href="#L588">588</a>                     
+ siteRendererSink.getRenderingContext().getInputName()
+<a class="jxr_linenumber" name="L589" href="#L589">589</a>                     
+ <span class="jxr_string">" (expected yyyy-MM-dd format), ignoring!"</span> );
+<a class="jxr_linenumber" name="L590" href="#L590">590</a>             }
+<a class="jxr_linenumber" name="L591" href="#L591">591</a>         }
+<a class="jxr_linenumber" name="L592" href="#L592">592</a> 
+<a class="jxr_linenumber" name="L593" href="#L593">593</a>         <strong 
class="jxr_keyword">return</strong> context;
+<a class="jxr_linenumber" name="L594" href="#L594">594</a>     }
+<a class="jxr_linenumber" name="L595" href="#L595">595</a> 
+<a class="jxr_linenumber" name="L596" href="#L596">596</a>     <em 
class="jxr_javadoccomment">/** {@inheritDoc} */</em>
+<a class="jxr_linenumber" name="L597" href="#L597">597</a>     <strong 
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> 
generateDocument( Writer writer, SiteRendererSink sink, SiteRenderingContext 
siteRenderingContext )
+<a class="jxr_linenumber" name="L598" href="#L598">598</a>             <strong 
class="jxr_keyword">throws</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>
+<a class="jxr_linenumber" name="L599" href="#L599">599</a>     {
+<a class="jxr_linenumber" name="L600" href="#L600">600</a>         String 
templateName = siteRenderingContext.getTemplateName();
+<a class="jxr_linenumber" name="L601" href="#L601">601</a> 
+<a class="jxr_linenumber" name="L602" href="#L602">602</a>         
getLogger().debug( <span class="jxr_string">"Processing Velocity for template 
"</span> + templateName + <span class="jxr_string">" on "</span>
+<a class="jxr_linenumber" name="L603" href="#L603">603</a>             + 
sink.getRenderingContext().getInputName() );
+<a class="jxr_linenumber" name="L604" href="#L604">604</a> 
+<a class="jxr_linenumber" name="L605" href="#L605">605</a>         Context 
context = createSiteTemplateVelocityContext( sink, siteRenderingContext );
+<a class="jxr_linenumber" name="L606" href="#L606">606</a> 
+<a class="jxr_linenumber" name="L607" href="#L607">607</a>         ClassLoader 
old = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L608" href="#L608">608</a> 
+<a class="jxr_linenumber" name="L609" href="#L609">609</a>         <strong 
class="jxr_keyword">if</strong> ( siteRenderingContext.getTemplateClassLoader() 
!= <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L610" href="#L610">610</a>         {
+<a class="jxr_linenumber" name="L611" href="#L611">611</a>             <em 
class="jxr_comment">// 
-------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L612" href="#L612">612</a>             <em 
class="jxr_comment">// If no template classloader was set we'll just use the 
context classloader</em>
+<a class="jxr_linenumber" name="L613" href="#L613">613</a>             <em 
class="jxr_comment">// 
-------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L614" href="#L614">614</a> 
+<a class="jxr_linenumber" name="L615" href="#L615">615</a>             old = 
Thread.currentThread().getContextClassLoader();
 <a class="jxr_linenumber" name="L616" href="#L616">616</a> 
-<a class="jxr_linenumber" name="L617" href="#L617">617</a>             <strong 
class="jxr_keyword">if</strong> ( old != <strong 
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L618" href="#L618">618</a>             {
-<a class="jxr_linenumber" name="L619" href="#L619">619</a>                 
Thread.currentThread().setContextClassLoader( old );
-<a class="jxr_linenumber" name="L620" href="#L620">620</a>             }
-<a class="jxr_linenumber" name="L621" href="#L621">621</a>         }
-<a class="jxr_linenumber" name="L622" href="#L622">622</a>     }
+<a class="jxr_linenumber" name="L617" href="#L617">617</a>             
Thread.currentThread().setContextClassLoader( 
siteRenderingContext.getTemplateClassLoader() );
+<a class="jxr_linenumber" name="L618" href="#L618">618</a>         }
+<a class="jxr_linenumber" name="L619" href="#L619">619</a> 
+<a class="jxr_linenumber" name="L620" href="#L620">620</a>         <strong 
class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L621" href="#L621">621</a>         {
+<a class="jxr_linenumber" name="L622" href="#L622">622</a>             
Template template;
 <a class="jxr_linenumber" name="L623" href="#L623">623</a> 
-<a class="jxr_linenumber" name="L624" href="#L624">624</a>     <em 
class="jxr_javadoccomment">/** {@inheritDoc} */</em>
-<a class="jxr_linenumber" name="L625" href="#L625">625</a>     <strong 
class="jxr_keyword">public</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a>
 createContextForSkin( File skinFile, Map&lt;String, ?&gt; attributes,
-<a class="jxr_linenumber" name="L626" href="#L626">626</a>                     
                                  <a 
href="../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html">DecorationModel</a>
 decoration, String defaultWindowTitle,
-<a class="jxr_linenumber" name="L627" href="#L627">627</a>                     
                                  Locale locale )
-<a class="jxr_linenumber" name="L628" href="#L628">628</a>             <strong 
class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="L629" href="#L629">629</a>     {
-<a class="jxr_linenumber" name="L630" href="#L630">630</a>         <a 
href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a>
 context = <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a>();
-<a class="jxr_linenumber" name="L631" href="#L631">631</a> 
-<a class="jxr_linenumber" name="L632" href="#L632">632</a>         ZipFile 
zipFile = getZipFile( skinFile );
-<a class="jxr_linenumber" name="L633" href="#L633">633</a> 
-<a class="jxr_linenumber" name="L634" href="#L634">634</a>         <strong 
class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L635" href="#L635">635</a>         {
-<a class="jxr_linenumber" name="L636" href="#L636">636</a>             <strong 
class="jxr_keyword">if</strong> ( zipFile.getEntry( SKIN_TEMPLATE_LOCATION ) != 
<strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L637" href="#L637">637</a>             {
-<a class="jxr_linenumber" name="L638" href="#L638">638</a>                 
context.setTemplateName( SKIN_TEMPLATE_LOCATION );
-<a class="jxr_linenumber" name="L639" href="#L639">639</a>                 
context.setTemplateClassLoader( <strong class="jxr_keyword">new</strong> 
URLClassLoader( <strong class="jxr_keyword">new</strong> 
URL[]{skinFile.toURI().toURL()} ) );
+<a class="jxr_linenumber" name="L624" href="#L624">624</a>             <strong 
class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L625" href="#L625">625</a>             {
+<a class="jxr_linenumber" name="L626" href="#L626">626</a>                 
template = velocity.getEngine().getTemplate( templateName );
+<a class="jxr_linenumber" name="L627" href="#L627">627</a>             }
+<a class="jxr_linenumber" name="L628" href="#L628">628</a>             <strong 
class="jxr_keyword">catch</strong> ( Exception e )
+<a class="jxr_linenumber" name="L629" href="#L629">629</a>             {
+<a class="jxr_linenumber" name="L630" href="#L630">630</a>                 
<strong class="jxr_keyword">throw</strong> <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>(
 <span class="jxr_string">"Could not find the site decoration template 
'"</span> + templateName + <span class="jxr_string">"'"</span>, e );
+<a class="jxr_linenumber" name="L631" href="#L631">631</a>             }
+<a class="jxr_linenumber" name="L632" href="#L632">632</a> 
+<a class="jxr_linenumber" name="L633" href="#L633">633</a>             <strong 
class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L634" href="#L634">634</a>             {
+<a class="jxr_linenumber" name="L635" href="#L635">635</a>                 
template.merge( context, writer );
+<a class="jxr_linenumber" name="L636" href="#L636">636</a>             }
+<a class="jxr_linenumber" name="L637" href="#L637">637</a>             <strong 
class="jxr_keyword">catch</strong> ( Exception e )
+<a class="jxr_linenumber" name="L638" href="#L638">638</a>             {
+<a class="jxr_linenumber" name="L639" href="#L639">639</a>                 
<strong class="jxr_keyword">throw</strong> <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>(
 <span class="jxr_string">"Error while merging site decoration 
template."</span>, e );
 <a class="jxr_linenumber" name="L640" href="#L640">640</a>             }
-<a class="jxr_linenumber" name="L641" href="#L641">641</a>             <strong 
class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L642" href="#L642">642</a>             {
-<a class="jxr_linenumber" name="L643" href="#L643">643</a>                 
context.setTemplateName( DEFAULT_TEMPLATE );
-<a class="jxr_linenumber" name="L644" href="#L644">644</a>                 
context.setTemplateClassLoader( getClass().getClassLoader() );
-<a class="jxr_linenumber" name="L645" href="#L645">645</a>                 
context.setUsingDefaultTemplate( <strong class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="L646" href="#L646">646</a>             }
-<a class="jxr_linenumber" name="L647" href="#L647">647</a>         }
-<a class="jxr_linenumber" name="L648" href="#L648">648</a>         <strong 
class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L649" href="#L649">649</a>         {
-<a class="jxr_linenumber" name="L650" href="#L650">650</a>             
closeZipFile( zipFile );
-<a class="jxr_linenumber" name="L651" href="#L651">651</a>         }
+<a class="jxr_linenumber" name="L641" href="#L641">641</a>         }
+<a class="jxr_linenumber" name="L642" href="#L642">642</a>         <strong 
class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="L643" href="#L643">643</a>         {
+<a class="jxr_linenumber" name="L644" href="#L644">644</a>             
IOUtil.close( writer );
+<a class="jxr_linenumber" name="L645" href="#L645">645</a> 
+<a class="jxr_linenumber" name="L646" href="#L646">646</a>             <strong 
class="jxr_keyword">if</strong> ( old != <strong 
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L647" href="#L647">647</a>             {
+<a class="jxr_linenumber" name="L648" href="#L648">648</a>                 
Thread.currentThread().setContextClassLoader( old );
+<a class="jxr_linenumber" name="L649" href="#L649">649</a>             }
+<a class="jxr_linenumber" name="L650" href="#L650">650</a>         }
+<a class="jxr_linenumber" name="L651" href="#L651">651</a>     }
 <a class="jxr_linenumber" name="L652" href="#L652">652</a> 
-<a class="jxr_linenumber" name="L653" href="#L653">653</a>         
context.setTemplateProperties( attributes );
-<a class="jxr_linenumber" name="L654" href="#L654">654</a>         
context.setLocale( locale );
-<a class="jxr_linenumber" name="L655" href="#L655">655</a>         
context.setDecoration( decoration );
-<a class="jxr_linenumber" name="L656" href="#L656">656</a>         
context.setDefaultWindowTitle( defaultWindowTitle );
-<a class="jxr_linenumber" name="L657" href="#L657">657</a>         
context.setSkinJarFile( skinFile );
-<a class="jxr_linenumber" name="L658" href="#L658">658</a> 
-<a class="jxr_linenumber" name="L659" href="#L659">659</a>         <strong 
class="jxr_keyword">return</strong> context;
-<a class="jxr_linenumber" name="L660" href="#L660">660</a>     }
-<a class="jxr_linenumber" name="L661" href="#L661">661</a> 
-<a class="jxr_linenumber" name="L662" href="#L662">662</a>     <strong 
class="jxr_keyword">private</strong> <strong 
class="jxr_keyword">static</strong> ZipFile getZipFile( File file )
-<a class="jxr_linenumber" name="L663" href="#L663">663</a>         <strong 
class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="L664" href="#L664">664</a>     {
-<a class="jxr_linenumber" name="L665" href="#L665">665</a>         <strong 
class="jxr_keyword">if</strong> ( file == <strong 
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L666" href="#L666">666</a>         {
-<a class="jxr_linenumber" name="L667" href="#L667">667</a>             <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> 
IOException( <span class="jxr_string">"Error opening ZipFile: null"</span> );
-<a class="jxr_linenumber" name="L668" href="#L668">668</a>         }
-<a class="jxr_linenumber" name="L669" href="#L669">669</a> 
-<a class="jxr_linenumber" name="L670" href="#L670">670</a>         <strong 
class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L671" href="#L671">671</a>         {
-<a class="jxr_linenumber" name="L672" href="#L672">672</a>             <em 
class="jxr_comment">// TODO: plexus-archiver, if it could do the excludes</em>
-<a class="jxr_linenumber" name="L673" href="#L673">673</a>             <strong 
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> 
ZipFile( file );
-<a class="jxr_linenumber" name="L674" href="#L674">674</a>         }
-<a class="jxr_linenumber" name="L675" href="#L675">675</a>         <strong 
class="jxr_keyword">catch</strong> ( ZipException ex )
-<a class="jxr_linenumber" name="L676" href="#L676">676</a>         {
-<a class="jxr_linenumber" name="L677" href="#L677">677</a>             
IOException ioe = <strong class="jxr_keyword">new</strong> IOException( <span 
class="jxr_string">"Error opening ZipFile: "</span> + file.getAbsolutePath() );
-<a class="jxr_linenumber" name="L678" href="#L678">678</a>             
ioe.initCause( ex );
-<a class="jxr_linenumber" name="L679" href="#L679">679</a>             <strong 
class="jxr_keyword">throw</strong> ioe;
+<a class="jxr_linenumber" name="L653" href="#L653">653</a>     <em 
class="jxr_javadoccomment">/** {@inheritDoc} */</em>
+<a class="jxr_linenumber" name="L654" href="#L654">654</a>     <strong 
class="jxr_keyword">public</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a>
 createContextForSkin( File skinFile, Map&lt;String, ?&gt; attributes,
+<a class="jxr_linenumber" name="L655" href="#L655">655</a>                     
                                  <a 
href="../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html">DecorationModel</a>
 decoration, String defaultWindowTitle,
+<a class="jxr_linenumber" name="L656" href="#L656">656</a>                     
                                  Locale locale )
+<a class="jxr_linenumber" name="L657" href="#L657">657</a>             <strong 
class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L658" href="#L658">658</a>     {
+<a class="jxr_linenumber" name="L659" href="#L659">659</a>         <a 
href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a>
 context = <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a>();
+<a class="jxr_linenumber" name="L660" href="#L660">660</a> 
+<a class="jxr_linenumber" name="L661" href="#L661">661</a>         ZipFile 
zipFile = getZipFile( skinFile );
+<a class="jxr_linenumber" name="L662" href="#L662">662</a> 
+<a class="jxr_linenumber" name="L663" href="#L663">663</a>         <strong 
class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L664" href="#L664">664</a>         {
+<a class="jxr_linenumber" name="L665" href="#L665">665</a>             <strong 
class="jxr_keyword">if</strong> ( zipFile.getEntry( SKIN_TEMPLATE_LOCATION ) != 
<strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L666" href="#L666">666</a>             {
+<a class="jxr_linenumber" name="L667" href="#L667">667</a>                 
context.setTemplateName( SKIN_TEMPLATE_LOCATION );
+<a class="jxr_linenumber" name="L668" href="#L668">668</a>                 
context.setTemplateClassLoader( <strong class="jxr_keyword">new</strong> 
URLClassLoader( <strong class="jxr_keyword">new</strong> 
URL[]{skinFile.toURI().toURL()} ) );
+<a class="jxr_linenumber" name="L669" href="#L669">669</a>             }
+<a class="jxr_linenumber" name="L670" href="#L670">670</a>             <strong 
class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L671" href="#L671">671</a>             {
+<a class="jxr_linenumber" name="L672" href="#L672">672</a>                 
context.setTemplateName( DEFAULT_TEMPLATE );
+<a class="jxr_linenumber" name="L673" href="#L673">673</a>                 
context.setTemplateClassLoader( getClass().getClassLoader() );
+<a class="jxr_linenumber" name="L674" href="#L674">674</a>                 
context.setUsingDefaultTemplate( <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L675" href="#L675">675</a>             }
+<a class="jxr_linenumber" name="L676" href="#L676">676</a>         }
+<a class="jxr_linenumber" name="L677" href="#L677">677</a>         <strong 
class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="L678" href="#L678">678</a>         {
+<a class="jxr_linenumber" name="L679" href="#L679">679</a>             
closeZipFile( zipFile );
 <a class="jxr_linenumber" name="L680" href="#L680">680</a>         }
-<a class="jxr_linenumber" name="L681" href="#L681">681</a>     }
-<a class="jxr_linenumber" name="L682" href="#L682">682</a> 
-<a class="jxr_linenumber" name="L683" href="#L683">683</a>     <em 
class="jxr_javadoccomment">/** {@inheritDoc} */</em>
-<a class="jxr_linenumber" name="L684" href="#L684">684</a>     <strong 
class="jxr_keyword">public</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a>
 createContextForTemplate( File templateFile, File skinFile, Map&lt;String, 
?&gt; attributes,
-<a class="jxr_linenumber" name="L685" href="#L685">685</a>                     
                                      <a 
href="../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html">DecorationModel</a>
 decoration, String defaultWindowTitle,
-<a class="jxr_linenumber" name="L686" href="#L686">686</a>                     
                                      Locale locale )
-<a class="jxr_linenumber" name="L687" href="#L687">687</a>             <strong 
class="jxr_keyword">throws</strong> MalformedURLException
-<a class="jxr_linenumber" name="L688" href="#L688">688</a>     {
-<a class="jxr_linenumber" name="L689" href="#L689">689</a>         <a 
href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a>
 context = <strong class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a>();
+<a class="jxr_linenumber" name="L681" href="#L681">681</a> 
+<a class="jxr_linenumber" name="L682" href="#L682">682</a>         
context.setTemplateProperties( attributes );
+<a class="jxr_linenumber" name="L683" href="#L683">683</a>         
context.setLocale( locale );
+<a class="jxr_linenumber" name="L684" href="#L684">684</a>         
context.setDecoration( decoration );
+<a class="jxr_linenumber" name="L685" href="#L685">685</a>         
context.setDefaultWindowTitle( defaultWindowTitle );
+<a class="jxr_linenumber" name="L686" href="#L686">686</a>         
context.setSkinJarFile( skinFile );
+<a class="jxr_linenumber" name="L687" href="#L687">687</a> 
+<a class="jxr_linenumber" name="L688" href="#L688">688</a>         <strong 
class="jxr_keyword">return</strong> context;
+<a class="jxr_linenumber" name="L689" href="#L689">689</a>     }
 <a class="jxr_linenumber" name="L690" href="#L690">690</a> 
-<a class="jxr_linenumber" name="L691" href="#L691">691</a>         
context.setTemplateName( templateFile.getName() );
-<a class="jxr_linenumber" name="L692" href="#L692">692</a>         
context.setTemplateClassLoader( <strong class="jxr_keyword">new</strong> 
URLClassLoader( <strong class="jxr_keyword">new</strong> 
URL[]{templateFile.getParentFile().toURI().toURL()} ) );
-<a class="jxr_linenumber" name="L693" href="#L693">693</a> 
-<a class="jxr_linenumber" name="L694" href="#L694">694</a>         
context.setTemplateProperties( attributes );
-<a class="jxr_linenumber" name="L695" href="#L695">695</a>         
context.setLocale( locale );
-<a class="jxr_linenumber" name="L696" href="#L696">696</a>         
context.setDecoration( decoration );
-<a class="jxr_linenumber" name="L697" href="#L697">697</a>         
context.setDefaultWindowTitle( defaultWindowTitle );
-<a class="jxr_linenumber" name="L698" href="#L698">698</a>         
context.setSkinJarFile( skinFile );
-<a class="jxr_linenumber" name="L699" href="#L699">699</a> 
-<a class="jxr_linenumber" name="L700" href="#L700">700</a>         <strong 
class="jxr_keyword">return</strong> context;
-<a class="jxr_linenumber" name="L701" href="#L701">701</a>     }
-<a class="jxr_linenumber" name="L702" href="#L702">702</a> 
-<a class="jxr_linenumber" name="L703" href="#L703">703</a>     <strong 
class="jxr_keyword">private</strong> <strong 
class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> 
closeZipFile( ZipFile zipFile )
-<a class="jxr_linenumber" name="L704" href="#L704">704</a>     {
-<a class="jxr_linenumber" name="L705" href="#L705">705</a>         <em 
class="jxr_comment">// TODO: move to plexus utils</em>
-<a class="jxr_linenumber" name="L706" href="#L706">706</a>         <strong 
class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L707" href="#L707">707</a>         {
-<a class="jxr_linenumber" name="L708" href="#L708">708</a>             
zipFile.close();
+<a class="jxr_linenumber" name="L691" href="#L691">691</a>     <strong 
class="jxr_keyword">private</strong> <strong 
class="jxr_keyword">static</strong> ZipFile getZipFile( File file )
+<a class="jxr_linenumber" name="L692" href="#L692">692</a>         <strong 
class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L693" href="#L693">693</a>     {
+<a class="jxr_linenumber" name="L694" href="#L694">694</a>         <strong 
class="jxr_keyword">if</strong> ( file == <strong 
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L695" href="#L695">695</a>         {
+<a class="jxr_linenumber" name="L696" href="#L696">696</a>             <strong 
class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> 
IOException( <span class="jxr_string">"Error opening ZipFile: null"</span> );
+<a class="jxr_linenumber" name="L697" href="#L697">697</a>         }
+<a class="jxr_linenumber" name="L698" href="#L698">698</a> 
+<a class="jxr_linenumber" name="L699" href="#L699">699</a>         <strong 
class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L700" href="#L700">700</a>         {
+<a class="jxr_linenumber" name="L701" href="#L701">701</a>             <em 
class="jxr_comment">// TODO: plexus-archiver, if it could do the excludes</em>
+<a class="jxr_linenumber" name="L702" href="#L702">702</a>             <strong 
class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> 
ZipFile( file );
+<a class="jxr_linenumber" name="L703" href="#L703">703</a>         }
+<a class="jxr_linenumber" name="L704" href="#L704">704</a>         <strong 
class="jxr_keyword">catch</strong> ( ZipException ex )
+<a class="jxr_linenumber" name="L705" href="#L705">705</a>         {
+<a class="jxr_linenumber" name="L706" href="#L706">706</a>             
IOException ioe = <strong class="jxr_keyword">new</strong> IOException( <span 
class="jxr_string">"Error opening ZipFile: "</span> + file.getAbsolutePath() );
+<a class="jxr_linenumber" name="L707" href="#L707">707</a>             
ioe.initCause( ex );
+<a class="jxr_linenumber" name="L708" href="#L708">708</a>             <strong 
class="jxr_keyword">throw</strong> ioe;
 <a class="jxr_linenumber" name="L709" href="#L709">709</a>         }
-<a class="jxr_linenumber" name="L710" href="#L710">710</a>         <strong 
class="jxr_keyword">catch</strong> ( IOException e )
-<a class="jxr_linenumber" name="L711" href="#L711">711</a>         {

[... 512 lines stripped ...]


Reply via email to