svn commit: r984547 [25/26] - in /websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST: ./ apidocs/ apidocs/org/apache/maven/doxia/docrenderer/ apidocs/org/apache/maven/doxia/docrenderer/class-use/ apidocs/org/apache/...

[hb...@apache.org]

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 Sat Apr  2 19:42:07 2016
@@ -125,7 +125,7 @@
 <a class="jxr_linenumber" name="L117" href="#L117">117</a> <em class="jxr_javadoccomment"> *</em>
 <a class="jxr_linenumber" name="L118" href="#L118">118</a> <em class="jxr_javadoccomment"> * @author &lt;a href="<a href="mailto:evenisse@codehaus.org" target="alexandria_uri">mailto:evenisse@codehaus.org</a>"&gt;Emmanuel Venisse&lt;/a&gt;</em>
 <a class="jxr_linenumber" name="L119" href="#L119">119</a> <em class="jxr_javadoccomment"> * @author &lt;a href="<a href="mailto:vincent.siveton@gmail.com" target="alexandria_uri">mailto:vincent.siveton@gmail.com</a>"&gt;Vincent Siveton&lt;/a&gt;</em>
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_javadoccomment"> * @version $Id: DefaultSiteRenderer.java 1733840 2016-03-06 20:29:30Z michaelo $</em>
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_javadoccomment"> * @version $Id: DefaultSiteRenderer.java 1737181 2016-03-31 06:35:30Z hboutemy $</em>
 <a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment"> * @since 1.0</em>
 <a class="jxr_linenumber" name="L122" href="#L122">122</a> <em class="jxr_javadoccomment"> */</em>
 <a class="jxr_linenumber" name="L123" href="#L123">123</a> @Component( role = Renderer.<strong class="jxr_keyword">class</strong> )
@@ -639,506 +639,511 @@
 <a class="jxr_linenumber" name="L631" href="#L631">631</a> 
 <a class="jxr_linenumber" name="L632" href="#L632">632</a>         context.put( <span class="jxr_string">"bodyContent"</span>, siteRendererSink.getBody() );
 <a class="jxr_linenumber" name="L633" href="#L633">633</a> 
