You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-commits@maven.apache.org by mi...@apache.org on 2022/02/17 14:02:17 UTC
svn commit: r1898153 [26/48] - in /maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST: ./ apidocs/ apidocs/org/apache/maven/doxia/site/decoration/ apidocs/org/apache/maven/doxia/site/decoration/class-use/ apidocs/org/apache/...
Modified: maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-integration-tools/xref/org/apache/maven/doxia/tools/DefaultSiteTool.html
==============================================================================
--- maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-integration-tools/xref/org/apache/maven/doxia/tools/DefaultSiteTool.html (original)
+++ maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-integration-tools/xref/org/apache/maven/doxia/tools/DefaultSiteTool.html Thu Feb 17 14:02:12 2022
@@ -27,156 +27,156 @@
<a class="jxr_linenumber" name="L19" href="#L19">19</a> <em class="jxr_comment"> * under the License.</em>
<a class="jxr_linenumber" name="L20" href="#L20">20</a> <em class="jxr_comment"> */</em>
<a class="jxr_linenumber" name="L21" href="#L21">21</a>
-<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong class="jxr_keyword">import</strong> java.io.File;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong class="jxr_keyword">import</strong> java.io.IOException;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong class="jxr_keyword">import</strong> java.io.InputStream;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong class="jxr_keyword">import</strong> java.io.Reader;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong class="jxr_keyword">import</strong> java.io.StringReader;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">import</strong> java.io.StringWriter;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> java.net.MalformedURLException;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> java.net.URL;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> java.util.AbstractMap;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> java.util.ArrayList;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> java.util.Arrays;
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">import</strong> java.util.Collections;
-<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong class="jxr_keyword">import</strong> java.util.List;
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">import</strong> java.util.Locale;
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">import</strong> java.util.Map;
-<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">import</strong> java.util.Properties;
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">import</strong> java.util.StringTokenizer;
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">import</strong> org.apache.commons.io.FilenameUtils;
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.Artifact;
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.factory.ArtifactFactory;
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.repository.ArtifactRepository;
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.resolver.ArtifactResolutionException;
-<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.resolver.ArtifactResolver;
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.versioning.VersionRange;
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.Banner;
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.DecorationModel;
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.Menu;
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.MenuItem;
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.Skin;
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler;
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
-<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Writer;
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.DistributionManagement;
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.Site;
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong class="jxr_keyword">import</strong> org.apache.maven.project.MavenProject;
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">import</strong> org.apache.maven.project.MavenProjectBuilder;
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">import</strong> org.apache.maven.project.ProjectBuildingException;
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">import</strong> org.apache.maven.reporting.MavenReport;
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.component.annotations.Component;
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.component.annotations.Requirement;
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.i18n.I18N;
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.IOUtil;
-<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.ReaderFactory;
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.StringUtils;
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.interpolation.EnvarBasedValueSource;
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.interpolation.InterpolationException;
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.interpolation.MapBasedValueSource;
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.interpolation.PrefixedObjectValueSource;
-<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.interpolation.PrefixedPropertiesValueSource;
-<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.interpolation.RegexBasedInterpolator;
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> <em class="jxr_javadoccomment"> * Default implementation of the site tool.</em>
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> <em class="jxr_javadoccomment"> * @author <a href="<a href="mailto:vincent.siveton@gmail.com" target="alexandria_uri">mailto:vincent.siveton@gmail.com</a>">Vincent Siveton</a></em>
-<a class="jxr_linenumber" name="L84" href="#L84">84</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L85" href="#L85">85</a> @Component( role = SiteTool.<strong class="jxr_keyword">class</strong> )
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/doxia/tools/DefaultSiteTool.html">DefaultSiteTool</a>
-<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong class="jxr_keyword">implements</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteTool.html">SiteTool</a>
-<a class="jxr_linenumber" name="L88" href="#L88">88</a> {
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOGGER = LoggerFactory.getLogger( DefaultSiteTool.<strong class="jxr_keyword">class</strong> );
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> <em class="jxr_comment">// ----------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L92" href="#L92">92</a> <em class="jxr_comment">// Components</em>
+<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong class="jxr_keyword">import</strong> javax.inject.Inject;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong class="jxr_keyword">import</strong> javax.inject.Named;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>
+<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong class="jxr_keyword">import</strong> java.io.File;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">import</strong> java.io.Reader;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> java.io.StringReader;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> java.io.StringWriter;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> java.net.MalformedURLException;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> java.net.URL;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> java.util.AbstractMap;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">import</strong> java.util.ArrayList;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong class="jxr_keyword">import</strong> java.util.Arrays;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">import</strong> java.util.Collections;
+<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">import</strong> java.util.List;
+<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">import</strong> java.util.Locale;
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">import</strong> java.util.Map;
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">import</strong> java.util.Objects;
+<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">import</strong> java.util.StringTokenizer;
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">import</strong> org.apache.commons.io.FilenameUtils;
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.Artifact;
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.factory.ArtifactFactory;
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.repository.ArtifactRepository;
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.resolver.ArtifactResolutionException;
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.resolver.ArtifactResolver;
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.versioning.VersionRange;
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.Banner;
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.DecorationModel;
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.Menu;
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.MenuItem;
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.Skin;
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler;
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
+<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong class="jxr_keyword">import</strong> org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Writer;
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.DistributionManagement;
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.Site;
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">import</strong> org.apache.maven.project.DefaultProjectBuildingRequest;
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">import</strong> org.apache.maven.project.MavenProject;
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">import</strong> org.apache.maven.project.ProjectBuilder;
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong class="jxr_keyword">import</strong> org.apache.maven.project.ProjectBuildingException;
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong class="jxr_keyword">import</strong> org.apache.maven.project.ProjectBuildingRequest;
+<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong class="jxr_keyword">import</strong> org.apache.maven.project.ProjectBuildingResult;
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong class="jxr_keyword">import</strong> org.apache.maven.reporting.MavenReport;
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.i18n.I18N;
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.IOUtil;
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.ReaderFactory;
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.StringUtils;
+<a class="jxr_linenumber" name="L72" href="#L72">72</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.interpolation.EnvarBasedValueSource;
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.interpolation.InterpolationException;
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.interpolation.MapBasedValueSource;
+<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.interpolation.PrefixedObjectValueSource;
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.interpolation.PrefixedPropertiesValueSource;
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.interpolation.RegexBasedInterpolator;
+<a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+<a class="jxr_linenumber" name="L79" href="#L79">79</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
+<a class="jxr_linenumber" name="L80" href="#L80">80</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> <em class="jxr_javadoccomment"> * Default implementation of the site tool.</em>
+<a class="jxr_linenumber" name="L84" href="#L84">84</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L85" href="#L85">85</a> <em class="jxr_javadoccomment"> * @author <a href="<a href="mailto:vincent.siveton@gmail.com" target="alexandria_uri">mailto:vincent.siveton@gmail.com</a>">Vincent Siveton</a></em>
+<a class="jxr_linenumber" name="L86" href="#L86">86</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L87" href="#L87">87</a> @Named
+<a class="jxr_linenumber" name="L88" href="#L88">88</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/doxia/tools/DefaultSiteTool.html">DefaultSiteTool</a>
+<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong class="jxr_keyword">implements</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteTool.html">SiteTool</a>
+<a class="jxr_linenumber" name="L90" href="#L90">90</a> {
+<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOGGER = LoggerFactory.getLogger( DefaultSiteTool.<strong class="jxr_keyword">class</strong> );
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>
<a class="jxr_linenumber" name="L93" href="#L93">93</a> <em class="jxr_comment">// ----------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>
-<a class="jxr_linenumber" name="L95" href="#L95">95</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L96" href="#L96">96</a> <em class="jxr_javadoccomment"> * The component that is used to resolve additional artifacts required.</em>
-<a class="jxr_linenumber" name="L97" href="#L97">97</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> @Requirement
-<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">private</strong> ArtifactResolver artifactResolver;
-<a class="jxr_linenumber" name="L100" href="#L100">100</a>
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_javadoccomment"> * The component used for creating artifact instances.</em>
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> @Requirement
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong class="jxr_keyword">private</strong> ArtifactFactory artifactFactory;
-<a class="jxr_linenumber" name="L106" href="#L106">106</a>
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_javadoccomment"> * Internationalization.</em>
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> @Requirement
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> <strong class="jxr_keyword">protected</strong> I18N i18n;
-<a class="jxr_linenumber" name="L112" href="#L112">112</a>
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> <em class="jxr_javadoccomment"> * The component for assembling inheritance.</em>
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> @Requirement
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong class="jxr_keyword">protected</strong> DecorationModelInheritanceAssembler assembler;
-<a class="jxr_linenumber" name="L118" href="#L118">118</a>
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_javadoccomment"> * Project builder (deprecated in Maven 3: should use ProjectBuilder, which will avoid</em>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment"> * issues like DOXIASITETOOLS-166)</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> @Requirement
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> <strong class="jxr_keyword">protected</strong> MavenProjectBuilder mavenProjectBuilder;
-<a class="jxr_linenumber" name="L125" href="#L125">125</a>
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> <em class="jxr_comment">// ----------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_comment">// Public methods</em>
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_comment">// ----------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L129" href="#L129">129</a>
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> <strong class="jxr_keyword">public</strong> Artifact getSkinArtifactFromRepository( ArtifactRepository localRepository,
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> List<ArtifactRepository> remoteArtifactRepositories,
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> DecorationModel decoration )
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> {
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> checkNotNull( <span class="jxr_string">"localRepository"</span>, localRepository );
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> checkNotNull( <span class="jxr_string">"remoteArtifactRepositories"</span>, remoteArtifactRepositories );
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> checkNotNull( <span class="jxr_string">"decoration"</span>, decoration );
-<a class="jxr_linenumber" name="L138" href="#L138">138</a>
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> Skin skin = decoration.getSkin();
-<a class="jxr_linenumber" name="L140" href="#L140">140</a>
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> <strong class="jxr_keyword">if</strong> ( skin == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> {
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> skin = Skin.getDefaultSkin();
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> }
-<a class="jxr_linenumber" name="L145" href="#L145">145</a>
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> String version = skin.getVersion();
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> Artifact artifact;
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> {
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> <strong class="jxr_keyword">if</strong> ( version == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> {
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> version = Artifact.RELEASE_VERSION;
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> }
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> VersionRange versionSpec = VersionRange.createFromVersionSpec( version );
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> artifact = artifactFactory.createDependencyArtifact( skin.getGroupId(), skin.getArtifactId(), versionSpec,
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> <span class="jxr_string">"jar"</span>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong> );
-<a class="jxr_linenumber" name="L157" href="#L157">157</a>
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> artifactResolver.resolve( artifact, remoteArtifactRepositories, localRepository );
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> }
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong class="jxr_keyword">catch</strong> ( InvalidVersionSpecificationException e )
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> {
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"InvalidVersionSpecificationException: The skin version '"</span> + version
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> + <span class="jxr_string">"' is not valid: "</span> + e.getMessage(), e );
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> <em class="jxr_comment">// Components</em>
+<a class="jxr_linenumber" name="L95" href="#L95">95</a> <em class="jxr_comment">// ----------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L98" href="#L98">98</a> <em class="jxr_javadoccomment"> * The component that is used to resolve additional artifacts required.</em>
+<a class="jxr_linenumber" name="L99" href="#L99">99</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> @Inject
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">private</strong> ArtifactResolver artifactResolver;
+<a class="jxr_linenumber" name="L102" href="#L102">102</a>
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_javadoccomment"> * The component used for creating artifact instances.</em>
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> @Inject
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> <strong class="jxr_keyword">private</strong> ArtifactFactory artifactFactory;
+<a class="jxr_linenumber" name="L108" href="#L108">108</a>
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_javadoccomment"> * Internationalization.</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> @Inject
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> <strong class="jxr_keyword">protected</strong> I18N i18n;
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> <em class="jxr_javadoccomment"> * The component for assembling inheritance.</em>
+<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> @Inject
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> <strong class="jxr_keyword">protected</strong> DecorationModelInheritanceAssembler assembler;
+<a class="jxr_linenumber" name="L120" href="#L120">120</a>
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> <em class="jxr_javadoccomment"> * Project builder.</em>
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> @Inject
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> <strong class="jxr_keyword">protected</strong> ProjectBuilder projectBuilder;
+<a class="jxr_linenumber" name="L126" href="#L126">126</a>
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_comment">// ----------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_comment">// Public methods</em>
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_comment">// ----------------------------------------------------------------------</em>
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">public</strong> Artifact getSkinArtifactFromRepository( ArtifactRepository localRepository,
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> List<ArtifactRepository> remoteArtifactRepositories,
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> DecorationModel decoration )
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> {
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> Objects.requireNonNull( localRepository, <span class="jxr_string">"localRepository cannot be null"</span> );
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> Objects.requireNonNull( remoteArtifactRepositories, <span class="jxr_string">"remoteArtifactRepositories cannot be null"</span> );
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> Objects.requireNonNull( decoration, <span class="jxr_string">"decoration cannot be null"</span> );
+<a class="jxr_linenumber" name="L139" href="#L139">139</a>
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> Skin skin = decoration.getSkin();
+<a class="jxr_linenumber" name="L141" href="#L141">141</a>
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> <strong class="jxr_keyword">if</strong> ( skin == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> {
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> skin = Skin.getDefaultSkin();
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> }
+<a class="jxr_linenumber" name="L146" href="#L146">146</a>
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> String version = skin.getVersion();
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> Artifact artifact;
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> {
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">if</strong> ( version == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> {
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> version = Artifact.RELEASE_VERSION;
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> }
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> VersionRange versionSpec = VersionRange.createFromVersionSpec( version );
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> artifact = artifactFactory.createDependencyArtifact( skin.getGroupId(), skin.getArtifactId(), versionSpec,
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> <span class="jxr_string">"jar"</span>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong> );
+<a class="jxr_linenumber" name="L158" href="#L158">158</a>
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> artifactResolver.resolve( artifact, remoteArtifactRepositories, localRepository );
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> }
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> <strong class="jxr_keyword">catch</strong> ( InvalidVersionSpecificationException e )
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> {
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"The skin version '"</span> + version + <span class="jxr_string">"' is not valid"</span>, e );
<a class="jxr_linenumber" name="L164" href="#L164">164</a> }
<a class="jxr_linenumber" name="L165" href="#L165">165</a> <strong class="jxr_keyword">catch</strong> ( ArtifactResolutionException e )
<a class="jxr_linenumber" name="L166" href="#L166">166</a> {
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"ArtifactResolutionException: Unable to find skin"</span>, e );
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"Unable to find skin"</span>, e );
<a class="jxr_linenumber" name="L168" href="#L168">168</a> }
<a class="jxr_linenumber" name="L169" href="#L169">169</a> <strong class="jxr_keyword">catch</strong> ( ArtifactNotFoundException e )
<a class="jxr_linenumber" name="L170" href="#L170">170</a> {
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"ArtifactNotFoundException: The skin does not exist: "</span> + e.getMessage(), e );
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"The skin does not exist"</span>, e );
<a class="jxr_linenumber" name="L172" href="#L172">172</a> }
<a class="jxr_linenumber" name="L173" href="#L173">173</a>
<a class="jxr_linenumber" name="L174" href="#L174">174</a> <strong class="jxr_keyword">return</strong> artifact;
@@ -197,8 +197,8 @@
<a class="jxr_linenumber" name="L189" href="#L189">189</a> @Deprecated
<a class="jxr_linenumber" name="L190" href="#L190">190</a> <strong class="jxr_keyword">public</strong> String getRelativePath( String to, String from )
<a class="jxr_linenumber" name="L191" href="#L191">191</a> {
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> checkNotNull( <span class="jxr_string">"to"</span>, to );
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> checkNotNull( <span class="jxr_string">"from"</span>, from );
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> Objects.requireNonNull( to, <span class="jxr_string">"to cannot be null"</span> );
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> Objects.requireNonNull( from, <span class="jxr_string">"from cannot be null"</span> );
<a class="jxr_linenumber" name="L194" href="#L194">194</a>
<a class="jxr_linenumber" name="L195" href="#L195">195</a> <strong class="jxr_keyword">if</strong> ( to.contains( <span class="jxr_string">":"</span> ) && from.contains( <span class="jxr_string">":"</span> ) )
<a class="jxr_linenumber" name="L196" href="#L196">196</a> {
@@ -228,7 +228,7 @@
<a class="jxr_linenumber" name="L220" href="#L220">220</a> }
<a class="jxr_linenumber" name="L221" href="#L221">221</a> <strong class="jxr_keyword">catch</strong> ( MalformedURLException e1 )
<a class="jxr_linenumber" name="L222" href="#L222">222</a> {
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> LOGGER.warn( <span class="jxr_string">"Unable to load a URL for '"</span> + to + <span class="jxr_string">"': "</span> + e.getMessage() );
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> LOGGER.warn( <span class="jxr_string">"Unable to load a URL for '"</span> + to + <span class="jxr_string">"'"</span>, e );
<a class="jxr_linenumber" name="L224" href="#L224">224</a> <strong class="jxr_keyword">return</strong> to;
<a class="jxr_linenumber" name="L225" href="#L225">225</a> }
<a class="jxr_linenumber" name="L226" href="#L226">226</a> }
@@ -245,7 +245,7 @@
<a class="jxr_linenumber" name="L237" href="#L237">237</a> }
<a class="jxr_linenumber" name="L238" href="#L238">238</a> <strong class="jxr_keyword">catch</strong> ( MalformedURLException e1 )
<a class="jxr_linenumber" name="L239" href="#L239">239</a> {
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> LOGGER.warn( <span class="jxr_string">"Unable to load a URL for '"</span> + from + <span class="jxr_string">"': "</span> + e.getMessage() );
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> LOGGER.warn( <span class="jxr_string">"Unable to load a URL for '"</span> + from + <span class="jxr_string">"'"</span>, e );
<a class="jxr_linenumber" name="L241" href="#L241">241</a> <strong class="jxr_keyword">return</strong> to;
<a class="jxr_linenumber" name="L242" href="#L242">242</a> }
<a class="jxr_linenumber" name="L243" href="#L243">243</a> }
@@ -354,7 +354,7 @@
<a class="jxr_linenumber" name="L346" href="#L346">346</a> <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
<a class="jxr_linenumber" name="L347" href="#L347">347</a> <strong class="jxr_keyword">public</strong> File getSiteDescriptor( File siteDirectory, Locale locale )
<a class="jxr_linenumber" name="L348" href="#L348">348</a> {
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> checkNotNull( <span class="jxr_string">"siteDirectory"</span>, siteDirectory );
+<a class="jxr_linenumber" name="L349" href="#L349">349</a> Objects.requireNonNull( siteDirectory, <span class="jxr_string">"siteDirectory cannot be null"</span> );
<a class="jxr_linenumber" name="L350" href="#L350">350</a> <strong class="jxr_keyword">final</strong> Locale llocale = ( locale == <strong class="jxr_keyword">null</strong> ) ? <strong class="jxr_keyword">new</strong> Locale( <span class="jxr_string">""</span> ) : locale;
<a class="jxr_linenumber" name="L351" href="#L351">351</a>
<a class="jxr_linenumber" name="L352" href="#L352">352</a> File siteDescriptor = <strong class="jxr_keyword">new</strong> File( siteDirectory, <span class="jxr_string">"site_"</span> + llocale.getLanguage() + <span class="jxr_string">".xml"</span> );
@@ -382,9 +382,9 @@
<a class="jxr_linenumber" name="L374" href="#L374">374</a> List<ArtifactRepository> repositories, Locale locale )
<a class="jxr_linenumber" name="L375" href="#L375">375</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>
<a class="jxr_linenumber" name="L376" href="#L376">376</a> {
-<a class="jxr_linenumber" name="L377" href="#L377">377</a> checkNotNull( <span class="jxr_string">"project"</span>, project );
-<a class="jxr_linenumber" name="L378" href="#L378">378</a> checkNotNull( <span class="jxr_string">"localRepository"</span>, localRepository );
-<a class="jxr_linenumber" name="L379" href="#L379">379</a> checkNotNull( <span class="jxr_string">"repositories"</span>, repositories );
+<a class="jxr_linenumber" name="L377" href="#L377">377</a> Objects.requireNonNull( project, <span class="jxr_string">"project cannot be null"</span> );
+<a class="jxr_linenumber" name="L378" href="#L378">378</a> Objects.requireNonNull( localRepository, <span class="jxr_string">"localRepository cannot be null"</span> );
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> Objects.requireNonNull( repositories, <span class="jxr_string">"repositories cannot be null"</span> );
<a class="jxr_linenumber" name="L380" href="#L380">380</a>
<a class="jxr_linenumber" name="L381" href="#L381">381</a> <strong class="jxr_keyword">final</strong> Locale llocale = ( locale == <strong class="jxr_keyword">null</strong> ) ? <strong class="jxr_keyword">new</strong> Locale( <span class="jxr_string">""</span> ) : locale;
<a class="jxr_linenumber" name="L382" href="#L382">382</a>
@@ -394,1111 +394,984 @@
<a class="jxr_linenumber" name="L386" href="#L386">386</a> }
<a class="jxr_linenumber" name="L387" href="#L387">387</a> <strong class="jxr_keyword">catch</strong> ( ArtifactNotFoundException e )
<a class="jxr_linenumber" name="L388" href="#L388">388</a> {
-<a class="jxr_linenumber" name="L389" href="#L389">389</a> LOGGER.debug( <span class="jxr_string">"ArtifactNotFoundException: Unable to locate site descriptor: "</span> + e );
+<a class="jxr_linenumber" name="L389" href="#L389">389</a> LOGGER.debug( <span class="jxr_string">"Unable to locate site descriptor"</span>, e );
<a class="jxr_linenumber" name="L390" href="#L390">390</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
<a class="jxr_linenumber" name="L391" href="#L391">391</a> }
<a class="jxr_linenumber" name="L392" href="#L392">392</a> <strong class="jxr_keyword">catch</strong> ( ArtifactResolutionException e )
<a class="jxr_linenumber" name="L393" href="#L393">393</a> {
-<a class="jxr_linenumber" name="L394" href="#L394">394</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"ArtifactResolutionException: Unable to locate site descriptor: "</span>
-<a class="jxr_linenumber" name="L395" href="#L395">395</a> + e.getMessage(), 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">catch</strong> ( IOException e )
-<a class="jxr_linenumber" name="L398" href="#L398">398</a> {
-<a class="jxr_linenumber" name="L399" href="#L399">399</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"IOException: Unable to locate site descriptor: "</span> + e.getMessage(), e );
-<a class="jxr_linenumber" name="L400" href="#L400">400</a> }
-<a class="jxr_linenumber" name="L401" href="#L401">401</a> }
-<a class="jxr_linenumber" name="L402" href="#L402">402</a>
-<a class="jxr_linenumber" name="L403" href="#L403">403</a> <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
-<a class="jxr_linenumber" name="L404" href="#L404">404</a> <strong class="jxr_keyword">public</strong> DecorationModel getDecorationModel( File siteDirectory, Locale locale, MavenProject project,
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> List<MavenProject> reactorProjects, ArtifactRepository localRepository,
-<a class="jxr_linenumber" name="L406" href="#L406">406</a> List<ArtifactRepository> repositories )
-<a class="jxr_linenumber" name="L407" href="#L407">407</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>
-<a class="jxr_linenumber" name="L408" href="#L408">408</a> {
-<a class="jxr_linenumber" name="L409" href="#L409">409</a> checkNotNull( <span class="jxr_string">"project"</span>, project );
-<a class="jxr_linenumber" name="L410" href="#L410">410</a> checkNotNull( <span class="jxr_string">"reactorProjects"</span>, reactorProjects );
-<a class="jxr_linenumber" name="L411" href="#L411">411</a> checkNotNull( <span class="jxr_string">"localRepository"</span>, localRepository );
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> checkNotNull( <span class="jxr_string">"repositories"</span>, repositories );
-<a class="jxr_linenumber" name="L413" href="#L413">413</a>
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> <strong class="jxr_keyword">final</strong> Locale llocale = ( locale == <strong class="jxr_keyword">null</strong> ) ? Locale.getDefault() : locale;
-<a class="jxr_linenumber" name="L415" href="#L415">415</a>
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> LOGGER.debug( <span class="jxr_string">"Computing decoration model of "</span> + project.getId() + <span class="jxr_string">" for locale "</span> + llocale );
-<a class="jxr_linenumber" name="L417" href="#L417">417</a>
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> Map.Entry<DecorationModel, MavenProject> result =
-<a class="jxr_linenumber" name="L419" href="#L419">419</a> getDecorationModel( 0, siteDirectory, llocale, project, reactorProjects, localRepository, repositories );
-<a class="jxr_linenumber" name="L420" href="#L420">420</a> DecorationModel decorationModel = result.getKey();
-<a class="jxr_linenumber" name="L421" href="#L421">421</a> MavenProject parentProject = result.getValue();
-<a class="jxr_linenumber" name="L422" href="#L422">422</a>
-<a class="jxr_linenumber" name="L423" href="#L423">423</a> <strong class="jxr_keyword">if</strong> ( decorationModel == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L424" href="#L424">424</a> {
-<a class="jxr_linenumber" name="L425" href="#L425">425</a> LOGGER.debug( <span class="jxr_string">"Using default site descriptor"</span> );
-<a class="jxr_linenumber" name="L426" href="#L426">426</a>
-<a class="jxr_linenumber" name="L427" href="#L427">427</a> String siteDescriptorContent;
-<a class="jxr_linenumber" name="L428" href="#L428">428</a>
-<a class="jxr_linenumber" name="L429" href="#L429">429</a> Reader reader = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L430" href="#L430">430</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L431" href="#L431">431</a> {
-<a class="jxr_linenumber" name="L432" href="#L432">432</a> <em class="jxr_comment">// Note the default is not a super class - it is used when nothing else is found</em>
-<a class="jxr_linenumber" name="L433" href="#L433">433</a> reader = ReaderFactory.newXmlReader( getClass().getResourceAsStream( <span class="jxr_string">"/default-site.xml"</span> ) );
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> siteDescriptorContent = IOUtil.toString( reader );
-<a class="jxr_linenumber" name="L435" href="#L435">435</a> }
-<a class="jxr_linenumber" name="L436" href="#L436">436</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
-<a class="jxr_linenumber" name="L437" href="#L437">437</a> {
-<a class="jxr_linenumber" name="L438" href="#L438">438</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"Error reading default site descriptor: "</span> + e.getMessage(), e );
-<a class="jxr_linenumber" name="L439" href="#L439">439</a> }
-<a class="jxr_linenumber" name="L440" href="#L440">440</a> <strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> {
-<a class="jxr_linenumber" name="L442" href="#L442">442</a> IOUtil.close( reader );
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> }
-<a class="jxr_linenumber" name="L444" href="#L444">444</a>
-<a class="jxr_linenumber" name="L445" href="#L445">445</a> decorationModel = readDecorationModel( siteDescriptorContent );
-<a class="jxr_linenumber" name="L446" href="#L446">446</a> }
-<a class="jxr_linenumber" name="L447" href="#L447">447</a>
-<a class="jxr_linenumber" name="L448" href="#L448">448</a> <em class="jxr_comment">// DecorationModel back to String to interpolate, then go back to DecorationModel</em>
-<a class="jxr_linenumber" name="L449" href="#L449">449</a> String siteDescriptorContent = decorationModelToString( decorationModel );
-<a class="jxr_linenumber" name="L450" href="#L450">450</a>
-<a class="jxr_linenumber" name="L451" href="#L451">451</a> <em class="jxr_comment">// "classical" late interpolation, after full inheritance</em>
-<a class="jxr_linenumber" name="L452" href="#L452">452</a> siteDescriptorContent = getInterpolatedSiteDescriptorContent( project, siteDescriptorContent, false );
-<a class="jxr_linenumber" name="L453" href="#L453">453</a>
-<a class="jxr_linenumber" name="L454" href="#L454">454</a> decorationModel = readDecorationModel( siteDescriptorContent );
-<a class="jxr_linenumber" name="L455" href="#L455">455</a>
-<a class="jxr_linenumber" name="L456" href="#L456">456</a> <strong class="jxr_keyword">if</strong> ( parentProject != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L457" href="#L457">457</a> {
-<a class="jxr_linenumber" name="L458" href="#L458">458</a> populateParentMenu( decorationModel, llocale, project, parentProject, <strong class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="L459" href="#L459">459</a> }
-<a class="jxr_linenumber" name="L460" href="#L460">460</a>
-<a class="jxr_linenumber" name="L461" href="#L461">461</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> {
-<a class="jxr_linenumber" name="L463" href="#L463">463</a> populateModulesMenu( decorationModel, llocale, project, reactorProjects, localRepository, <strong class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="L464" href="#L464">464</a> }
-<a class="jxr_linenumber" name="L465" href="#L465">465</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
-<a class="jxr_linenumber" name="L466" href="#L466">466</a> {
-<a class="jxr_linenumber" name="L467" href="#L467">467</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"Error while populating modules menu: "</span> + e.getMessage(), e );
-<a class="jxr_linenumber" name="L468" href="#L468">468</a> }
-<a class="jxr_linenumber" name="L469" href="#L469">469</a>
-<a class="jxr_linenumber" name="L470" href="#L470">470</a> <strong class="jxr_keyword">if</strong> ( decorationModel.getBannerLeft() == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L471" href="#L471">471</a> {
-<a class="jxr_linenumber" name="L472" href="#L472">472</a> <em class="jxr_comment">// extra default to set</em>
-<a class="jxr_linenumber" name="L473" href="#L473">473</a> Banner banner = <strong class="jxr_keyword">new</strong> Banner();
-<a class="jxr_linenumber" name="L474" href="#L474">474</a> banner.setName( project.getName() );
-<a class="jxr_linenumber" name="L475" href="#L475">475</a> decorationModel.setBannerLeft( banner );
-<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> <strong class="jxr_keyword">return</strong> decorationModel;
-<a class="jxr_linenumber" name="L479" href="#L479">479</a> }
-<a class="jxr_linenumber" name="L480" href="#L480">480</a>
-<a class="jxr_linenumber" name="L481" href="#L481">481</a> <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
-<a class="jxr_linenumber" name="L482" href="#L482">482</a> <strong class="jxr_keyword">public</strong> String getInterpolatedSiteDescriptorContent( Map<String, String> props, MavenProject aProject,
-<a class="jxr_linenumber" name="L483" href="#L483">483</a> String siteDescriptorContent )
-<a class="jxr_linenumber" name="L484" href="#L484">484</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>
-<a class="jxr_linenumber" name="L485" href="#L485">485</a> {
-<a class="jxr_linenumber" name="L486" href="#L486">486</a> checkNotNull( <span class="jxr_string">"props"</span>, props );
-<a class="jxr_linenumber" name="L487" href="#L487">487</a>
-<a class="jxr_linenumber" name="L488" href="#L488">488</a> <em class="jxr_comment">// "classical" late interpolation</em>
-<a class="jxr_linenumber" name="L489" href="#L489">489</a> <strong class="jxr_keyword">return</strong> getInterpolatedSiteDescriptorContent( aProject, siteDescriptorContent, false );
-<a class="jxr_linenumber" name="L490" href="#L490">490</a> }
-<a class="jxr_linenumber" name="L491" href="#L491">491</a>
-<a class="jxr_linenumber" name="L492" href="#L492">492</a> <strong class="jxr_keyword">private</strong> String getInterpolatedSiteDescriptorContent( MavenProject aProject,
-<a class="jxr_linenumber" name="L493" href="#L493">493</a> String siteDescriptorContent, <strong class="jxr_keyword">boolean</strong> isEarly )
-<a class="jxr_linenumber" name="L494" href="#L494">494</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>
-<a class="jxr_linenumber" name="L495" href="#L495">495</a> {
-<a class="jxr_linenumber" name="L496" href="#L496">496</a> checkNotNull( <span class="jxr_string">"aProject"</span>, aProject );
-<a class="jxr_linenumber" name="L497" href="#L497">497</a> checkNotNull( <span class="jxr_string">"siteDescriptorContent"</span>, siteDescriptorContent );
-<a class="jxr_linenumber" name="L498" href="#L498">498</a>
-<a class="jxr_linenumber" name="L499" href="#L499">499</a> RegexBasedInterpolator interpolator = <strong class="jxr_keyword">new</strong> RegexBasedInterpolator();
-<a class="jxr_linenumber" name="L500" href="#L500">500</a>
-<a class="jxr_linenumber" name="L501" href="#L501">501</a> <strong class="jxr_keyword">if</strong> ( isEarly )
-<a class="jxr_linenumber" name="L502" href="#L502">502</a> {
-<a class="jxr_linenumber" name="L503" href="#L503">503</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> PrefixedObjectValueSource( <span class="jxr_string">"this."</span>, aProject ) );
-<a class="jxr_linenumber" name="L504" href="#L504">504</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> PrefixedPropertiesValueSource( <span class="jxr_string">"this."</span>, aProject.getProperties() ) );
-<a class="jxr_linenumber" name="L505" href="#L505">505</a> }
-<a class="jxr_linenumber" name="L506" href="#L506">506</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L507" href="#L507">507</a> {
-<a class="jxr_linenumber" name="L508" href="#L508">508</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> PrefixedObjectValueSource( <span class="jxr_string">"project."</span>, aProject ) );
-<a class="jxr_linenumber" name="L509" href="#L509">509</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> MapBasedValueSource( aProject.getProperties() ) );
-<a class="jxr_linenumber" name="L510" href="#L510">510</a>
-<a class="jxr_linenumber" name="L511" href="#L511">511</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L512" href="#L512">512</a> {
-<a class="jxr_linenumber" name="L513" href="#L513">513</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> EnvarBasedValueSource() );
-<a class="jxr_linenumber" name="L514" href="#L514">514</a> }
-<a class="jxr_linenumber" name="L515" href="#L515">515</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
-<a class="jxr_linenumber" name="L516" href="#L516">516</a> {
-<a class="jxr_linenumber" name="L517" href="#L517">517</a> <em class="jxr_comment">// Prefer logging?</em>
-<a class="jxr_linenumber" name="L518" href="#L518">518</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"IOException: cannot interpolate environment properties: "</span>
-<a class="jxr_linenumber" name="L519" href="#L519">519</a> + e.getMessage(), e );
-<a class="jxr_linenumber" name="L520" href="#L520">520</a> }
-<a class="jxr_linenumber" name="L521" href="#L521">521</a> }
-<a class="jxr_linenumber" name="L522" href="#L522">522</a>
-<a class="jxr_linenumber" name="L523" href="#L523">523</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L524" href="#L524">524</a> {
-<a class="jxr_linenumber" name="L525" href="#L525">525</a> <em class="jxr_comment">// FIXME: this does not escape xml entities, see MSITE-226, PLXCOMP-118</em>
-<a class="jxr_linenumber" name="L526" href="#L526">526</a> <strong class="jxr_keyword">return</strong> interpolator.interpolate( siteDescriptorContent );
-<a class="jxr_linenumber" name="L527" href="#L527">527</a> }
-<a class="jxr_linenumber" name="L528" href="#L528">528</a> <strong class="jxr_keyword">catch</strong> ( InterpolationException e )
-<a class="jxr_linenumber" name="L529" href="#L529">529</a> {
-<a class="jxr_linenumber" name="L530" href="#L530">530</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"Cannot interpolate site descriptor: "</span> + e.getMessage(), e );
-<a class="jxr_linenumber" name="L531" href="#L531">531</a> }
-<a class="jxr_linenumber" name="L532" href="#L532">532</a> }
-<a class="jxr_linenumber" name="L533" href="#L533">533</a>
-<a class="jxr_linenumber" name="L534" href="#L534">534</a> <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
-<a class="jxr_linenumber" name="L535" href="#L535">535</a> <strong class="jxr_keyword">public</strong> MavenProject getParentProject( MavenProject aProject, List<MavenProject> reactorProjects,
-<a class="jxr_linenumber" name="L536" href="#L536">536</a> ArtifactRepository localRepository )
-<a class="jxr_linenumber" name="L537" href="#L537">537</a> {
-<a class="jxr_linenumber" name="L538" href="#L538">538</a> checkNotNull( <span class="jxr_string">"aProject"</span>, aProject );
-<a class="jxr_linenumber" name="L539" href="#L539">539</a> checkNotNull( <span class="jxr_string">"reactorProjects"</span>, reactorProjects );
-<a class="jxr_linenumber" name="L540" href="#L540">540</a> checkNotNull( <span class="jxr_string">"localRepository"</span>, localRepository );
-<a class="jxr_linenumber" name="L541" href="#L541">541</a>
-<a class="jxr_linenumber" name="L542" href="#L542">542</a> <strong class="jxr_keyword">if</strong> ( isMaven3OrMore() )
-<a class="jxr_linenumber" name="L543" href="#L543">543</a> {
-<a class="jxr_linenumber" name="L544" href="#L544">544</a> <em class="jxr_comment">// no need to make voodoo with Maven 3: job already done</em>
-<a class="jxr_linenumber" name="L545" href="#L545">545</a> <strong class="jxr_keyword">return</strong> aProject.getParent();
-<a class="jxr_linenumber" name="L546" href="#L546">546</a> }
-<a class="jxr_linenumber" name="L547" href="#L547">547</a>
-<a class="jxr_linenumber" name="L548" href="#L548">548</a> MavenProject parentProject = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L549" href="#L549">549</a>
-<a class="jxr_linenumber" name="L550" href="#L550">550</a> MavenProject origParent = aProject.getParent();
-<a class="jxr_linenumber" name="L551" href="#L551">551</a> <strong class="jxr_keyword">if</strong> ( origParent != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L552" href="#L552">552</a> {
-<a class="jxr_linenumber" name="L553" href="#L553">553</a> <strong class="jxr_keyword">for</strong> ( MavenProject reactorProject : reactorProjects )
-<a class="jxr_linenumber" name="L554" href="#L554">554</a> {
-<a class="jxr_linenumber" name="L555" href="#L555">555</a> <strong class="jxr_keyword">if</strong> ( reactorProject.getGroupId().equals( origParent.getGroupId() )
-<a class="jxr_linenumber" name="L556" href="#L556">556</a> && reactorProject.getArtifactId().equals( origParent.getArtifactId() )
-<a class="jxr_linenumber" name="L557" href="#L557">557</a> && reactorProject.getVersion().equals( origParent.getVersion() ) )
-<a class="jxr_linenumber" name="L558" href="#L558">558</a> {
-<a class="jxr_linenumber" name="L559" href="#L559">559</a> parentProject = reactorProject;
-<a class="jxr_linenumber" name="L560" href="#L560">560</a>
-<a class="jxr_linenumber" name="L561" href="#L561">561</a> LOGGER.debug( <span class="jxr_string">"Parent project "</span> + origParent.getId() + <span class="jxr_string">" picked from reactor"</span> );
-<a class="jxr_linenumber" name="L562" href="#L562">562</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="L563" href="#L563">563</a> }
-<a class="jxr_linenumber" name="L564" href="#L564">564</a> }
-<a class="jxr_linenumber" name="L565" href="#L565">565</a>
-<a class="jxr_linenumber" name="L566" href="#L566">566</a> <strong class="jxr_keyword">if</strong> ( parentProject == <strong class="jxr_keyword">null</strong> && aProject.getBasedir() != <strong class="jxr_keyword">null</strong>
-<a class="jxr_linenumber" name="L567" href="#L567">567</a> && StringUtils.isNotEmpty( aProject.getModel().getParent().getRelativePath() ) )
-<a class="jxr_linenumber" name="L568" href="#L568">568</a> {
-<a class="jxr_linenumber" name="L569" href="#L569">569</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L570" href="#L570">570</a> {
-<a class="jxr_linenumber" name="L571" href="#L571">571</a> String relativePath = aProject.getModel().getParent().getRelativePath();
-<a class="jxr_linenumber" name="L572" href="#L572">572</a>
-<a class="jxr_linenumber" name="L573" href="#L573">573</a> File pomFile = <strong class="jxr_keyword">new</strong> File( aProject.getBasedir(), relativePath );
-<a class="jxr_linenumber" name="L574" href="#L574">574</a>
-<a class="jxr_linenumber" name="L575" href="#L575">575</a> <strong class="jxr_keyword">if</strong> ( pomFile.isDirectory() )
-<a class="jxr_linenumber" name="L576" href="#L576">576</a> {
-<a class="jxr_linenumber" name="L577" href="#L577">577</a> pomFile = <strong class="jxr_keyword">new</strong> File( pomFile, <span class="jxr_string">"pom.xml"</span> );
-<a class="jxr_linenumber" name="L578" href="#L578">578</a> }
-<a class="jxr_linenumber" name="L579" href="#L579">579</a> pomFile = <strong class="jxr_keyword">new</strong> File( getNormalizedPath( pomFile.getPath() ) );
-<a class="jxr_linenumber" name="L580" href="#L580">580</a>
-<a class="jxr_linenumber" name="L581" href="#L581">581</a> <strong class="jxr_keyword">if</strong> ( pomFile.isFile() )
-<a class="jxr_linenumber" name="L582" href="#L582">582</a> {
-<a class="jxr_linenumber" name="L583" href="#L583">583</a> MavenProject mavenProject = mavenProjectBuilder.build( pomFile, localRepository, <strong class="jxr_keyword">null</strong> );
-<a class="jxr_linenumber" name="L584" href="#L584">584</a>
-<a class="jxr_linenumber" name="L585" href="#L585">585</a> <strong class="jxr_keyword">if</strong> ( mavenProject.getGroupId().equals( origParent.getGroupId() )
-<a class="jxr_linenumber" name="L586" href="#L586">586</a> && mavenProject.getArtifactId().equals( origParent.getArtifactId() )
-<a class="jxr_linenumber" name="L587" href="#L587">587</a> && mavenProject.getVersion().equals( origParent.getVersion() ) )
-<a class="jxr_linenumber" name="L588" href="#L588">588</a> {
-<a class="jxr_linenumber" name="L589" href="#L589">589</a> parentProject = mavenProject;
-<a class="jxr_linenumber" name="L590" href="#L590">590</a>
-<a class="jxr_linenumber" name="L591" href="#L591">591</a> LOGGER.debug( <span class="jxr_string">"Parent project "</span> + origParent.getId() + <span class="jxr_string">" loaded from a relative path: "</span>
-<a class="jxr_linenumber" name="L592" href="#L592">592</a> + relativePath );
-<a class="jxr_linenumber" name="L593" href="#L593">593</a> }
-<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> <strong class="jxr_keyword">catch</strong> ( ProjectBuildingException e )
-<a class="jxr_linenumber" name="L597" href="#L597">597</a> {
-<a class="jxr_linenumber" name="L598" href="#L598">598</a> LOGGER.info( <span class="jxr_string">"Unable to load parent project "</span> + origParent.getId() + <span class="jxr_string">" from a relative path: "</span>
-<a class="jxr_linenumber" name="L599" href="#L599">599</a> + e.getMessage() );
-<a class="jxr_linenumber" name="L600" href="#L600">600</a> }
-<a class="jxr_linenumber" name="L601" href="#L601">601</a> }
+<a class="jxr_linenumber" name="L394" href="#L394">394</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"Unable to locate site descriptor"</span>, e );
+<a class="jxr_linenumber" name="L395" href="#L395">395</a> }
+<a class="jxr_linenumber" name="L396" href="#L396">396</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
+<a class="jxr_linenumber" name="L397" href="#L397">397</a> {
+<a class="jxr_linenumber" name="L398" href="#L398">398</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"Unable to locate site descriptor"</span>, e );
+<a class="jxr_linenumber" name="L399" href="#L399">399</a> }
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> }
+<a class="jxr_linenumber" name="L401" href="#L401">401</a>
+<a class="jxr_linenumber" name="L402" href="#L402">402</a> <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
+<a class="jxr_linenumber" name="L403" href="#L403">403</a> <strong class="jxr_keyword">public</strong> DecorationModel getDecorationModel( File siteDirectory, Locale locale, MavenProject project,
+<a class="jxr_linenumber" name="L404" href="#L404">404</a> List<MavenProject> reactorProjects, ArtifactRepository localRepository,
+<a class="jxr_linenumber" name="L405" href="#L405">405</a> List<ArtifactRepository> repositories )
+<a class="jxr_linenumber" name="L406" href="#L406">406</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>
+<a class="jxr_linenumber" name="L407" href="#L407">407</a> {
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> Objects.requireNonNull( project, <span class="jxr_string">"project cannot be null"</span> );
+<a class="jxr_linenumber" name="L409" href="#L409">409</a> Objects.requireNonNull( reactorProjects, <span class="jxr_string">"reactorProjects cannot be null"</span> );
+<a class="jxr_linenumber" name="L410" href="#L410">410</a> Objects.requireNonNull( localRepository, <span class="jxr_string">"localRepository cannot be null"</span> );
+<a class="jxr_linenumber" name="L411" href="#L411">411</a> Objects.requireNonNull( repositories, <span class="jxr_string">"repositories cannot be null"</span> );
+<a class="jxr_linenumber" name="L412" href="#L412">412</a>
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> <strong class="jxr_keyword">final</strong> Locale llocale = ( locale == <strong class="jxr_keyword">null</strong> ) ? Locale.getDefault() : locale;
+<a class="jxr_linenumber" name="L414" href="#L414">414</a>
+<a class="jxr_linenumber" name="L415" href="#L415">415</a> LOGGER.debug( <span class="jxr_string">"Computing decoration model of "</span> + project.getId() + <span class="jxr_string">" for locale "</span> + llocale );
+<a class="jxr_linenumber" name="L416" href="#L416">416</a>
+<a class="jxr_linenumber" name="L417" href="#L417">417</a> Map.Entry<DecorationModel, MavenProject> result =
+<a class="jxr_linenumber" name="L418" href="#L418">418</a> getDecorationModel( 0, siteDirectory, llocale, project, reactorProjects, localRepository, repositories );
+<a class="jxr_linenumber" name="L419" href="#L419">419</a> DecorationModel decorationModel = result.getKey();
+<a class="jxr_linenumber" name="L420" href="#L420">420</a> MavenProject parentProject = result.getValue();
+<a class="jxr_linenumber" name="L421" href="#L421">421</a>
+<a class="jxr_linenumber" name="L422" href="#L422">422</a> <strong class="jxr_keyword">if</strong> ( decorationModel == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> {
+<a class="jxr_linenumber" name="L424" href="#L424">424</a> LOGGER.debug( <span class="jxr_string">"Using default site descriptor"</span> );
+<a class="jxr_linenumber" name="L425" href="#L425">425</a>
+<a class="jxr_linenumber" name="L426" href="#L426">426</a> String siteDescriptorContent;
+<a class="jxr_linenumber" name="L427" href="#L427">427</a>
+<a class="jxr_linenumber" name="L428" href="#L428">428</a> Reader reader = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L430" href="#L430">430</a> {
+<a class="jxr_linenumber" name="L431" href="#L431">431</a> <em class="jxr_comment">// Note the default is not a super class - it is used when nothing else is found</em>
+<a class="jxr_linenumber" name="L432" href="#L432">432</a> reader = ReaderFactory.newXmlReader( getClass().getResourceAsStream( <span class="jxr_string">"/default-site.xml"</span> ) );
+<a class="jxr_linenumber" name="L433" href="#L433">433</a> siteDescriptorContent = IOUtil.toString( reader );
+<a class="jxr_linenumber" name="L434" href="#L434">434</a> }
+<a class="jxr_linenumber" name="L435" href="#L435">435</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
+<a class="jxr_linenumber" name="L436" href="#L436">436</a> {
+<a class="jxr_linenumber" name="L437" href="#L437">437</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"Error reading default site descriptor"</span>, e );
+<a class="jxr_linenumber" name="L438" href="#L438">438</a> }
+<a class="jxr_linenumber" name="L439" href="#L439">439</a> <strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="L440" href="#L440">440</a> {
+<a class="jxr_linenumber" name="L441" href="#L441">441</a> IOUtil.close( reader );
+<a class="jxr_linenumber" name="L442" href="#L442">442</a> }
+<a class="jxr_linenumber" name="L443" href="#L443">443</a>
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> decorationModel = readDecorationModel( siteDescriptorContent );
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> }
+<a class="jxr_linenumber" name="L446" href="#L446">446</a>
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> <em class="jxr_comment">// DecorationModel back to String to interpolate, then go back to DecorationModel</em>
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> String siteDescriptorContent = decorationModelToString( decorationModel );
+<a class="jxr_linenumber" name="L449" href="#L449">449</a>
+<a class="jxr_linenumber" name="L450" href="#L450">450</a> <em class="jxr_comment">// "classical" late interpolation, after full inheritance</em>
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> siteDescriptorContent = getInterpolatedSiteDescriptorContent( project, siteDescriptorContent, false );
+<a class="jxr_linenumber" name="L452" href="#L452">452</a>
+<a class="jxr_linenumber" name="L453" href="#L453">453</a> decorationModel = readDecorationModel( siteDescriptorContent );
+<a class="jxr_linenumber" name="L454" href="#L454">454</a>
+<a class="jxr_linenumber" name="L455" href="#L455">455</a> <strong class="jxr_keyword">if</strong> ( parentProject != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> {
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> populateParentMenu( decorationModel, llocale, project, parentProject, <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> }
+<a class="jxr_linenumber" name="L459" href="#L459">459</a>
+<a class="jxr_linenumber" name="L460" href="#L460">460</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L461" href="#L461">461</a> {
+<a class="jxr_linenumber" name="L462" href="#L462">462</a> populateModulesMenu( decorationModel, llocale, project, reactorProjects, localRepository, <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L463" href="#L463">463</a> }
+<a class="jxr_linenumber" name="L464" href="#L464">464</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
+<a class="jxr_linenumber" name="L465" href="#L465">465</a> {
+<a class="jxr_linenumber" name="L466" href="#L466">466</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"Error while populating modules menu"</span>, e );
+<a class="jxr_linenumber" name="L467" href="#L467">467</a> }
+<a class="jxr_linenumber" name="L468" href="#L468">468</a>
+<a class="jxr_linenumber" name="L469" href="#L469">469</a> <strong class="jxr_keyword">if</strong> ( decorationModel.getBannerLeft() == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L470" href="#L470">470</a> {
+<a class="jxr_linenumber" name="L471" href="#L471">471</a> <em class="jxr_comment">// extra default to set</em>
+<a class="jxr_linenumber" name="L472" href="#L472">472</a> Banner banner = <strong class="jxr_keyword">new</strong> Banner();
+<a class="jxr_linenumber" name="L473" href="#L473">473</a> banner.setName( project.getName() );
+<a class="jxr_linenumber" name="L474" href="#L474">474</a> decorationModel.setBannerLeft( banner );
+<a class="jxr_linenumber" name="L475" href="#L475">475</a> }
+<a class="jxr_linenumber" name="L476" href="#L476">476</a>
+<a class="jxr_linenumber" name="L477" href="#L477">477</a> <strong class="jxr_keyword">return</strong> decorationModel;
+<a class="jxr_linenumber" name="L478" href="#L478">478</a> }
+<a class="jxr_linenumber" name="L479" href="#L479">479</a>
+<a class="jxr_linenumber" name="L480" href="#L480">480</a> <em class="jxr_javadoccomment">/** {@inheritDoc} */</em>
+<a class="jxr_linenumber" name="L481" href="#L481">481</a> <strong class="jxr_keyword">public</strong> String getInterpolatedSiteDescriptorContent( Map<String, String> props, MavenProject aProject,
+<a class="jxr_linenumber" name="L482" href="#L482">482</a> String siteDescriptorContent )
+<a class="jxr_linenumber" name="L483" href="#L483">483</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>
+<a class="jxr_linenumber" name="L484" href="#L484">484</a> {
+<a class="jxr_linenumber" name="L485" href="#L485">485</a> Objects.requireNonNull( props, <span class="jxr_string">"props cannot be null"</span> );
+<a class="jxr_linenumber" name="L486" href="#L486">486</a>
+<a class="jxr_linenumber" name="L487" href="#L487">487</a> <em class="jxr_comment">// "classical" late interpolation</em>
+<a class="jxr_linenumber" name="L488" href="#L488">488</a> <strong class="jxr_keyword">return</strong> getInterpolatedSiteDescriptorContent( aProject, siteDescriptorContent, false );
+<a class="jxr_linenumber" name="L489" href="#L489">489</a> }
+<a class="jxr_linenumber" name="L490" href="#L490">490</a>
+<a class="jxr_linenumber" name="L491" href="#L491">491</a> <strong class="jxr_keyword">private</strong> String getInterpolatedSiteDescriptorContent( MavenProject aProject,
+<a class="jxr_linenumber" name="L492" href="#L492">492</a> String siteDescriptorContent, <strong class="jxr_keyword">boolean</strong> isEarly )
+<a class="jxr_linenumber" name="L493" href="#L493">493</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>
+<a class="jxr_linenumber" name="L494" href="#L494">494</a> {
+<a class="jxr_linenumber" name="L495" href="#L495">495</a> Objects.requireNonNull( aProject, <span class="jxr_string">"aProject cannot be null"</span> );
+<a class="jxr_linenumber" name="L496" href="#L496">496</a> Objects.requireNonNull( siteDescriptorContent, <span class="jxr_string">"siteDescriptorContent cannot be null"</span> );
+<a class="jxr_linenumber" name="L497" href="#L497">497</a>
+<a class="jxr_linenumber" name="L498" href="#L498">498</a> RegexBasedInterpolator interpolator = <strong class="jxr_keyword">new</strong> RegexBasedInterpolator();
+<a class="jxr_linenumber" name="L499" href="#L499">499</a>
+<a class="jxr_linenumber" name="L500" href="#L500">500</a> <strong class="jxr_keyword">if</strong> ( isEarly )
+<a class="jxr_linenumber" name="L501" href="#L501">501</a> {
+<a class="jxr_linenumber" name="L502" href="#L502">502</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> PrefixedObjectValueSource( <span class="jxr_string">"this."</span>, aProject ) );
+<a class="jxr_linenumber" name="L503" href="#L503">503</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> PrefixedPropertiesValueSource( <span class="jxr_string">"this."</span>, aProject.getProperties() ) );
+<a class="jxr_linenumber" name="L504" href="#L504">504</a> }
+<a class="jxr_linenumber" name="L505" href="#L505">505</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L506" href="#L506">506</a> {
+<a class="jxr_linenumber" name="L507" href="#L507">507</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> PrefixedObjectValueSource( <span class="jxr_string">"project."</span>, aProject ) );
+<a class="jxr_linenumber" name="L508" href="#L508">508</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> MapBasedValueSource( aProject.getProperties() ) );
+<a class="jxr_linenumber" name="L509" href="#L509">509</a>
+<a class="jxr_linenumber" name="L510" href="#L510">510</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L511" href="#L511">511</a> {
+<a class="jxr_linenumber" name="L512" href="#L512">512</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> EnvarBasedValueSource() );
+<a class="jxr_linenumber" name="L513" href="#L513">513</a> }
+<a class="jxr_linenumber" name="L514" href="#L514">514</a> <strong class="jxr_keyword">catch</strong> ( IOException e )
+<a class="jxr_linenumber" name="L515" href="#L515">515</a> {
+<a class="jxr_linenumber" name="L516" href="#L516">516</a> <em class="jxr_comment">// Prefer logging?</em>
+<a class="jxr_linenumber" name="L517" href="#L517">517</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/doxia/tools/SiteToolException.html">SiteToolException</a>( <span class="jxr_string">"Cannot interpolate environment properties"</span>, e );
+<a class="jxr_linenumber" name="L518" href="#L518">518</a> }
+<a class="jxr_linenumber" name="L519" href="#L519">519</a> }
+<a class="jxr_linenumber" name="L520" href="#L520">520</a>
+<a class="jxr_linenumber" name="L521" href="#L521">521</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L522" href="#L522">522</a> {
+<a class="jxr_linenumber" name="L523" href="#L523">523</a> <em class="jxr_comment">// FIXME: this does not escape xml entities, see MSITE-226, PLXCOMP-118</em>
[... 1720 lines stripped ...]