-<a class="jxr_linenumber" name="L634" href="#L634">634</a>         SimpleDateFormat sdf = <strong class="jxr_keyword">new</strong> SimpleDateFormat( <span class="jxr_string">"yyyyMMdd"</span> );
-<a class="jxr_linenumber" name="L635" href="#L635">635</a>         <strong class="jxr_keyword">if</strong> ( StringUtils.isNotEmpty( siteRendererSink.getDate() ) )
-<a class="jxr_linenumber" name="L636" href="#L636">636</a>         {
-<a class="jxr_linenumber" name="L637" href="#L637">637</a>             String documentDate = siteRendererSink.getDate();
-<a class="jxr_linenumber" name="L638" href="#L638">638</a> 
-<a class="jxr_linenumber" name="L639" href="#L639">639</a>             <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L640" href="#L640">640</a>             {
-<a class="jxr_linenumber" name="L641" href="#L641">641</a>                 <em class="jxr_comment">// we support only ISO 8601 date</em>
-<a class="jxr_linenumber" name="L642" href="#L642">642</a>                 Date creationDate = <strong class="jxr_keyword">new</strong> SimpleDateFormat( <span class="jxr_string">"yyyy-MM-dd"</span> ).parse( documentDate );
-<a class="jxr_linenumber" name="L643" href="#L643">643</a> 
-<a class="jxr_linenumber" name="L644" href="#L644">644</a>                 context.put( <span class="jxr_string">"creationDate"</span>, creationDate );
-<a class="jxr_linenumber" name="L645" href="#L645">645</a>                 context.put( <span class="jxr_string">"dateCreation"</span>, sdf.format( creationDate ) );
-<a class="jxr_linenumber" name="L646" href="#L646">646</a>             }
-<a class="jxr_linenumber" name="L647" href="#L647">647</a>             <strong class="jxr_keyword">catch</strong> ( java.text.ParseException e )
-<a class="jxr_linenumber" name="L648" href="#L648">648</a>             {
-<a class="jxr_linenumber" name="L649" href="#L649">649</a>                 getLogger().warn( <span class="jxr_string">"Could not parse date '"</span> + documentDate + <span class="jxr_string">"' from "</span>
-<a class="jxr_linenumber" name="L650" href="#L650">650</a>                     + siteRendererSink.getRenderingContext().getInputName()
-<a class="jxr_linenumber" name="L651" href="#L651">651</a>                     + <span class="jxr_string">" (expected yyyy-MM-dd format), ignoring!"</span> );
-<a class="jxr_linenumber" name="L652" href="#L652">652</a>             }
-<a class="jxr_linenumber" name="L653" href="#L653">653</a>         }
-<a class="jxr_linenumber" name="L654" href="#L654">654</a> 
-<a class="jxr_linenumber" name="L655" href="#L655">655</a>         <strong class="jxr_keyword">return</strong> context;
-<a class="jxr_linenumber" name="L656" href="#L656">656</a>     }
-<a class="jxr_linenumber" name="L657" href="#L657">657</a> 
-<a class="jxr_linenumber" name="L658" href="#L658">658</a>     <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
-<a class="jxr_linenumber" name="L659" href="#L659">659</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="L660" href="#L660">660</a>             <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>
-<a class="jxr_linenumber" name="L661" href="#L661">661</a>     {
-<a class="jxr_linenumber" name="L662" href="#L662">662</a>         String templateName = siteRenderingContext.getTemplateName();
-<a class="jxr_linenumber" name="L663" href="#L663">663</a> 
-<a class="jxr_linenumber" name="L664" href="#L664">664</a>         getLogger().debug( <span class="jxr_string">"Processing Velocity for template "</span> + templateName + <span class="jxr_string">" on "</span>
-<a class="jxr_linenumber" name="L665" href="#L665">665</a>             + sink.getRenderingContext().getInputName() );
-<a class="jxr_linenumber" name="L666" href="#L666">666</a> 
-<a class="jxr_linenumber" name="L667" href="#L667">667</a>         Context context = createSiteTemplateVelocityContext( sink, siteRenderingContext );
+<a class="jxr_linenumber" name="L634" href="#L634">634</a>         <em class="jxr_comment">// document date (got from Doxia Sink date() API)</em>
+<a class="jxr_linenumber" name="L635" href="#L635">635</a>         String documentDate = siteRendererSink.getDate();
+<a class="jxr_linenumber" name="L636" href="#L636">636</a>         <strong class="jxr_keyword">if</strong> ( StringUtils.isNotEmpty( documentDate ) )
+<a class="jxr_linenumber" name="L637" href="#L637">637</a>         {
+<a class="jxr_linenumber" name="L638" href="#L638">638</a>             context.put( <span class="jxr_string">"documentDate"</span>, documentDate );
+<a class="jxr_linenumber" name="L639" href="#L639">639</a> 
+<a class="jxr_linenumber" name="L640" href="#L640">640</a>             <em class="jxr_comment">// deprecated variables that rework the document date, suppose one semantics over others</em>
+<a class="jxr_linenumber" name="L641" href="#L641">641</a>             <em class="jxr_comment">// (ie creation date, while it may be last modification date if the document writer decided so)</em>
+<a class="jxr_linenumber" name="L642" href="#L642">642</a>             <em class="jxr_comment">// see DOXIASITETOOLS-20 for the beginning and DOXIASITETOOLS-164 for the end of this story</em>
+<a class="jxr_linenumber" name="L643" href="#L643">643</a>             <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L644" href="#L644">644</a>             {
+<a class="jxr_linenumber" name="L645" href="#L645">645</a>                 <em class="jxr_comment">// we support only ISO 8601 date</em>
+<a class="jxr_linenumber" name="L646" href="#L646">646</a>                 Date creationDate = <strong class="jxr_keyword">new</strong> SimpleDateFormat( <span class="jxr_string">"yyyy-MM-dd"</span> ).parse( documentDate );
+<a class="jxr_linenumber" name="L647" href="#L647">647</a> 
+<a class="jxr_linenumber" name="L648" href="#L648">648</a>                 context.put( <span class="jxr_string">"creationDate"</span>, creationDate );
+<a class="jxr_linenumber" name="L649" href="#L649">649</a>                 SimpleDateFormat sdf = <strong class="jxr_keyword">new</strong> SimpleDateFormat( <span class="jxr_string">"yyyyMMdd"</span> );
+<a class="jxr_linenumber" name="L650" href="#L650">650</a>                 context.put( <span class="jxr_string">"dateCreation"</span>, sdf.format( creationDate ) );
+<a class="jxr_linenumber" name="L651" href="#L651">651</a>             }
+<a class="jxr_linenumber" name="L652" href="#L652">652</a>             <strong class="jxr_keyword">catch</strong> ( java.text.ParseException e )
+<a class="jxr_linenumber" name="L653" href="#L653">653</a>             {
+<a class="jxr_linenumber" name="L654" href="#L654">654</a>                 getLogger().warn( <span class="jxr_string">"Could not parse date '"</span> + documentDate + <span class="jxr_string">"' from "</span>
+<a class="jxr_linenumber" name="L655" href="#L655">655</a>                     + siteRendererSink.getRenderingContext().getInputName()
+<a class="jxr_linenumber" name="L656" href="#L656">656</a>                     + <span class="jxr_string">" (expected yyyy-MM-dd format), ignoring!"</span> );
+<a class="jxr_linenumber" name="L657" href="#L657">657</a>             }
+<a class="jxr_linenumber" name="L658" href="#L658">658</a>         }
+<a class="jxr_linenumber" name="L659" href="#L659">659</a> 
+<a class="jxr_linenumber" name="L660" href="#L660">660</a>         <strong class="jxr_keyword">return</strong> context;
+<a class="jxr_linenumber" name="L661" href="#L661">661</a>     }
+<a class="jxr_linenumber" name="L662" href="#L662">662</a> 
+<a class="jxr_linenumber" name="L663" href="#L663">663</a>     <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
+<a class="jxr_linenumber" name="L664" href="#L664">664</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="L665" href="#L665">665</a>             <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>
+<a class="jxr_linenumber" name="L666" href="#L666">666</a>     {
+<a class="jxr_linenumber" name="L667" href="#L667">667</a>         String templateName = siteRenderingContext.getTemplateName();
 <a class="jxr_linenumber" name="L668" href="#L668">668</a> 
-<a class="jxr_linenumber" name="L669" href="#L669">669</a>         ClassLoader old = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L670" href="#L670">670</a> 
-<a class="jxr_linenumber" name="L671" href="#L671">671</a>         <strong class="jxr_keyword">if</strong> ( siteRenderingContext.getTemplateClassLoader() != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L672" href="#L672">672</a>         {
-<a class="jxr_linenumber" name="L673" href="#L673">673</a>             <em class="jxr_comment">// -------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L674" href="#L674">674</a>             <em class="jxr_comment">// If no template classloader was set we'll just use the context classloader</em>
-<a class="jxr_linenumber" name="L675" href="#L675">675</a>             <em class="jxr_comment">// -------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L676" href="#L676">676</a> 
-<a class="jxr_linenumber" name="L677" href="#L677">677</a>             old = Thread.currentThread().getContextClassLoader();
-<a class="jxr_linenumber" name="L678" href="#L678">678</a> 
-<a class="jxr_linenumber" name="L679" href="#L679">679</a>             Thread.currentThread().setContextClassLoader( siteRenderingContext.getTemplateClassLoader() );
-<a class="jxr_linenumber" name="L680" href="#L680">680</a>         }
+<a class="jxr_linenumber" name="L669" href="#L669">669</a>         getLogger().debug( <span class="jxr_string">"Processing Velocity for template "</span> + templateName + <span class="jxr_string">" on "</span>
+<a class="jxr_linenumber" name="L670" href="#L670">670</a>             + sink.getRenderingContext().getInputName() );
+<a class="jxr_linenumber" name="L671" href="#L671">671</a> 
+<a class="jxr_linenumber" name="L672" href="#L672">672</a>         Context context = createSiteTemplateVelocityContext( sink, siteRenderingContext );
+<a class="jxr_linenumber" name="L673" href="#L673">673</a> 
+<a class="jxr_linenumber" name="L674" href="#L674">674</a>         ClassLoader old = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L675" href="#L675">675</a> 
+<a class="jxr_linenumber" name="L676" href="#L676">676</a>         <strong class="jxr_keyword">if</strong> ( siteRenderingContext.getTemplateClassLoader() != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L677" href="#L677">677</a>         {
+<a class="jxr_linenumber" name="L678" href="#L678">678</a>             <em class="jxr_comment">// -------------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L679" href="#L679">679</a>             <em class="jxr_comment">// If no template classloader was set we'll just use the context classloader</em>
+<a class="jxr_linenumber" name="L680" href="#L680">680</a>             <em class="jxr_comment">// -------------------------------------------------------------------------</em>
 <a class="jxr_linenumber" name="L681" href="#L681">681</a> 
-<a class="jxr_linenumber" name="L682" href="#L682">682</a>         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L683" href="#L683">683</a>         {
-<a class="jxr_linenumber" name="L684" href="#L684">684</a>             Template template;
-<a class="jxr_linenumber" name="L685" href="#L685">685</a> 
-<a class="jxr_linenumber" name="L686" href="#L686">686</a>             <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L687" href="#L687">687</a>             {
-<a class="jxr_linenumber" name="L688" href="#L688">688</a>                 <a href="../../../../../org/apache/maven/doxia/site/skin/SkinModel.html">SkinModel</a> skinModel = siteRenderingContext.getSkinModel();
-<a class="jxr_linenumber" name="L689" href="#L689">689</a>                 String encoding = ( skinModel == <strong class="jxr_keyword">null</strong> ) ? <strong class="jxr_keyword">null</strong> : skinModel.getEncoding();
+<a class="jxr_linenumber" name="L682" href="#L682">682</a>             old = Thread.currentThread().getContextClassLoader();
+<a class="jxr_linenumber" name="L683" href="#L683">683</a> 
+<a class="jxr_linenumber" name="L684" href="#L684">684</a>             Thread.currentThread().setContextClassLoader( siteRenderingContext.getTemplateClassLoader() );
+<a class="jxr_linenumber" name="L685" href="#L685">685</a>         }
+<a class="jxr_linenumber" name="L686" href="#L686">686</a> 
+<a class="jxr_linenumber" name="L687" href="#L687">687</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L688" href="#L688">688</a>         {
+<a class="jxr_linenumber" name="L689" href="#L689">689</a>             Template template;
 <a class="jxr_linenumber" name="L690" href="#L690">690</a> 
-<a class="jxr_linenumber" name="L691" href="#L691">691</a>                 template = ( encoding == <strong class="jxr_keyword">null</strong> ) ? velocity.getEngine().getTemplate( templateName )
-<a class="jxr_linenumber" name="L692" href="#L692">692</a>                                 : velocity.getEngine().getTemplate( templateName, encoding );
-<a class="jxr_linenumber" name="L693" href="#L693">693</a>             }
-<a class="jxr_linenumber" name="L694" href="#L694">694</a>             <strong class="jxr_keyword">catch</strong> ( Exception e )
-<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> <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="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="L691" href="#L691">691</a>             <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L692" href="#L692">692</a>             {
+<a class="jxr_linenumber" name="L693" href="#L693">693</a>                 <a href="../../../../../org/apache/maven/doxia/site/skin/SkinModel.html">SkinModel</a> skinModel = siteRenderingContext.getSkinModel();
+<a class="jxr_linenumber" name="L694" href="#L694">694</a>                 String encoding = ( skinModel == <strong class="jxr_keyword">null</strong> ) ? <strong class="jxr_keyword">null</strong> : skinModel.getEncoding();
+<a class="jxr_linenumber" name="L695" href="#L695">695</a> 
+<a class="jxr_linenumber" name="L696" href="#L696">696</a>                 template = ( encoding == <strong class="jxr_keyword">null</strong> ) ? velocity.getEngine().getTemplate( templateName )
+<a class="jxr_linenumber" name="L697" href="#L697">697</a>                                 : velocity.getEngine().getTemplate( templateName, encoding );
+<a class="jxr_linenumber" name="L698" href="#L698">698</a>             }
+<a class="jxr_linenumber" name="L699" href="#L699">699</a>             <strong class="jxr_keyword">catch</strong> ( Exception e )
 <a class="jxr_linenumber" name="L700" href="#L700">700</a>             {
-<a class="jxr_linenumber" name="L701" href="#L701">701</a>                 StringWriter sw = <strong class="jxr_keyword">new</strong> StringWriter();
-<a class="jxr_linenumber" name="L702" href="#L702">702</a>                 template.merge( context, sw );
-<a class="jxr_linenumber" name="L703" href="#L703">703</a>                 writer.write( sw.toString().replaceAll( <span class="jxr_string">"\r?\n"</span>, SystemUtils.LINE_SEPARATOR ) );
-<a class="jxr_linenumber" name="L704" href="#L704">704</a>             }
-<a class="jxr_linenumber" name="L705" href="#L705">705</a>             <strong class="jxr_keyword">catch</strong> ( Exception e )
-<a class="jxr_linenumber" name="L706" href="#L706">706</a>             {
-<a class="jxr_linenumber" name="L707" href="#L707">707</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="L708" href="#L708">708</a>             }
-<a class="jxr_linenumber" name="L709" href="#L709">709</a>         }
-<a class="jxr_linenumber" name="L710" href="#L710">710</a>         <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L711" href="#L711">711</a>         {
-<a class="jxr_linenumber" name="L712" href="#L712">712</a>             IOUtil.close( writer );
-<a class="jxr_linenumber" name="L713" href="#L713">713</a> 
-<a class="jxr_linenumber" name="L714" href="#L714">714</a>             <strong class="jxr_keyword">if</strong> ( old != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L715" href="#L715">715</a>             {
-<a class="jxr_linenumber" name="L716" href="#L716">716</a>                 Thread.currentThread().setContextClassLoader( old );
-<a class="jxr_linenumber" name="L717" href="#L717">717</a>             }
-<a class="jxr_linenumber" name="L718" href="#L718">718</a>         }
-<a class="jxr_linenumber" name="L719" href="#L719">719</a>     }
-<a class="jxr_linenumber" name="L720" href="#L720">720</a> 
-<a class="jxr_linenumber" name="L721" href="#L721">721</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a> createSiteRenderingContext( Map&lt;String, ?&gt; attributes, DecorationModel decoration,
-<a class="jxr_linenumber" name="L722" href="#L722">722</a>                                                              String defaultWindowTitle, Locale locale )
-<a class="jxr_linenumber" name="L723" href="#L723">723</a>     {
-<a class="jxr_linenumber" name="L724" href="#L724">724</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="L701" href="#L701">701</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="L702" href="#L702">702</a>             }
+<a class="jxr_linenumber" name="L703" href="#L703">703</a> 
+<a class="jxr_linenumber" name="L704" href="#L704">704</a>             <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L705" href="#L705">705</a>             {
+<a class="jxr_linenumber" name="L706" href="#L706">706</a>                 StringWriter sw = <strong class="jxr_keyword">new</strong> StringWriter();
+<a class="jxr_linenumber" name="L707" href="#L707">707</a>                 template.merge( context, sw );
+<a class="jxr_linenumber" name="L708" href="#L708">708</a>                 writer.write( sw.toString().replaceAll( <span class="jxr_string">"\r?\n"</span>, SystemUtils.LINE_SEPARATOR ) );
+<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> ( Exception e )
+<a class="jxr_linenumber" name="L711" href="#L711">711</a>             {
+<a class="jxr_linenumber" name="L712" href="#L712">712</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="L713" href="#L713">713</a>             }
+<a class="jxr_linenumber" name="L714" href="#L714">714</a>         }
+<a class="jxr_linenumber" name="L715" href="#L715">715</a>         <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="L716" href="#L716">716</a>         {
+<a class="jxr_linenumber" name="L717" href="#L717">717</a>             IOUtil.close( writer );
+<a class="jxr_linenumber" name="L718" href="#L718">718</a> 
+<a class="jxr_linenumber" name="L719" href="#L719">719</a>             <strong class="jxr_keyword">if</strong> ( old != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L720" href="#L720">720</a>             {
+<a class="jxr_linenumber" name="L721" href="#L721">721</a>                 Thread.currentThread().setContextClassLoader( old );
+<a class="jxr_linenumber" name="L722" href="#L722">722</a>             }
+<a class="jxr_linenumber" name="L723" href="#L723">723</a>         }
+<a class="jxr_linenumber" name="L724" href="#L724">724</a>     }
 <a class="jxr_linenumber" name="L725" href="#L725">725</a> 
-<a class="jxr_linenumber" name="L726" href="#L726">726</a>         context.setTemplateProperties( attributes );
-<a class="jxr_linenumber" name="L727" href="#L727">727</a>         context.setLocale( locale );
-<a class="jxr_linenumber" name="L728" href="#L728">728</a>         context.setDecoration( decoration );
-<a class="jxr_linenumber" name="L729" href="#L729">729</a>         context.setDefaultWindowTitle( defaultWindowTitle );
+<a class="jxr_linenumber" name="L726" href="#L726">726</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a> createSiteRenderingContext( Map&lt;String, ?&gt; attributes, DecorationModel decoration,
+<a class="jxr_linenumber" name="L727" href="#L727">727</a>                                                              String defaultWindowTitle, Locale locale )
+<a class="jxr_linenumber" name="L728" href="#L728">728</a>     {
+<a class="jxr_linenumber" name="L729" href="#L729">729</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="L730" href="#L730">730</a> 
-<a class="jxr_linenumber" name="L731" href="#L731">731</a>         <strong class="jxr_keyword">return</strong> context;
-<a class="jxr_linenumber" name="L732" href="#L732">732</a>     }
-<a class="jxr_linenumber" name="L733" href="#L733">733</a> 
-<a class="jxr_linenumber" name="L734" href="#L734">734</a>     <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
-<a class="jxr_linenumber" name="L735" href="#L735">735</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="L736" href="#L736">736</a>                                                       <a href="../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html">DecorationModel</a> decoration, String defaultWindowTitle,
-<a class="jxr_linenumber" name="L737" href="#L737">737</a>                                                       Locale locale )
-<a class="jxr_linenumber" name="L738" href="#L738">738</a>             <strong class="jxr_keyword">throws</strong> IOException, <a href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>
-<a class="jxr_linenumber" name="L739" href="#L739">739</a>     {
-<a class="jxr_linenumber" name="L740" href="#L740">740</a>         <a href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a> context = createSiteRenderingContext( attributes, decoration, defaultWindowTitle, locale );
-<a class="jxr_linenumber" name="L741" href="#L741">741</a> 
-<a class="jxr_linenumber" name="L742" href="#L742">742</a>         context.setSkinJarFile( skinFile );
-<a class="jxr_linenumber" name="L743" href="#L743">743</a> 
-<a class="jxr_linenumber" name="L744" href="#L744">744</a>         ZipFile zipFile = getZipFile( skinFile );
-<a class="jxr_linenumber" name="L745" href="#L745">745</a>         InputStream in = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L731" href="#L731">731</a>         context.setTemplateProperties( attributes );
+<a class="jxr_linenumber" name="L732" href="#L732">732</a>         context.setLocale( locale );
+<a class="jxr_linenumber" name="L733" href="#L733">733</a>         context.setDecoration( decoration );
+<a class="jxr_linenumber" name="L734" href="#L734">734</a>         context.setDefaultWindowTitle( defaultWindowTitle );
+<a class="jxr_linenumber" name="L735" href="#L735">735</a> 
+<a class="jxr_linenumber" name="L736" href="#L736">736</a>         <strong class="jxr_keyword">return</strong> context;
+<a class="jxr_linenumber" name="L737" href="#L737">737</a>     }
+<a class="jxr_linenumber" name="L738" href="#L738">738</a> 
+<a class="jxr_linenumber" name="L739" href="#L739">739</a>     <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
+<a class="jxr_linenumber" name="L740" href="#L740">740</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="L741" href="#L741">741</a>                                                       <a href="../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html">DecorationModel</a> decoration, String defaultWindowTitle,
+<a class="jxr_linenumber" name="L742" href="#L742">742</a>                                                       Locale locale )
+<a class="jxr_linenumber" name="L743" href="#L743">743</a>             <strong class="jxr_keyword">throws</strong> IOException, <a href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>
+<a class="jxr_linenumber" name="L744" href="#L744">744</a>     {
+<a class="jxr_linenumber" name="L745" href="#L745">745</a>         <a href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a> context = createSiteRenderingContext( attributes, decoration, defaultWindowTitle, locale );
 <a class="jxr_linenumber" name="L746" href="#L746">746</a> 
-<a class="jxr_linenumber" name="L747" href="#L747">747</a>         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L748" href="#L748">748</a>         {
-<a class="jxr_linenumber" name="L749" href="#L749">749</a>             <strong class="jxr_keyword">if</strong> ( zipFile.getEntry( SKIN_TEMPLATE_LOCATION ) != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L750" href="#L750">750</a>             {
-<a class="jxr_linenumber" name="L751" href="#L751">751</a>                 context.setTemplateName( SKIN_TEMPLATE_LOCATION );
-<a class="jxr_linenumber" name="L752" href="#L752">752</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="L753" href="#L753">753</a>             }
-<a class="jxr_linenumber" name="L754" href="#L754">754</a>             <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L747" href="#L747">747</a>         context.setSkinJarFile( skinFile );
+<a class="jxr_linenumber" name="L748" href="#L748">748</a> 
+<a class="jxr_linenumber" name="L749" href="#L749">749</a>         ZipFile zipFile = getZipFile( skinFile );
+<a class="jxr_linenumber" name="L750" href="#L750">750</a>         InputStream in = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L751" href="#L751">751</a> 
+<a class="jxr_linenumber" name="L752" href="#L752">752</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L753" href="#L753">753</a>         {
+<a class="jxr_linenumber" name="L754" href="#L754">754</a>             <strong class="jxr_keyword">if</strong> ( zipFile.getEntry( SKIN_TEMPLATE_LOCATION ) != <strong class="jxr_keyword">null</strong> )
 <a class="jxr_linenumber" name="L755" href="#L755">755</a>             {
-<a class="jxr_linenumber" name="L756" href="#L756">756</a>                 context.setTemplateName( DEFAULT_TEMPLATE );
-<a class="jxr_linenumber" name="L757" href="#L757">757</a>                 context.setTemplateClassLoader( getClass().getClassLoader() );
-<a class="jxr_linenumber" name="L758" href="#L758">758</a>                 context.setUsingDefaultTemplate( <strong class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="L759" href="#L759">759</a>             }
-<a class="jxr_linenumber" name="L760" href="#L760">760</a> 
-<a class="jxr_linenumber" name="L761" href="#L761">761</a>             ZipEntry skinDescriptorEntry = zipFile.getEntry( SkinModel.SKIN_DESCRIPTOR_LOCATION );
-<a class="jxr_linenumber" name="L762" href="#L762">762</a>             <strong class="jxr_keyword">if</strong> ( skinDescriptorEntry != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L763" href="#L763">763</a>             {
-<a class="jxr_linenumber" name="L764" href="#L764">764</a>                 in = zipFile.getInputStream( skinDescriptorEntry );
+<a class="jxr_linenumber" name="L756" href="#L756">756</a>                 context.setTemplateName( SKIN_TEMPLATE_LOCATION );
+<a class="jxr_linenumber" name="L757" href="#L757">757</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="L758" href="#L758">758</a>             }
+<a class="jxr_linenumber" name="L759" href="#L759">759</a>             <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L760" href="#L760">760</a>             {
+<a class="jxr_linenumber" name="L761" href="#L761">761</a>                 context.setTemplateName( DEFAULT_TEMPLATE );
+<a class="jxr_linenumber" name="L762" href="#L762">762</a>                 context.setTemplateClassLoader( getClass().getClassLoader() );
+<a class="jxr_linenumber" name="L763" href="#L763">763</a>                 context.setUsingDefaultTemplate( <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L764" href="#L764">764</a>             }
 <a class="jxr_linenumber" name="L765" href="#L765">765</a> 
-<a class="jxr_linenumber" name="L766" href="#L766">766</a>                 <a href="../../../../../org/apache/maven/doxia/site/skin/SkinModel.html">SkinModel</a> skinModel = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/site/skin/io/xpp3/SkinXpp3Reader.html">SkinXpp3Reader</a>().read( in );
-<a class="jxr_linenumber" name="L767" href="#L767">767</a>                 context.setSkinModel( skinModel );
-<a class="jxr_linenumber" name="L768" href="#L768">768</a> 
-<a class="jxr_linenumber" name="L769" href="#L769">769</a>                 String toolsPrerequisite =
-<a class="jxr_linenumber" name="L770" href="#L770">770</a>                     skinModel.getPrerequisites() == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : skinModel.getPrerequisites().getDoxiaSitetools();
-<a class="jxr_linenumber" name="L771" href="#L771">771</a> 
-<a class="jxr_linenumber" name="L772" href="#L772">772</a>                 Package p = DefaultSiteRenderer.<strong class="jxr_keyword">class</strong>.getPackage();
-<a class="jxr_linenumber" name="L773" href="#L773">773</a>                 String current = ( p == <strong class="jxr_keyword">null</strong> ) ? <strong class="jxr_keyword">null</strong> : p.getSpecificationVersion();
-<a class="jxr_linenumber" name="L774" href="#L774">774</a> 
-<a class="jxr_linenumber" name="L775" href="#L775">775</a>                 <strong class="jxr_keyword">if</strong> ( StringUtils.isNotBlank( toolsPrerequisite ) &amp;&amp; ( current != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L776" href="#L776">776</a>                     &amp;&amp; !matchVersion( current, toolsPrerequisite ) )
-<a class="jxr_linenumber" name="L777" href="#L777">777</a>                 {
-<a class="jxr_linenumber" name="L778" href="#L778">778</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">"Cannot use skin: has "</span> + toolsPrerequisite
-<a class="jxr_linenumber" name="L779" href="#L779">779</a>                         + <span class="jxr_string">" Doxia Sitetools prerequisite, but current is "</span> + current );
-<a class="jxr_linenumber" name="L780" href="#L780">780</a>                 }
-<a class="jxr_linenumber" name="L781" href="#L781">781</a>             }
-<a class="jxr_linenumber" name="L782" href="#L782">782</a>         }
-<a class="jxr_linenumber" name="L783" href="#L783">783</a>         <strong class="jxr_keyword">catch</strong> ( XmlPullParserException e )
-<a class="jxr_linenumber" name="L784" href="#L784">784</a>         {
-<a class="jxr_linenumber" name="L785" href="#L785">785</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">"Failed to parse "</span> + SkinModel.SKIN_DESCRIPTOR_LOCATION
-<a class="jxr_linenumber" name="L786" href="#L786">786</a>                 + <span class="jxr_string">" skin descriptor from "</span> + skinFile, e );
+<a class="jxr_linenumber" name="L766" href="#L766">766</a>             ZipEntry skinDescriptorEntry = zipFile.getEntry( SkinModel.SKIN_DESCRIPTOR_LOCATION );
+<a class="jxr_linenumber" name="L767" href="#L767">767</a>             <strong class="jxr_keyword">if</strong> ( skinDescriptorEntry != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L768" href="#L768">768</a>             {
+<a class="jxr_linenumber" name="L769" href="#L769">769</a>                 in = zipFile.getInputStream( skinDescriptorEntry );
+<a class="jxr_linenumber" name="L770" href="#L770">770</a> 
+<a class="jxr_linenumber" name="L771" href="#L771">771</a>                 <a href="../../../../../org/apache/maven/doxia/site/skin/SkinModel.html">SkinModel</a> skinModel = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/site/skin/io/xpp3/SkinXpp3Reader.html">SkinXpp3Reader</a>().read( in );
+<a class="jxr_linenumber" name="L772" href="#L772">772</a>                 context.setSkinModel( skinModel );
+<a class="jxr_linenumber" name="L773" href="#L773">773</a> 
+<a class="jxr_linenumber" name="L774" href="#L774">774</a>                 String toolsPrerequisite =
+<a class="jxr_linenumber" name="L775" href="#L775">775</a>                     skinModel.getPrerequisites() == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : skinModel.getPrerequisites().getDoxiaSitetools();
+<a class="jxr_linenumber" name="L776" href="#L776">776</a> 
+<a class="jxr_linenumber" name="L777" href="#L777">777</a>                 Package p = DefaultSiteRenderer.<strong class="jxr_keyword">class</strong>.getPackage();
+<a class="jxr_linenumber" name="L778" href="#L778">778</a>                 String current = ( p == <strong class="jxr_keyword">null</strong> ) ? <strong class="jxr_keyword">null</strong> : p.getSpecificationVersion();
+<a class="jxr_linenumber" name="L779" href="#L779">779</a> 
+<a class="jxr_linenumber" name="L780" href="#L780">780</a>                 <strong class="jxr_keyword">if</strong> ( StringUtils.isNotBlank( toolsPrerequisite ) &amp;&amp; ( current != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L781" href="#L781">781</a>                     &amp;&amp; !matchVersion( current, toolsPrerequisite ) )
+<a class="jxr_linenumber" name="L782" href="#L782">782</a>                 {
+<a class="jxr_linenumber" name="L783" href="#L783">783</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">"Cannot use skin: has "</span> + toolsPrerequisite
+<a class="jxr_linenumber" name="L784" href="#L784">784</a>                         + <span class="jxr_string">" Doxia Sitetools prerequisite, but current is "</span> + current );
+<a class="jxr_linenumber" name="L785" href="#L785">785</a>                 }
+<a class="jxr_linenumber" name="L786" href="#L786">786</a>             }
 <a class="jxr_linenumber" name="L787" href="#L787">787</a>         }
-<a class="jxr_linenumber" name="L788" href="#L788">788</a>         <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="L788" href="#L788">788</a>         <strong class="jxr_keyword">catch</strong> ( XmlPullParserException e )
 <a class="jxr_linenumber" name="L789" href="#L789">789</a>         {
-<a class="jxr_linenumber" name="L790" href="#L790">790</a>             IOUtil.close( in );
-<a class="jxr_linenumber" name="L791" href="#L791">791</a>             closeZipFile( zipFile );
+<a class="jxr_linenumber" name="L790" href="#L790">790</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">"Failed to parse "</span> + SkinModel.SKIN_DESCRIPTOR_LOCATION
+<a class="jxr_linenumber" name="L791" href="#L791">791</a>                 + <span class="jxr_string">" skin descriptor from "</span> + skinFile, e );
 <a class="jxr_linenumber" name="L792" href="#L792">792</a>         }
-<a class="jxr_linenumber" name="L793" href="#L793">793</a> 
-<a class="jxr_linenumber" name="L794" href="#L794">794</a>         <strong class="jxr_keyword">return</strong> context;
-<a class="jxr_linenumber" name="L795" href="#L795">795</a>     }
-<a class="jxr_linenumber" name="L796" href="#L796">796</a> 
-<a class="jxr_linenumber" name="L797" href="#L797">797</a>     <strong class="jxr_keyword">boolean</strong> matchVersion( String current, String prerequisite )
-<a class="jxr_linenumber" name="L798" href="#L798">798</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>
-<a class="jxr_linenumber" name="L799" href="#L799">799</a>     {
-<a class="jxr_linenumber" name="L800" href="#L800">800</a>         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L801" href="#L801">801</a>         {
-<a class="jxr_linenumber" name="L802" href="#L802">802</a>             ArtifactVersion v = <strong class="jxr_keyword">new</strong> DefaultArtifactVersion( current );
-<a class="jxr_linenumber" name="L803" href="#L803">803</a>             VersionRange vr = VersionRange.createFromVersionSpec( prerequisite );
-<a class="jxr_linenumber" name="L804" href="#L804">804</a> 
-<a class="jxr_linenumber" name="L805" href="#L805">805</a>             <strong class="jxr_keyword">boolean</strong> matched = false;
-<a class="jxr_linenumber" name="L806" href="#L806">806</a>             ArtifactVersion recommendedVersion = vr.getRecommendedVersion();
-<a class="jxr_linenumber" name="L807" href="#L807">807</a>             <strong class="jxr_keyword">if</strong> ( recommendedVersion == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L808" href="#L808">808</a>             {
-<a class="jxr_linenumber" name="L809" href="#L809">809</a>                 List&lt;Restriction&gt; restrictions = vr.getRestrictions();
-<a class="jxr_linenumber" name="L810" href="#L810">810</a>                 <strong class="jxr_keyword">for</strong> ( Restriction restriction : restrictions )
-<a class="jxr_linenumber" name="L811" href="#L811">811</a>                 {
-<a class="jxr_linenumber" name="L812" href="#L812">812</a>                     <strong class="jxr_keyword">if</strong> ( restriction.containsVersion( v ) )
-<a class="jxr_linenumber" name="L813" href="#L813">813</a>                     {
-<a class="jxr_linenumber" name="L814" href="#L814">814</a>                         matched = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L815" href="#L815">815</a>                         <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="L816" href="#L816">816</a>                     }
-<a class="jxr_linenumber" name="L817" href="#L817">817</a>                 }
-<a class="jxr_linenumber" name="L818" href="#L818">818</a>             }
-<a class="jxr_linenumber" name="L819" href="#L819">819</a>             <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L820" href="#L820">820</a>             {
-<a class="jxr_linenumber" name="L821" href="#L821">821</a>                 <em class="jxr_comment">// only singular versions ever have a recommendedVersion</em>
-<a class="jxr_linenumber" name="L822" href="#L822">822</a>                 @SuppressWarnings( <span class="jxr_string">"unchecked"</span> )
-<a class="jxr_linenumber" name="L823" href="#L823">823</a>                 <strong class="jxr_keyword">int</strong> compareTo = recommendedVersion.compareTo( v );
-<a class="jxr_linenumber" name="L824" href="#L824">824</a>                 matched = ( compareTo &lt;= 0 );
-<a class="jxr_linenumber" name="L825" href="#L825">825</a>             }
-<a class="jxr_linenumber" name="L826" href="#L826">826</a> 
-<a class="jxr_linenumber" name="L827" href="#L827">827</a>             <strong class="jxr_keyword">if</strong> ( getLogger().isDebugEnabled() )
-<a class="jxr_linenumber" name="L828" href="#L828">828</a>             {
-<a class="jxr_linenumber" name="L829" href="#L829">829</a>                 getLogger().debug( <span class="jxr_string">"Skin doxia-sitetools prerequisite: "</span> + prerequisite + <span class="jxr_string">", current: "</span> + current
-<a class="jxr_linenumber" name="L830" href="#L830">830</a>                     + <span class="jxr_string">", matched = "</span> + matched );
-<a class="jxr_linenumber" name="L831" href="#L831">831</a>             }
-<a class="jxr_linenumber" name="L832" href="#L832">832</a> 
-<a class="jxr_linenumber" name="L833" href="#L833">833</a>             <strong class="jxr_keyword">return</strong> matched;
-<a class="jxr_linenumber" name="L834" href="#L834">834</a>         }
-<a class="jxr_linenumber" name="L835" href="#L835">835</a>         <strong class="jxr_keyword">catch</strong> ( InvalidVersionSpecificationException e )
-<a class="jxr_linenumber" name="L836" href="#L836">836</a>         {
-<a class="jxr_linenumber" name="L837" href="#L837">837</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">"Invalid skin doxia-sitetools prerequisite: "</span> + prerequisite, e );
-<a class="jxr_linenumber" name="L838" href="#L838">838</a>         }
-<a class="jxr_linenumber" name="L839" href="#L839">839</a>     }
-<a class="jxr_linenumber" name="L840" href="#L840">840</a> 
-<a class="jxr_linenumber" name="L841" href="#L841">841</a>     <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
-<a class="jxr_linenumber" name="L842" href="#L842">842</a>     @Deprecated
-<a class="jxr_linenumber" name="L843" href="#L843">843</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a> createContextForTemplate( File templateFile, Map&lt;String, ?&gt; attributes,
-<a class="jxr_linenumber" name="L844" href="#L844">844</a>                                                           <a href="../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html">DecorationModel</a> decoration, String defaultWindowTitle,
-<a class="jxr_linenumber" name="L845" href="#L845">845</a>                                                           Locale locale )
-<a class="jxr_linenumber" name="L846" href="#L846">846</a>             <strong class="jxr_keyword">throws</strong> MalformedURLException
-<a class="jxr_linenumber" name="L847" href="#L847">847</a>     {
-<a class="jxr_linenumber" name="L848" href="#L848">848</a>         <a href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a> context = createSiteRenderingContext( attributes, decoration, defaultWindowTitle, locale );
-<a class="jxr_linenumber" name="L849" href="#L849">849</a> 
-<a class="jxr_linenumber" name="L850" href="#L850">850</a>         context.setTemplateName( templateFile.getName() );
-<a class="jxr_linenumber" name="L851" href="#L851">851</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="L852" href="#L852">852</a> 
-<a class="jxr_linenumber" name="L853" href="#L853">853</a>         <strong class="jxr_keyword">return</strong> context;
-<a class="jxr_linenumber" name="L854" href="#L854">854</a>     }
-<a class="jxr_linenumber" name="L855" href="#L855">855</a> 
-<a class="jxr_linenumber" name="L856" href="#L856">856</a>     <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
-<a class="jxr_linenumber" name="L857" href="#L857">857</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> copyResources( SiteRenderingContext siteRenderingContext, File resourcesDirectory,
-<a class="jxr_linenumber" name="L858" href="#L858">858</a>                                File outputDirectory )
-<a class="jxr_linenumber" name="L859" href="#L859">859</a>         <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="L860" href="#L860">860</a>     {
-<a class="jxr_linenumber" name="L861" href="#L861">861</a>         <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> AssertionError( <span class="jxr_string">"copyResources( SiteRenderingContext, File, File ) is deprecated."</span> );
-<a class="jxr_linenumber" name="L862" href="#L862">862</a>     }
-<a class="jxr_linenumber" name="L863" href="#L863">863</a> 
-<a class="jxr_linenumber" name="L864" href="#L864">864</a>     <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
-<a class="jxr_linenumber" name="L865" href="#L865">865</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> copyResources( SiteRenderingContext siteRenderingContext, File outputDirectory )
-<a class="jxr_linenumber" name="L866" href="#L866">866</a>         <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="L867" href="#L867">867</a>     {
-<a class="jxr_linenumber" name="L868" href="#L868">868</a>         <strong class="jxr_keyword">if</strong> ( siteRenderingContext.getSkinJarFile() != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L869" href="#L869">869</a>         {
-<a class="jxr_linenumber" name="L870" href="#L870">870</a>             ZipFile file = getZipFile( siteRenderingContext.getSkinJarFile() );
-<a class="jxr_linenumber" name="L871" href="#L871">871</a> 
-<a class="jxr_linenumber" name="L872" href="#L872">872</a>             <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L873" href="#L873">873</a>             {
-<a class="jxr_linenumber" name="L874" href="#L874">874</a>                 <strong class="jxr_keyword">for</strong> ( Enumeration&lt;? <strong class="jxr_keyword">extends</strong> ZipEntry&gt; e = file.entries(); e.hasMoreElements(); )
-<a class="jxr_linenumber" name="L875" href="#L875">875</a>                 {
-<a class="jxr_linenumber" name="L876" href="#L876">876</a>                     ZipEntry entry = e.nextElement();
-<a class="jxr_linenumber" name="L877" href="#L877">877</a> 
-<a class="jxr_linenumber" name="L878" href="#L878">878</a>                     <strong class="jxr_keyword">if</strong> ( !entry.getName().startsWith( <span class="jxr_string">"META-INF/"</span> ) )
-<a class="jxr_linenumber" name="L879" href="#L879">879</a>                     {
-<a class="jxr_linenumber" name="L880" href="#L880">880</a>                         File destFile = <strong class="jxr_keyword">new</strong> File( outputDirectory, entry.getName() );
-<a class="jxr_linenumber" name="L881" href="#L881">881</a>                         <strong class="jxr_keyword">if</strong> ( !entry.isDirectory() )
-<a class="jxr_linenumber" name="L882" href="#L882">882</a>                         {
-<a class="jxr_linenumber" name="L883" href="#L883">883</a>                             <strong class="jxr_keyword">if</strong> ( destFile.exists() )
-<a class="jxr_linenumber" name="L884" href="#L884">884</a>                             {
-<a class="jxr_linenumber" name="L885" href="#L885">885</a>                                 <em class="jxr_comment">// don't override existing content: avoids extra rewrite with same content or extra site</em>
-<a class="jxr_linenumber" name="L886" href="#L886">886</a>                                 <em class="jxr_comment">// resource</em>
-<a class="jxr_linenumber" name="L887" href="#L887">887</a>                                 <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L888" href="#L888">888</a>                             }
-<a class="jxr_linenumber" name="L889" href="#L889">889</a> 
-<a class="jxr_linenumber" name="L890" href="#L890">890</a>                             destFile.getParentFile().mkdirs();
-<a class="jxr_linenumber" name="L891" href="#L891">891</a> 
-<a class="jxr_linenumber" name="L892" href="#L892">892</a>                             copyFileFromZip( file, entry, destFile );
-<a class="jxr_linenumber" name="L893" href="#L893">893</a>                         }
-<a class="jxr_linenumber" name="L894" href="#L894">894</a>                         <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L895" href="#L895">895</a>                         {
-<a class="jxr_linenumber" name="L896" href="#L896">896</a>                             destFile.mkdirs();
-<a class="jxr_linenumber" name="L897" href="#L897">897</a>                         }
-<a class="jxr_linenumber" name="L898" href="#L898">898</a>                     }
-<a class="jxr_linenumber" name="L899" href="#L899">899</a>                 }
-<a class="jxr_linenumber" name="L900" href="#L900">900</a>             }
-<a class="jxr_linenumber" name="L901" href="#L901">901</a>             <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L902" href="#L902">902</a>             {
-<a class="jxr_linenumber" name="L903" href="#L903">903</a>                 closeZipFile( file );
-<a class="jxr_linenumber" name="L904" href="#L904">904</a>             }
-<a class="jxr_linenumber" name="L905" href="#L905">905</a>         }
-<a class="jxr_linenumber" name="L906" href="#L906">906</a> 
-<a class="jxr_linenumber" name="L907" href="#L907">907</a>         <strong class="jxr_keyword">if</strong> ( siteRenderingContext.isUsingDefaultTemplate() )
-<a class="jxr_linenumber" name="L908" href="#L908">908</a>         {
-<a class="jxr_linenumber" name="L909" href="#L909">909</a>             InputStream resourceList = getClass().getClassLoader()
-<a class="jxr_linenumber" name="L910" href="#L910">910</a>                     .getResourceAsStream( RESOURCE_DIR + <span class="jxr_string">"/resources.txt"</span> );
+<a class="jxr_linenumber" name="L793" href="#L793">793</a>         <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="L794" href="#L794">794</a>         {
+<a class="jxr_linenumber" name="L795" href="#L795">795</a>             IOUtil.close( in );
+<a class="jxr_linenumber" name="L796" href="#L796">796</a>             closeZipFile( zipFile );
+<a class="jxr_linenumber" name="L797" href="#L797">797</a>         }
+<a class="jxr_linenumber" name="L798" href="#L798">798</a> 
+<a class="jxr_linenumber" name="L799" href="#L799">799</a>         <strong class="jxr_keyword">return</strong> context;
+<a class="jxr_linenumber" name="L800" href="#L800">800</a>     }
+<a class="jxr_linenumber" name="L801" href="#L801">801</a> 
+<a class="jxr_linenumber" name="L802" href="#L802">802</a>     <strong class="jxr_keyword">boolean</strong> matchVersion( String current, String prerequisite )
+<a class="jxr_linenumber" name="L803" href="#L803">803</a>         <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/doxia/siterenderer/RendererException.html">RendererException</a>
+<a class="jxr_linenumber" name="L804" href="#L804">804</a>     {
+<a class="jxr_linenumber" name="L805" href="#L805">805</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L806" href="#L806">806</a>         {
+<a class="jxr_linenumber" name="L807" href="#L807">807</a>             ArtifactVersion v = <strong class="jxr_keyword">new</strong> DefaultArtifactVersion( current );
+<a class="jxr_linenumber" name="L808" href="#L808">808</a>             VersionRange vr = VersionRange.createFromVersionSpec( prerequisite );
+<a class="jxr_linenumber" name="L809" href="#L809">809</a> 
+<a class="jxr_linenumber" name="L810" href="#L810">810</a>             <strong class="jxr_keyword">boolean</strong> matched = false;
+<a class="jxr_linenumber" name="L811" href="#L811">811</a>             ArtifactVersion recommendedVersion = vr.getRecommendedVersion();
+<a class="jxr_linenumber" name="L812" href="#L812">812</a>             <strong class="jxr_keyword">if</strong> ( recommendedVersion == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L813" href="#L813">813</a>             {
+<a class="jxr_linenumber" name="L814" href="#L814">814</a>                 List&lt;Restriction&gt; restrictions = vr.getRestrictions();
+<a class="jxr_linenumber" name="L815" href="#L815">815</a>                 <strong class="jxr_keyword">for</strong> ( Restriction restriction : restrictions )
+<a class="jxr_linenumber" name="L816" href="#L816">816</a>                 {
+<a class="jxr_linenumber" name="L817" href="#L817">817</a>                     <strong class="jxr_keyword">if</strong> ( restriction.containsVersion( v ) )
+<a class="jxr_linenumber" name="L818" href="#L818">818</a>                     {
+<a class="jxr_linenumber" name="L819" href="#L819">819</a>                         matched = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L820" href="#L820">820</a>                         <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="L821" href="#L821">821</a>                     }
+<a class="jxr_linenumber" name="L822" href="#L822">822</a>                 }
+<a class="jxr_linenumber" name="L823" href="#L823">823</a>             }
+<a class="jxr_linenumber" name="L824" href="#L824">824</a>             <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L825" href="#L825">825</a>             {
+<a class="jxr_linenumber" name="L826" href="#L826">826</a>                 <em class="jxr_comment">// only singular versions ever have a recommendedVersion</em>
+<a class="jxr_linenumber" name="L827" href="#L827">827</a>                 @SuppressWarnings( <span class="jxr_string">"unchecked"</span> )
+<a class="jxr_linenumber" name="L828" href="#L828">828</a>                 <strong class="jxr_keyword">int</strong> compareTo = recommendedVersion.compareTo( v );
+<a class="jxr_linenumber" name="L829" href="#L829">829</a>                 matched = ( compareTo &lt;= 0 );
+<a class="jxr_linenumber" name="L830" href="#L830">830</a>             }
+<a class="jxr_linenumber" name="L831" href="#L831">831</a> 
+<a class="jxr_linenumber" name="L832" href="#L832">832</a>             <strong class="jxr_keyword">if</strong> ( getLogger().isDebugEnabled() )
+<a class="jxr_linenumber" name="L833" href="#L833">833</a>             {
+<a class="jxr_linenumber" name="L834" href="#L834">834</a>                 getLogger().debug( <span class="jxr_string">"Skin doxia-sitetools prerequisite: "</span> + prerequisite + <span class="jxr_string">", current: "</span> + current
+<a class="jxr_linenumber" name="L835" href="#L835">835</a>                     + <span class="jxr_string">", matched = "</span> + matched );
+<a class="jxr_linenumber" name="L836" href="#L836">836</a>             }
+<a class="jxr_linenumber" name="L837" href="#L837">837</a> 
+<a class="jxr_linenumber" name="L838" href="#L838">838</a>             <strong class="jxr_keyword">return</strong> matched;
+<a class="jxr_linenumber" name="L839" href="#L839">839</a>         }
+<a class="jxr_linenumber" name="L840" href="#L840">840</a>         <strong class="jxr_keyword">catch</strong> ( InvalidVersionSpecificationException e )
+<a class="jxr_linenumber" name="L841" href="#L841">841</a>         {
+<a class="jxr_linenumber" name="L842" href="#L842">842</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">"Invalid skin doxia-sitetools prerequisite: "</span> + prerequisite, e );
+<a class="jxr_linenumber" name="L843" href="#L843">843</a>         }
+<a class="jxr_linenumber" name="L844" href="#L844">844</a>     }
+<a class="jxr_linenumber" name="L845" href="#L845">845</a> 
+<a class="jxr_linenumber" name="L846" href="#L846">846</a>     <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
+<a class="jxr_linenumber" name="L847" href="#L847">847</a>     @Deprecated
+<a class="jxr_linenumber" name="L848" href="#L848">848</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a> createContextForTemplate( File templateFile, Map&lt;String, ?&gt; attributes,
+<a class="jxr_linenumber" name="L849" href="#L849">849</a>                                                           <a href="../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html">DecorationModel</a> decoration, String defaultWindowTitle,
+<a class="jxr_linenumber" name="L850" href="#L850">850</a>                                                           Locale locale )
+<a class="jxr_linenumber" name="L851" href="#L851">851</a>             <strong class="jxr_keyword">throws</strong> MalformedURLException
+<a class="jxr_linenumber" name="L852" href="#L852">852</a>     {
+<a class="jxr_linenumber" name="L853" href="#L853">853</a>         <a href="../../../../../org/apache/maven/doxia/siterenderer/SiteRenderingContext.html">SiteRenderingContext</a> context = createSiteRenderingContext( attributes, decoration, defaultWindowTitle, locale );
+<a class="jxr_linenumber" name="L854" href="#L854">854</a> 
+<a class="jxr_linenumber" name="L855" href="#L855">855</a>         context.setTemplateName( templateFile.getName() );
+<a class="jxr_linenumber" name="L856" href="#L856">856</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="L857" href="#L857">857</a> 
+<a class="jxr_linenumber" name="L858" href="#L858">858</a>         <strong class="jxr_keyword">return</strong> context;
+<a class="jxr_linenumber" name="L859" href="#L859">859</a>     }
+<a class="jxr_linenumber" name="L860" href="#L860">860</a> 
+<a class="jxr_linenumber" name="L861" href="#L861">861</a>     <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
+<a class="jxr_linenumber" name="L862" href="#L862">862</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> copyResources( SiteRenderingContext siteRenderingContext, File resourcesDirectory,
+<a class="jxr_linenumber" name="L863" href="#L863">863</a>                                File outputDirectory )
+<a class="jxr_linenumber" name="L864" href="#L864">864</a>         <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L865" href="#L865">865</a>     {
+<a class="jxr_linenumber" name="L866" href="#L866">866</a>         <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> AssertionError( <span class="jxr_string">"copyResources( SiteRenderingContext, File, File ) is deprecated."</span> );
+<a class="jxr_linenumber" name="L867" href="#L867">867</a>     }
+<a class="jxr_linenumber" name="L868" href="#L868">868</a> 
+<a class="jxr_linenumber" name="L869" href="#L869">869</a>     <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
+<a class="jxr_linenumber" name="L870" href="#L870">870</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> copyResources( SiteRenderingContext siteRenderingContext, File outputDirectory )
+<a class="jxr_linenumber" name="L871" href="#L871">871</a>         <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L872" href="#L872">872</a>     {
+<a class="jxr_linenumber" name="L873" href="#L873">873</a>         <strong class="jxr_keyword">if</strong> ( siteRenderingContext.getSkinJarFile() != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L874" href="#L874">874</a>         {
+<a class="jxr_linenumber" name="L875" href="#L875">875</a>             ZipFile file = getZipFile( siteRenderingContext.getSkinJarFile() );
+<a class="jxr_linenumber" name="L876" href="#L876">876</a> 
+<a class="jxr_linenumber" name="L877" href="#L877">877</a>             <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L878" href="#L878">878</a>             {
+<a class="jxr_linenumber" name="L879" href="#L879">879</a>                 <strong class="jxr_keyword">for</strong> ( Enumeration&lt;? <strong class="jxr_keyword">extends</strong> ZipEntry&gt; e = file.entries(); e.hasMoreElements(); )
+<a class="jxr_linenumber" name="L880" href="#L880">880</a>                 {
+<a class="jxr_linenumber" name="L881" href="#L881">881</a>                     ZipEntry entry = e.nextElement();
+<a class="jxr_linenumber" name="L882" href="#L882">882</a> 
+<a class="jxr_linenumber" name="L883" href="#L883">883</a>                     <strong class="jxr_keyword">if</strong> ( !entry.getName().startsWith( <span class="jxr_string">"META-INF/"</span> ) )
+<a class="jxr_linenumber" name="L884" href="#L884">884</a>                     {
+<a class="jxr_linenumber" name="L885" href="#L885">885</a>                         File destFile = <strong class="jxr_keyword">new</strong> File( outputDirectory, entry.getName() );
+<a class="jxr_linenumber" name="L886" href="#L886">886</a>                         <strong class="jxr_keyword">if</strong> ( !entry.isDirectory() )
+<a class="jxr_linenumber" name="L887" href="#L887">887</a>                         {
+<a class="jxr_linenumber" name="L888" href="#L888">888</a>                             <strong class="jxr_keyword">if</strong> ( destFile.exists() )
+<a class="jxr_linenumber" name="L889" href="#L889">889</a>                             {
+<a class="jxr_linenumber" name="L890" href="#L890">890</a>                                 <em class="jxr_comment">// don't override existing content: avoids extra rewrite with same content or extra site</em>
+<a class="jxr_linenumber" name="L891" href="#L891">891</a>                                 <em class="jxr_comment">// resource</em>
+<a class="jxr_linenumber" name="L892" href="#L892">892</a>                                 <strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="L893" href="#L893">893</a>                             }
+<a class="jxr_linenumber" name="L894" href="#L894">894</a> 
+<a class="jxr_linenumber" name="L895" href="#L895">895</a>                             destFile.getParentFile().mkdirs();
+<a class="jxr_linenumber" name="L896" href="#L896">896</a> 
+<a class="jxr_linenumber" name="L897" href="#L897">897</a>                             copyFileFromZip( file, entry, destFile );
+<a class="jxr_linenumber" name="L898" href="#L898">898</a>                         }
+<a class="jxr_linenumber" name="L899" href="#L899">899</a>                         <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L900" href="#L900">900</a>                         {
+<a class="jxr_linenumber" name="L901" href="#L901">901</a>                             destFile.mkdirs();
+<a class="jxr_linenumber" name="L902" href="#L902">902</a>                         }
+<a class="jxr_linenumber" name="L903" href="#L903">903</a>                     }
+<a class="jxr_linenumber" name="L904" href="#L904">904</a>                 }
+<a class="jxr_linenumber" name="L905" href="#L905">905</a>             }
+<a class="jxr_linenumber" name="L906" href="#L906">906</a>             <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="L907" href="#L907">907</a>             {
+<a class="jxr_linenumber" name="L908" href="#L908">908</a>                 closeZipFile( file );
+<a class="jxr_linenumber" name="L909" href="#L909">909</a>             }
+<a class="jxr_linenumber" name="L910" href="#L910">910</a>         }
 <a class="jxr_linenumber" name="L911" href="#L911">911</a> 
-<a class="jxr_linenumber" name="L912" href="#L912">912</a>             <strong class="jxr_keyword">if</strong> ( resourceList != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L913" href="#L913">913</a>             {
-<a class="jxr_linenumber" name="L914" href="#L914">914</a>                 Reader r = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L915" href="#L915">915</a>                 LineNumberReader reader = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L916" href="#L916">916</a>                 <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L917" href="#L917">917</a>                 {
-<a class="jxr_linenumber" name="L918" href="#L918">918</a>                     r = ReaderFactory.newReader( resourceList, ReaderFactory.UTF_8 );
-<a class="jxr_linenumber" name="L919" href="#L919">919</a>                     reader = <strong class="jxr_keyword">new</strong> LineNumberReader( r );
-<a class="jxr_linenumber" name="L920" href="#L920">920</a> 
-<a class="jxr_linenumber" name="L921" href="#L921">921</a>                     String line;
-<a class="jxr_linenumber" name="L922" href="#L922">922</a> 
-<a class="jxr_linenumber" name="L923" href="#L923">923</a>                     <strong class="jxr_keyword">while</strong> ( ( line = reader.readLine() ) != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L924" href="#L924">924</a>                     {
-<a class="jxr_linenumber" name="L925" href="#L925">925</a>                         <strong class="jxr_keyword">if</strong> ( line.startsWith( <span class="jxr_string">"#"</span> ) || line.trim().length() == 0 )
-<a class="jxr_linenumber" name="L926" href="#L926">926</a>                         {
-<a class="jxr_linenumber" name="L927" href="#L927">927</a>                             <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L928" href="#L928">928</a>                         }
-<a class="jxr_linenumber" name="L929" href="#L929">929</a> 
-<a class="jxr_linenumber" name="L930" href="#L930">930</a>                         InputStream is = getClass().getClassLoader().getResourceAsStream( RESOURCE_DIR + <span class="jxr_string">"/"</span> + line );
-<a class="jxr_linenumber" name="L931" href="#L931">931</a> 
-<a class="jxr_linenumber" name="L932" href="#L932">932</a>                         <strong class="jxr_keyword">if</strong> ( is == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L933" href="#L933">933</a>                         {
-<a class="jxr_linenumber" name="L934" href="#L934">934</a>                             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException( <span class="jxr_string">"The resource "</span> + line + <span class="jxr_string">" doesn't exist."</span> );
-<a class="jxr_linenumber" name="L935" href="#L935">935</a>                         }
+<a class="jxr_linenumber" name="L912" href="#L912">912</a>         <strong class="jxr_keyword">if</strong> ( siteRenderingContext.isUsingDefaultTemplate() )
+<a class="jxr_linenumber" name="L913" href="#L913">913</a>         {
+<a class="jxr_linenumber" name="L914" href="#L914">914</a>             InputStream resourceList = getClass().getClassLoader()
+<a class="jxr_linenumber" name="L915" href="#L915">915</a>                     .getResourceAsStream( RESOURCE_DIR + <span class="jxr_string">"/resources.txt"</span> );
+<a class="jxr_linenumber" name="L916" href="#L916">916</a> 
+<a class="jxr_linenumber" name="L917" href="#L917">917</a>             <strong class="jxr_keyword">if</strong> ( resourceList != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L918" href="#L918">918</a>             {
+<a class="jxr_linenumber" name="L919" href="#L919">919</a>                 Reader r = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L920" href="#L920">920</a>                 LineNumberReader reader = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L921" href="#L921">921</a>                 <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L922" href="#L922">922</a>                 {
+<a class="jxr_linenumber" name="L923" href="#L923">923</a>                     r = ReaderFactory.newReader( resourceList, ReaderFactory.UTF_8 );
+<a class="jxr_linenumber" name="L924" href="#L924">924</a>                     reader = <strong class="jxr_keyword">new</strong> LineNumberReader( r );
+<a class="jxr_linenumber" name="L925" href="#L925">925</a> 
+<a class="jxr_linenumber" name="L926" href="#L926">926</a>                     String line;
+<a class="jxr_linenumber" name="L927" href="#L927">927</a> 
+<a class="jxr_linenumber" name="L928" href="#L928">928</a>                     <strong class="jxr_keyword">while</strong> ( ( line = reader.readLine() ) != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L929" href="#L929">929</a>                     {
+<a class="jxr_linenumber" name="L930" href="#L930">930</a>                         <strong class="jxr_keyword">if</strong> ( line.startsWith( <span class="jxr_string">"#"</span> ) || line.trim().length() == 0 )
+<a class="jxr_linenumber" name="L931" href="#L931">931</a>                         {
+<a class="jxr_linenumber" name="L932" href="#L932">932</a>                             <strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="L933" href="#L933">933</a>                         }
+<a class="jxr_linenumber" name="L934" href="#L934">934</a> 
+<a class="jxr_linenumber" name="L935" href="#L935">935</a>                         InputStream is = getClass().getClassLoader().getResourceAsStream( RESOURCE_DIR + <span class="jxr_string">"/"</span> + line );
 <a class="jxr_linenumber" name="L936" href="#L936">936</a> 
-<a class="jxr_linenumber" name="L937" href="#L937">937</a>                         File outputFile = <strong class="jxr_keyword">new</strong> File( outputDirectory, line );
-<a class="jxr_linenumber" name="L938" href="#L938">938</a> 
-<a class="jxr_linenumber" name="L939" href="#L939">939</a>                         <strong class="jxr_keyword">if</strong> ( outputFile.exists() )
-<a class="jxr_linenumber" name="L940" href="#L940">940</a>                         {
-<a class="jxr_linenumber" name="L941" href="#L941">941</a>                             <em class="jxr_comment">// don't override existing content: avoids extra rewrite with same content or extra site</em>
-<a class="jxr_linenumber" name="L942" href="#L942">942</a>                             <em class="jxr_comment">// resource</em>
-<a class="jxr_linenumber" name="L943" href="#L943">943</a>                             <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L944" href="#L944">944</a>                         }
-<a class="jxr_linenumber" name="L945" href="#L945">945</a> 
-<a class="jxr_linenumber" name="L946" href="#L946">946</a>                         <strong class="jxr_keyword">if</strong> ( !outputFile.getParentFile().exists() )
-<a class="jxr_linenumber" name="L947" href="#L947">947</a>                         {
-<a class="jxr_linenumber" name="L948" href="#L948">948</a>                             outputFile.getParentFile().mkdirs();
+<a class="jxr_linenumber" name="L937" href="#L937">937</a>                         <strong class="jxr_keyword">if</strong> ( is == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L938" href="#L938">938</a>                         {
+<a class="jxr_linenumber" name="L939" href="#L939">939</a>                             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException( <span class="jxr_string">"The resource "</span> + line + <span class="jxr_string">" doesn't exist."</span> );
+<a class="jxr_linenumber" name="L940" href="#L940">940</a>                         }
+<a class="jxr_linenumber" name="L941" href="#L941">941</a> 
+<a class="jxr_linenumber" name="L942" href="#L942">942</a>                         File outputFile = <strong class="jxr_keyword">new</strong> File( outputDirectory, line );
+<a class="jxr_linenumber" name="L943" href="#L943">943</a> 
+<a class="jxr_linenumber" name="L944" href="#L944">944</a>                         <strong class="jxr_keyword">if</strong> ( outputFile.exists() )
+<a class="jxr_linenumber" name="L945" href="#L945">945</a>                         {
+<a class="jxr_linenumber" name="L946" href="#L946">946</a>                             <em class="jxr_comment">// don't override existing content: avoids extra rewrite with same content or extra site</em>
+<a class="jxr_linenumber" name="L947" href="#L947">947</a>                             <em class="jxr_comment">// resource</em>
+<a class="jxr_linenumber" name="L948" href="#L948">948</a>                             <strong class="jxr_keyword">continue</strong>;
 <a class="jxr_linenumber" name="L949" href="#L949">949</a>                         }
 <a class="jxr_linenumber" name="L950" href="#L950">950</a> 
-<a class="jxr_linenumber" name="L951" href="#L951">951</a>                         OutputStream os = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L952" href="#L952">952</a>                         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L953" href="#L953">953</a>                         {
-<a class="jxr_linenumber" name="L954" href="#L954">954</a>                             <em class="jxr_comment">// for the images</em>
-<a class="jxr_linenumber" name="L955" href="#L955">955</a>                             os = <strong class="jxr_keyword">new</strong> FileOutputStream( outputFile );
-<a class="jxr_linenumber" name="L956" href="#L956">956</a>                             IOUtil.copy( is, os );
-<a class="jxr_linenumber" name="L957" href="#L957">957</a>                         }
-<a class="jxr_linenumber" name="L958" href="#L958">958</a>                         <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L959" href="#L959">959</a>                         {
-<a class="jxr_linenumber" name="L960" href="#L960">960</a>                             IOUtil.close( os );
-<a class="jxr_linenumber" name="L961" href="#L961">961</a>                         }
-<a class="jxr_linenumber" name="L962" href="#L962">962</a> 
-<a class="jxr_linenumber" name="L963" href="#L963">963</a>                         IOUtil.close( is );
-<a class="jxr_linenumber" name="L964" href="#L964">964</a>                     }
-<a class="jxr_linenumber" name="L965" href="#L965">965</a>                 }
-<a class="jxr_linenumber" name="L966" href="#L966">966</a>                 <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L967" href="#L967">967</a>                 {
-<a class="jxr_linenumber" name="L968" href="#L968">968</a>                     IOUtil.close( reader );
-<a class="jxr_linenumber" name="L969" href="#L969">969</a>                     IOUtil.close( r );
+<a class="jxr_linenumber" name="L951" href="#L951">951</a>                         <strong class="jxr_keyword">if</strong> ( !outputFile.getParentFile().exists() )
+<a class="jxr_linenumber" name="L952" href="#L952">952</a>                         {
+<a class="jxr_linenumber" name="L953" href="#L953">953</a>                             outputFile.getParentFile().mkdirs();
+<a class="jxr_linenumber" name="L954" href="#L954">954</a>                         }
+<a class="jxr_linenumber" name="L955" href="#L955">955</a> 
+<a class="jxr_linenumber" name="L956" href="#L956">956</a>                         OutputStream os = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L957" href="#L957">957</a>                         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L958" href="#L958">958</a>                         {
+<a class="jxr_linenumber" name="L959" href="#L959">959</a>                             <em class="jxr_comment">// for the images</em>
+<a class="jxr_linenumber" name="L960" href="#L960">960</a>                             os = <strong class="jxr_keyword">new</strong> FileOutputStream( outputFile );
+<a class="jxr_linenumber" name="L961" href="#L961">961</a>                             IOUtil.copy( is, os );
+<a class="jxr_linenumber" name="L962" href="#L962">962</a>                         }
+<a class="jxr_linenumber" name="L963" href="#L963">963</a>                         <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="L964" href="#L964">964</a>                         {
+<a class="jxr_linenumber" name="L965" href="#L965">965</a>                             IOUtil.close( os );
+<a class="jxr_linenumber" name="L966" href="#L966">966</a>                         }
+<a class="jxr_linenumber" name="L967" href="#L967">967</a> 
+<a class="jxr_linenumber" name="L968" href="#L968">968</a>                         IOUtil.close( is );
+<a class="jxr_linenumber" name="L969" href="#L969">969</a>                     }
 <a class="jxr_linenumber" name="L970" href="#L970">970</a>                 }
-<a class="jxr_linenumber" name="L971" href="#L971">971</a>             }
-<a class="jxr_linenumber" name="L972" href="#L972">972</a>         }
-<a class="jxr_linenumber" name="L973" href="#L973">973</a> 
-<a class="jxr_linenumber" name="L974" href="#L974">974</a>         <em class="jxr_comment">// Copy extra site resources</em>
-<a class="jxr_linenumber" name="L975" href="#L975">975</a>         <strong class="jxr_keyword">for</strong> ( File siteDirectory : siteRenderingContext.getSiteDirectories() )
-<a class="jxr_linenumber" name="L976" href="#L976">976</a>         {
-<a class="jxr_linenumber" name="L977" href="#L977">977</a>             File resourcesDirectory = <strong class="jxr_keyword">new</strong> File( siteDirectory, <span class="jxr_string">"resources"</span> );
+<a class="jxr_linenumber" name="L971" href="#L971">971</a>                 <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="L972" href="#L972">972</a>                 {
+<a class="jxr_linenumber" name="L973" href="#L973">973</a>                     IOUtil.close( reader );
+<a class="jxr_linenumber" name="L974" href="#L974">974</a>                     IOUtil.close( r );
+<a class="jxr_linenumber" name="L975" href="#L975">975</a>                 }
+<a class="jxr_linenumber" name="L976" href="#L976">976</a>             }
+<a class="jxr_linenumber" name="L977" href="#L977">977</a>         }
 <a class="jxr_linenumber" name="L978" href="#L978">978</a> 
-<a class="jxr_linenumber" name="L979" href="#L979">979</a>             <strong class="jxr_keyword">if</strong> ( resourcesDirectory != <strong class="jxr_keyword">null</strong> &amp;&amp; resourcesDirectory.exists() )
-<a class="jxr_linenumber" name="L980" href="#L980">980</a>             {
-<a class="jxr_linenumber" name="L981" href="#L981">981</a>                 copyDirectory( resourcesDirectory, outputDirectory );
-<a class="jxr_linenumber" name="L982" href="#L982">982</a>             }
-<a class="jxr_linenumber" name="L983" href="#L983">983</a>         }
-<a class="jxr_linenumber" name="L984" href="#L984">984</a> 
-<a class="jxr_linenumber" name="L985" href="#L985">985</a>         <em class="jxr_comment">// Check for the existence of /css/site.css</em>
-<a class="jxr_linenumber" name="L986" href="#L986">986</a>         File siteCssFile = <strong class="jxr_keyword">new</strong> File( outputDirectory, <span class="jxr_string">"/css/site.css"</span> );
-<a class="jxr_linenumber" name="L987" href="#L987">987</a>         <strong class="jxr_keyword">if</strong> ( !siteCssFile.exists() )
-<a class="jxr_linenumber" name="L988" href="#L988">988</a>         {
-<a class="jxr_linenumber" name="L989" href="#L989">989</a>             <em class="jxr_comment">// Create the subdirectory css if it doesn't exist, DOXIA-151</em>
-<a class="jxr_linenumber" name="L990" href="#L990">990</a>             File cssDirectory = <strong class="jxr_keyword">new</strong> File( outputDirectory, <span class="jxr_string">"/css/"</span> );
-<a class="jxr_linenumber" name="L991" href="#L991">991</a>             <strong class="jxr_keyword">boolean</strong> created = cssDirectory.mkdirs();
-<a class="jxr_linenumber" name="L992" href="#L992">992</a>             <strong class="jxr_keyword">if</strong> ( created &amp;&amp; getLogger().isDebugEnabled() )
-<a class="jxr_linenumber" name="L993" href="#L993">993</a>             {
-<a class="jxr_linenumber" name="L994" href="#L994">994</a>                 getLogger().debug(
-<a class="jxr_linenumber" name="L995" href="#L995">995</a>                     <span class="jxr_string">"The directory '"</span> + cssDirectory.getAbsolutePath() + <span class="jxr_string">"' did not exist. It was created."</span> );
-<a class="jxr_linenumber" name="L996" href="#L996">996</a>             }
-<a class="jxr_linenumber" name="L997" href="#L997">997</a> 
-<a class="jxr_linenumber" name="L998" href="#L998">998</a>             <em class="jxr_comment">// If the file is not there - create an empty file, DOXIA-86</em>
-<a class="jxr_linenumber" name="L999" href="#L999">999</a>             <strong class="jxr_keyword">if</strong> ( getLogger().isDebugEnabled() )
-<a class="jxr_linenumber" name="L1000" href="#L1000">1000</a>             {
-<a class="jxr_linenumber" name="L1001" href="#L1001">1001</a>                 getLogger().debug(
-<a class="jxr_linenumber" name="L1002" href="#L1002">1002</a>                     <span class="jxr_string">"The file '"</span> + siteCssFile.getAbsolutePath() + <span class="jxr_string">"' does not exist. Creating an empty file."</span> );
-<a class="jxr_linenumber" name="L1003" href="#L1003">1003</a>             }
-<a class="jxr_linenumber" name="L1004" href="#L1004">1004</a>             Writer writer = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L1005" href="#L1005">1005</a>             <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L1006" href="#L1006">1006</a>             {
-<a class="jxr_linenumber" name="L1007" href="#L1007">1007</a>                 writer = WriterFactory.newWriter( siteCssFile, siteRenderingContext.getOutputEncoding() );
-<a class="jxr_linenumber" name="L1008" href="#L1008">1008</a>                 <em class="jxr_comment">//DOXIA-290...the file should not be 0 bytes.</em>
-<a class="jxr_linenumber" name="L1009" href="#L1009">1009</a>                 writer.write( <span class="jxr_string">"/* You can override this file with your own styles */"</span>  );
-<a class="jxr_linenumber" name="L1010" href="#L1010">1010</a>             }
-<a class="jxr_linenumber" name="L1011" href="#L1011">1011</a>             <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L1012" href="#L1012">1012</a>             {
-<a class="jxr_linenumber" name="L1013" href="#L1013">1013</a>                 IOUtil.close( writer );
-<a class="jxr_linenumber" name="L1014" href="#L1014">1014</a>             }
-<a class="jxr_linenumber" name="L1015" href="#L1015">1015</a>         }
-<a class="jxr_linenumber" name="L1016" href="#L1016">1016</a>     }
-<a class="jxr_linenumber" name="L1017" href="#L1017">1017</a> 
-<a class="jxr_linenumber" name="L1018" href="#L1018">1018</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> copyFileFromZip( ZipFile file, ZipEntry entry, File destFile )
-<a class="jxr_linenumber" name="L1019" href="#L1019">1019</a>             <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="L1020" href="#L1020">1020</a>     {
-<a class="jxr_linenumber" name="L1021" href="#L1021">1021</a>         FileOutputStream fos = <strong class="jxr_keyword">new</strong> FileOutputStream( destFile );

[... 271 lines stripped ...]