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 [10/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-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptorTest.html
==============================================================================
--- maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptorTest.html (original)
+++ maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptorTest.html Thu Feb 17 14:02:12 2022
@@ -30,81 +30,81 @@
<a class="jxr_linenumber" name="L22" href="#L22">22</a>
<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong class="jxr_keyword">import</strong> java.net.URI;
<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> org.junit.Test;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong class="jxr_keyword">import</strong> org.junit.jupiter.api.Test;
<a class="jxr_linenumber" name="L26" href="#L26">26</a>
-<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.Assert.*;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>
-<a class="jxr_linenumber" name="L29" href="#L29">29</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L30" href="#L30">30</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L31" href="#L31">31</a> <em class="jxr_javadoccomment"> * @author ltheussl</em>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> <em class="jxr_javadoccomment"> * @since 1.2</em>
-<a class="jxr_linenumber" name="L34" href="#L34">34</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptorTest.html">URIPathDescriptorTest</a>
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> {
-<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String BASE_URL = <span class="jxr_string">"http://maven.apache.org/"</span>;
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <em class="jxr_javadoccomment"> * Test of constructor, of class URIPathDescriptor.</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <em class="jxr_javadoccomment"> * @throws Exception</em>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> @Test
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testConstructor()
-<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> {
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong class="jxr_keyword">final</strong> String expected = BASE_URL + <span class="jxr_string">"doxia"</span>;
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong class="jxr_keyword">final</strong> URIPathDescriptor path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"doxia"</span> );
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> assertEquals( expected, path.toString() );
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> assertEquals( BASE_URL, path.getBaseURI().toString() );
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> assertEquals( <span class="jxr_string">"doxia"</span>, path.getLink().toString() );
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> URIPathDescriptor compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://maven.apache.org"</span>, <span class="jxr_string">"/doxia"</span> );
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> assertEquals( expected, compare.toString() );
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://maven.apache.org/./doxia/../"</span>, <span class="jxr_string">"/sub/./sub/../../doxia"</span> );
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> assertEquals( expected, compare.toString() );
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://maven.apache.org/doxia"</span>, <span class="jxr_string">""</span> );
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> assertEquals( expected + <span class="jxr_string">"/"</span>, compare.toString() );
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:///C:\\Foo\\bar1"</span>, <span class="jxr_string">""</span> );
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> assertEquals( <span class="jxr_string">"file:///C:/Foo/bar1/"</span>, compare.getBaseURI().toString() );
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> <em class="jxr_comment">// toString() calls resolve() which removes two slashes because authority is empty</em>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> assertEquals( <span class="jxr_string">"file:/C:/Foo/bar1/"</span>, compare.toString() );
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:///C:/Documents%20and%20Settings/foo/"</span>, <span class="jxr_string">"bar"</span> );
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> assertEquals( <span class="jxr_string">"file:/C:/Documents%20and%20Settings/foo/bar"</span>, compare.toString() );
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:////Users/"</span>, <span class="jxr_string">"user"</span> );
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> assertEquals( <span class="jxr_string">"file:/Users/user"</span>, compare.toString() );
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>
-<a class="jxr_linenumber" name="L75" href="#L75">75</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:/C:/Documents%20and%20Settings/foo/"</span>, <span class="jxr_string">"bar"</span> );
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> assertEquals( <span class="jxr_string">"file:/C:/Documents%20and%20Settings/foo/bar"</span>, compare.toString() );
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file://C:/Documents%20and%20Settings/foo/"</span>, <span class="jxr_string">"bar"</span> );
-<a class="jxr_linenumber" name="L79" href="#L79">79</a> <em class="jxr_comment">// toString() calls resolve() which removes the colon if port is empty, C is the host here!</em>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a> assertEquals( <span class="jxr_string">"file://C/Documents%20and%20Settings/foo/bar"</span>, compare.toString() );
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file://C:8080/Documents%20and%20Settings/foo/"</span>, <span class="jxr_string">"bar"</span> );
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> assertEquals( <span class="jxr_string">"file://C:8080/Documents%20and%20Settings/foo/bar"</span>, compare.toString() );
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>
-<a class="jxr_linenumber" name="L85" href="#L85">85</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"C:\\Foo\\bar"</span>, <span class="jxr_string">"bar"</span> );
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> assertEquals( <span class="jxr_string">"C:/Foo/bar/bar"</span>, compare.toString() ); <em class="jxr_comment">// NOTE: C: is the scheme here!</em>
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>
-<a class="jxr_linenumber" name="L88" href="#L88">88</a> assertFailure( <span class="jxr_string">"/doxia"</span>, BASE_URL );
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> assertFailure( <span class="jxr_string">"file:///C:/Documents and Settings/foo/"</span>, <span class="jxr_string">"bar"</span> );
-<a class="jxr_linenumber" name="L90" href="#L90">90</a> }
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>
-<a class="jxr_linenumber" name="L92" href="#L92">92</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> <em class="jxr_javadoccomment"> * Test of resolveLink method, of class URIPathDescriptor.</em>
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L95" href="#L95">95</a> <em class="jxr_javadoccomment"> * @throws Exception</em>
-<a class="jxr_linenumber" name="L96" href="#L96">96</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L97" href="#L97">97</a> @Test
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testResolveLink()
-<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.assertEquals;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.assertFalse;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.assertThrows;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.jupiter.api.Assertions.assertTrue;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>
+<a class="jxr_linenumber" name="L32" href="#L32">32</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L34" href="#L34">34</a> <em class="jxr_javadoccomment"> * @author ltheussl</em>
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L36" href="#L36">36</a> <em class="jxr_javadoccomment"> * @since 1.2</em>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> @SuppressWarnings( <span class="jxr_string">"javadoc"</span> )
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptorTest.html">URIPathDescriptorTest</a>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a> {
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String BASE_URL = <span class="jxr_string">"http://maven.apache.org/"</span>;
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <em class="jxr_javadoccomment"> * Test of constructor, of class URIPathDescriptor.</em>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> @Test
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testConstructor()
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> {
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">final</strong> String expected = BASE_URL + <span class="jxr_string">"doxia"</span>;
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">final</strong> URIPathDescriptor path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"doxia"</span> );
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> assertEquals( expected, path.toString() );
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> assertEquals( BASE_URL, path.getBaseURI().toString() );
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> assertEquals( <span class="jxr_string">"doxia"</span>, path.getLink().toString() );
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> URIPathDescriptor compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://maven.apache.org"</span>, <span class="jxr_string">"/doxia"</span> );
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> assertEquals( expected, compare.toString() );
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://maven.apache.org/./doxia/../"</span>, <span class="jxr_string">"/sub/./sub/../../doxia"</span> );
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> assertEquals( expected, compare.toString() );
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://maven.apache.org/doxia"</span>, <span class="jxr_string">""</span> );
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> assertEquals( expected + <span class="jxr_string">"/"</span>, compare.toString() );
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:///C:\\Foo\\bar1"</span>, <span class="jxr_string">""</span> );
+<a class="jxr_linenumber" name="L66" href="#L66">66</a> assertEquals( <span class="jxr_string">"file:///C:/Foo/bar1/"</span>, compare.getBaseURI().toString() );
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> <em class="jxr_comment">// toString() calls resolve() which removes two slashes because authority is empty</em>
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> assertEquals( <span class="jxr_string">"file:/C:/Foo/bar1/"</span>, compare.toString() );
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:///C:/Documents%20and%20Settings/foo/"</span>, <span class="jxr_string">"bar"</span> );
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> assertEquals( <span class="jxr_string">"file:/C:/Documents%20and%20Settings/foo/bar"</span>, compare.toString() );
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:////Users/"</span>, <span class="jxr_string">"user"</span> );
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> assertEquals( <span class="jxr_string">"file:/Users/user"</span>, compare.toString() );
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:/C:/Documents%20and%20Settings/foo/"</span>, <span class="jxr_string">"bar"</span> );
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> assertEquals( <span class="jxr_string">"file:/C:/Documents%20and%20Settings/foo/bar"</span>, compare.toString() );
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file://C:/Documents%20and%20Settings/foo/"</span>, <span class="jxr_string">"bar"</span> );
+<a class="jxr_linenumber" name="L80" href="#L80">80</a> <em class="jxr_comment">// toString() calls resolve() which removes the colon if port is empty, C is the host here!</em>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a> assertEquals( <span class="jxr_string">"file://C/Documents%20and%20Settings/foo/bar"</span>, compare.toString() );
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file://C:8080/Documents%20and%20Settings/foo/"</span>, <span class="jxr_string">"bar"</span> );
+<a class="jxr_linenumber" name="L84" href="#L84">84</a> assertEquals( <span class="jxr_string">"file://C:8080/Documents%20and%20Settings/foo/bar"</span>, compare.toString() );
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>
+<a class="jxr_linenumber" name="L86" href="#L86">86</a> compare = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"C:\\Foo\\bar"</span>, <span class="jxr_string">"bar"</span> );
+<a class="jxr_linenumber" name="L87" href="#L87">87</a> assertEquals( <span class="jxr_string">"C:/Foo/bar/bar"</span>, compare.toString() ); <em class="jxr_comment">// NOTE: C: is the scheme here!</em>
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>
+<a class="jxr_linenumber" name="L89" href="#L89">89</a> assertThrows( IllegalArgumentException.<strong class="jxr_keyword">class</strong>, () -> <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"/doxia"</span>, BASE_URL ) );
+<a class="jxr_linenumber" name="L90" href="#L90">90</a> assertThrows( IllegalArgumentException.<strong class="jxr_keyword">class</strong>, () -> <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:///C:/Documents and Settings/foo/"</span>, <span class="jxr_string">"bar"</span> ) );
+<a class="jxr_linenumber" name="L91" href="#L91">91</a> }
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>
+<a class="jxr_linenumber" name="L93" href="#L93">93</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> <em class="jxr_javadoccomment"> * Test of resolveLink method, of class URIPathDescriptor.</em>
+<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"> * @throws Exception</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> @Test
+<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testResolveLink()
<a class="jxr_linenumber" name="L100" href="#L100">100</a> {
<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">final</strong> String expected = BASE_URL + <span class="jxr_string">"source"</span>;
<a class="jxr_linenumber" name="L102" href="#L102">102</a>
@@ -143,163 +143,145 @@
<a class="jxr_linenumber" name="L135" href="#L135">135</a>
<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment"> * Test of rebaseLink method, of class URIPathDescriptor.</em>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment"> * @throws Exception</em>
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> @Test
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRebaseLink()
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> {
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> URIPathDescriptor oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"source"</span> );
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> assertEquals( <span class="jxr_string">"../source"</span>, oldPath.rebaseLink( <span class="jxr_string">"http://maven.apache.org/doxia/"</span> ).toString() );
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> assertEquals( <span class="jxr_string">"http://maven.apache.org/source"</span>, oldPath.rebaseLink( <strong class="jxr_keyword">null</strong> ).toString() );
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> assertEquals( <span class="jxr_string">"http://maven.apache.org/source"</span>,
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> oldPath.rebaseLink( <span class="jxr_string">"C:/Documents and Settings/"</span> ).toString() );
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> @Test
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRebaseLink()
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> {
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> URIPathDescriptor oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"source"</span> );
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> assertEquals( <span class="jxr_string">"../source"</span>, oldPath.rebaseLink( <span class="jxr_string">"http://maven.apache.org/doxia/"</span> ).toString() );
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> assertEquals( <span class="jxr_string">"http://maven.apache.org/source"</span>, oldPath.rebaseLink( <strong class="jxr_keyword">null</strong> ).toString() );
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> assertEquals( <span class="jxr_string">"http://maven.apache.org/source"</span>,
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> oldPath.rebaseLink( <span class="jxr_string">"C:/Documents and Settings/"</span> ).toString() );
+<a class="jxr_linenumber" name="L147" href="#L147">147</a>
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"./"</span> );
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> assertEquals( <span class="jxr_string">""</span>, oldPath.rebaseLink( <span class="jxr_string">"http://maven.apache.org/"</span> ).toString() );
<a class="jxr_linenumber" name="L150" href="#L150">150</a>
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"./"</span> );
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">""</span> );
<a class="jxr_linenumber" name="L152" href="#L152">152</a> assertEquals( <span class="jxr_string">""</span>, oldPath.rebaseLink( <span class="jxr_string">"http://maven.apache.org/"</span> ).toString() );
<a class="jxr_linenumber" name="L153" href="#L153">153</a>
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">""</span> );
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> assertEquals( <span class="jxr_string">""</span>, oldPath.rebaseLink( <span class="jxr_string">"http://maven.apache.org/"</span> ).toString() );
-<a class="jxr_linenumber" name="L156" href="#L156">156</a>
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"source/index.html"</span> );
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> assertEquals( <span class="jxr_string">"../source/index.html"</span>,
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> oldPath.rebaseLink( <span class="jxr_string">"http://maven.apache.org/doxia/"</span> ).toString() );
-<a class="jxr_linenumber" name="L160" href="#L160">160</a>
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"source/index.html?var=foo&amp;var2=bar"</span> );
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> assertEquals( <span class="jxr_string">"../source/index.html?var=foo&amp;var2=bar"</span>,
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> oldPath.rebaseLink( <span class="jxr_string">"http://maven.apache.org/doxia/"</span> ).toString() );
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"source/index.html"</span> );
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> assertEquals( <span class="jxr_string">"../source/index.html"</span>,
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> oldPath.rebaseLink( <span class="jxr_string">"http://maven.apache.org/doxia/"</span> ).toString() );
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"source/index.html?var=foo&amp;var2=bar"</span> );
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> assertEquals( <span class="jxr_string">"../source/index.html?var=foo&amp;var2=bar"</span>,
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> oldPath.rebaseLink( <span class="jxr_string">"http://maven.apache.org/doxia/"</span> ).toString() );
+<a class="jxr_linenumber" name="L161" href="#L161">161</a>
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"scp://people.apache.org/"</span>, <span class="jxr_string">"source"</span> );
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> assertEquals( <span class="jxr_string">"../source"</span>, oldPath.rebaseLink( <span class="jxr_string">"scp://people.apache.org/doxia"</span> ).toString() );
<a class="jxr_linenumber" name="L164" href="#L164">164</a>
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"scp://people.apache.org/"</span>, <span class="jxr_string">"source"</span> );
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> assertEquals( <span class="jxr_string">"../source"</span>, oldPath.rebaseLink( <span class="jxr_string">"scp://people.apache.org/doxia"</span> ).toString() );
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"banner/left"</span> );
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> assertEquals( <span class="jxr_string">"../banner/left"</span>, oldPath.rebaseLink( <span class="jxr_string">"http://maven.apache.org/doxia/"</span> ).toString() );
<a class="jxr_linenumber" name="L167" href="#L167">167</a>
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"banner/left"</span> );
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> assertEquals( <span class="jxr_string">"../banner/left"</span>, oldPath.rebaseLink( <span class="jxr_string">"http://maven.apache.org/doxia/"</span> ).toString() );
-<a class="jxr_linenumber" name="L170" href="#L170">170</a>
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"index.html?var=foo&amp;var2=bar"</span> );
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> assertEquals( <span class="jxr_string">"../index.html?var=foo&amp;var2=bar"</span>,
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> oldPath.rebaseLink( <span class="jxr_string">"http://maven.apache.org/doxia/"</span> ).toString() );
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"index.html?var=foo&amp;var2=bar"</span> );
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> assertEquals( <span class="jxr_string">"../index.html?var=foo&amp;var2=bar"</span>,
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> oldPath.rebaseLink( <span class="jxr_string">"http://maven.apache.org/doxia/"</span> ).toString() );
+<a class="jxr_linenumber" name="L171" href="#L171">171</a>
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://jakarta.apache.org/"</span>, <span class="jxr_string">"banner/left"</span> );
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> assertEquals( <span class="jxr_string">"http://jakarta.apache.org/banner/left"</span>, oldPath.rebaseLink( BASE_URL ).toString() );
<a class="jxr_linenumber" name="L174" href="#L174">174</a>
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://jakarta.apache.org/"</span>, <span class="jxr_string">"banner/left"</span> );
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> assertEquals( <span class="jxr_string">"http://jakarta.apache.org/banner/left"</span>, oldPath.rebaseLink( BASE_URL ).toString() );
-<a class="jxr_linenumber" name="L177" href="#L177">177</a>
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:////Users/"</span>, <span class="jxr_string">"user"</span> );
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> assertEquals( <span class="jxr_string">"../user"</span>, oldPath.rebaseLink( <span class="jxr_string">"file:////Users/target"</span> ).toString() );
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> assertEquals( <span class="jxr_string">"../user"</span>, oldPath.rebaseLink( <span class="jxr_string">"file:/Users/target"</span> ).toString() );
-<a class="jxr_linenumber" name="L181" href="#L181">181</a>
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:///C:/Documents%20and%20Settings/"</span>, <span class="jxr_string">"source"</span> );
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> assertEquals( <span class="jxr_string">"../source"</span>,
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> oldPath.rebaseLink( <span class="jxr_string">"file:///C:/Documents%20and%20Settings/target"</span> ).toString() );
-<a class="jxr_linenumber" name="L185" href="#L185">185</a>
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file://C:/Documents%20and%20Settings/"</span>, <span class="jxr_string">"source"</span> );
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> assertEquals( <span class="jxr_string">"../source"</span>,
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> oldPath.rebaseLink( <span class="jxr_string">"file://C:/Documents%20and%20Settings/target"</span> ).toString() );
-<a class="jxr_linenumber" name="L189" href="#L189">189</a>
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:/C:/Documents%20and%20Settings/"</span>, <span class="jxr_string">"source"</span> );
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> assertEquals( <span class="jxr_string">"../source"</span>,
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> oldPath.rebaseLink( <span class="jxr_string">"file:/C:/Documents%20and%20Settings/target"</span> ).toString() );
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> }
-<a class="jxr_linenumber" name="L194" href="#L194">194</a>
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> <em class="jxr_javadoccomment"> * Test of relativizeLink method, of class URIPathDescriptor.</em>
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> <em class="jxr_javadoccomment"> * @throws Exception</em>
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> @Test
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRelativizeLink()
-<a class="jxr_linenumber" name="L202" href="#L202">202</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> {
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> URIPathDescriptor path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"source"</span> );
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> assertEquals( <span class="jxr_string">"source"</span>, path.relativizeLink().toString() );
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:////Users/"</span>, <span class="jxr_string">"user"</span> );
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> assertEquals( <span class="jxr_string">"../user"</span>, oldPath.rebaseLink( <span class="jxr_string">"file:////Users/target"</span> ).toString() );
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> assertEquals( <span class="jxr_string">"../user"</span>, oldPath.rebaseLink( <span class="jxr_string">"file:/Users/target"</span> ).toString() );
+<a class="jxr_linenumber" name="L178" href="#L178">178</a>
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:///C:/Documents%20and%20Settings/"</span>, <span class="jxr_string">"source"</span> );
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> assertEquals( <span class="jxr_string">"../source"</span>,
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> oldPath.rebaseLink( <span class="jxr_string">"file:///C:/Documents%20and%20Settings/target"</span> ).toString() );
+<a class="jxr_linenumber" name="L182" href="#L182">182</a>
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file://C:/Documents%20and%20Settings/"</span>, <span class="jxr_string">"source"</span> );
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> assertEquals( <span class="jxr_string">"../source"</span>,
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> oldPath.rebaseLink( <span class="jxr_string">"file://C:/Documents%20and%20Settings/target"</span> ).toString() );
+<a class="jxr_linenumber" name="L186" href="#L186">186</a>
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> oldPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:/C:/Documents%20and%20Settings/"</span>, <span class="jxr_string">"source"</span> );
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> assertEquals( <span class="jxr_string">"../source"</span>,
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> oldPath.rebaseLink( <span class="jxr_string">"file:/C:/Documents%20and%20Settings/target"</span> ).toString() );
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> }
+<a class="jxr_linenumber" name="L191" href="#L191">191</a>
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> <em class="jxr_javadoccomment"> * Test of relativizeLink method, of class URIPathDescriptor.</em>
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> @Test
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRelativizeLink()
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> {
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> URIPathDescriptor path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"source"</span> );
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> assertEquals( <span class="jxr_string">"source"</span>, path.relativizeLink().toString() );
+<a class="jxr_linenumber" name="L200" href="#L200">200</a>
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"http://maven.apache.org/source"</span> );
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> assertEquals( <span class="jxr_string">"source"</span>, path.relativizeLink().toString() );
+<a class="jxr_linenumber" name="L203" href="#L203">203</a>
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"http://maven.apache.org/"</span> );
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> assertEquals( <span class="jxr_string">"./"</span>, path.relativizeLink().toString() );
<a class="jxr_linenumber" name="L206" href="#L206">206</a>
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"http://maven.apache.org/source"</span> );
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> assertEquals( <span class="jxr_string">"source"</span>, path.relativizeLink().toString() );
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"http://maven.apache.org"</span> );
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> assertEquals( <span class="jxr_string">"./"</span>, path.relativizeLink().toString() );
<a class="jxr_linenumber" name="L209" href="#L209">209</a>
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"http://maven.apache.org/"</span> );
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://maven.apache.org"</span>, BASE_URL );
<a class="jxr_linenumber" name="L211" href="#L211">211</a> assertEquals( <span class="jxr_string">"./"</span>, path.relativizeLink().toString() );
<a class="jxr_linenumber" name="L212" href="#L212">212</a>
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"http://maven.apache.org"</span> );
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://maven.apache.org"</span>, <span class="jxr_string">"http://maven.apache.org"</span> );
<a class="jxr_linenumber" name="L214" href="#L214">214</a> assertEquals( <span class="jxr_string">"./"</span>, path.relativizeLink().toString() );
<a class="jxr_linenumber" name="L215" href="#L215">215</a>
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://maven.apache.org"</span>, BASE_URL );
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> assertEquals( <span class="jxr_string">"./"</span>, path.relativizeLink().toString() );
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://maven.apache.org/doxia/"</span>, <span class="jxr_string">"http://maven.apache.org/source/"</span> );
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> assertEquals( <span class="jxr_string">"../source/"</span>, path.relativizeLink().toString() );
<a class="jxr_linenumber" name="L218" href="#L218">218</a>
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://maven.apache.org"</span>, <span class="jxr_string">"http://maven.apache.org"</span> );
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> assertEquals( <span class="jxr_string">"./"</span>, path.relativizeLink().toString() );
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://maven.apache.org/doxia"</span>, <span class="jxr_string">"http://maven.apache.org/source"</span> );
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> assertEquals( <span class="jxr_string">"../source"</span>, path.relativizeLink().toString() );
<a class="jxr_linenumber" name="L221" href="#L221">221</a>
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://maven.apache.org/doxia/"</span>, <span class="jxr_string">"http://maven.apache.org/source/"</span> );
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> assertEquals( <span class="jxr_string">"../source/"</span>, path.relativizeLink().toString() );
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"http://maven.apache.org/index.html"</span> );
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> assertEquals( <span class="jxr_string">"index.html"</span>, path.relativizeLink().toString() );
<a class="jxr_linenumber" name="L224" href="#L224">224</a>
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http://maven.apache.org/doxia"</span>, <span class="jxr_string">"http://maven.apache.org/source"</span> );
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> assertEquals( <span class="jxr_string">"../source"</span>, path.relativizeLink().toString() );
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"http://maven.apache.org/index.html?var=foo&amp;var2=bar"</span> );
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> assertEquals( <span class="jxr_string">"index.html?var=foo&amp;var2=bar"</span>, path.relativizeLink().toString() );
<a class="jxr_linenumber" name="L227" href="#L227">227</a>
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"http://maven.apache.org/index.html"</span> );
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:////Users/"</span>, <span class="jxr_string">"index.html"</span> );
<a class="jxr_linenumber" name="L229" href="#L229">229</a> assertEquals( <span class="jxr_string">"index.html"</span>, path.relativizeLink().toString() );
<a class="jxr_linenumber" name="L230" href="#L230">230</a>
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"http://maven.apache.org/index.html?var=foo&amp;var2=bar"</span> );
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> assertEquals( <span class="jxr_string">"index.html?var=foo&amp;var2=bar"</span>, path.relativizeLink().toString() );
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:///C:/Documents%20and%20Settings/"</span>, <span class="jxr_string">"index.html"</span> );
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> assertEquals( <span class="jxr_string">"index.html"</span>, path.relativizeLink().toString() );
<a class="jxr_linenumber" name="L233" href="#L233">233</a>
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:////Users/"</span>, <span class="jxr_string">"index.html"</span> );
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file://C:/Documents%20and%20Settings/"</span>, <span class="jxr_string">"index.html"</span> );
<a class="jxr_linenumber" name="L235" href="#L235">235</a> assertEquals( <span class="jxr_string">"index.html"</span>, path.relativizeLink().toString() );
<a class="jxr_linenumber" name="L236" href="#L236">236</a>
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:///C:/Documents%20and%20Settings/"</span>, <span class="jxr_string">"index.html"</span> );
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:/C:/Documents%20and%20Settings/"</span>, <span class="jxr_string">"index.html"</span> );
<a class="jxr_linenumber" name="L238" href="#L238">238</a> assertEquals( <span class="jxr_string">"index.html"</span>, path.relativizeLink().toString() );
-<a class="jxr_linenumber" name="L239" href="#L239">239</a>
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file://C:/Documents%20and%20Settings/"</span>, <span class="jxr_string">"index.html"</span> );
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> assertEquals( <span class="jxr_string">"index.html"</span>, path.relativizeLink().toString() );
-<a class="jxr_linenumber" name="L242" href="#L242">242</a>
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:/C:/Documents%20and%20Settings/"</span>, <span class="jxr_string">"index.html"</span> );
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> assertEquals( <span class="jxr_string">"index.html"</span>, path.relativizeLink().toString() );
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> }
-<a class="jxr_linenumber" name="L246" href="#L246">246</a>
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> <em class="jxr_javadoccomment"> * Test of sameSite method, of class URIPathDescriptor.</em>
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> <em class="jxr_javadoccomment"> * @throws Exception</em>
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> @Test
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSameSite()
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> {
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> <strong class="jxr_keyword">final</strong> URIPathDescriptor path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"doxia"</span> );
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> }
+<a class="jxr_linenumber" name="L240" href="#L240">240</a>
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> <em class="jxr_javadoccomment"> * Test of sameSite method, of class URIPathDescriptor.</em>
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> <em class="jxr_javadoccomment"> * @throws Exception</em>
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> @Test
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSameSite()
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> {
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> <strong class="jxr_keyword">final</strong> URIPathDescriptor path = <strong class="jxr_keyword">new</strong> URIPathDescriptor( BASE_URL, <span class="jxr_string">"doxia"</span> );
+<a class="jxr_linenumber" name="L251" href="#L251">251</a>
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> assertTrue( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http://maven.apache.org/"</span> ) ) );
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> assertTrue( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http://maven.apache.org"</span> ) ) );
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> assertTrue( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"HTTP://maven.apache.org/"</span> ) ) );
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> assertTrue( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http://MAVEN.apache.org/"</span> ) ) );
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> assertTrue( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http://maven.apache.org/wagon/index.html"</span> ) ) );
<a class="jxr_linenumber" name="L257" href="#L257">257</a>
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> assertTrue( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http://maven.apache.org/"</span> ) ) );
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> assertTrue( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http://maven.apache.org"</span> ) ) );
-<a class="jxr_linenumber" name="L260" href="#L260">260</a> assertTrue( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"HTTP://maven.apache.org/"</span> ) ) );
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> assertTrue( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http://MAVEN.apache.org/"</span> ) ) );
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> assertTrue( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http://maven.apache.org/wagon/index.html"</span> ) ) );
-<a class="jxr_linenumber" name="L263" href="#L263">263</a>
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> assertFalse( path.sameSite( <strong class="jxr_keyword">null</strong> ) );
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> assertFalse( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"https://maven.apache.org/"</span> ) ) );
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> assertFalse( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http://ant.apache.org/"</span> ) ) );
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> assertFalse( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http://maven.apache.org:80"</span> ) ) );
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> assertFalse( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"/usr/share/bin/"</span> ) ) );
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> assertFalse( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http:///maven.apache.org/"</span> ) ) );
-<a class="jxr_linenumber" name="L270" href="#L270">270</a>
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> <strong class="jxr_keyword">final</strong> URIPathDescriptor nullHost = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http:///maven.apache.org/"</span>, <span class="jxr_string">"doxia"</span> );
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> assertTrue( nullHost.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http:///maven.apache.org/"</span> ) ) );
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> assertFalse( nullHost.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http://maven.apache.org/"</span> ) ) );
-<a class="jxr_linenumber" name="L274" href="#L274">274</a>
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> URIPathDescriptor newPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:///C:/Documents%20and%20Settings/"</span>, <span class="jxr_string">"source"</span> );
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> assertTrue( newPath.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"file:///C:/Documents%20and%20Settings/"</span> ) ) );
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> assertFalse( newPath.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"file://C:/Documents%20and%20Settings/"</span> ) ) );
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> <em class="jxr_comment">// authority is empty</em>
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> assertTrue( newPath.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"file:/C:/Documents%20and%20Settings/"</span> ) ) );
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> }
-<a class="jxr_linenumber" name="L281" href="#L281">281</a>
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> assertFailure( <strong class="jxr_keyword">final</strong> String base, <strong class="jxr_keyword">final</strong> String link )
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> {
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> {
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> <strong class="jxr_keyword">final</strong> URIPathDescriptor test = <strong class="jxr_keyword">new</strong> URIPathDescriptor( base, link );
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> fail( <span class="jxr_string">"Should fail: "</span> + test.toString() );
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> }
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> <strong class="jxr_keyword">catch</strong> ( IllegalArgumentException ex )
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> {
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> assertNotNull( ex );
-<a class="jxr_linenumber" name="L292" href="#L292">292</a> }
-<a class="jxr_linenumber" name="L293" href="#L293">293</a> }
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> }
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> assertFalse( path.sameSite( <strong class="jxr_keyword">null</strong> ) );
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> assertFalse( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"https://maven.apache.org/"</span> ) ) );
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> assertFalse( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http://ant.apache.org/"</span> ) ) );
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> assertFalse( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http://maven.apache.org:80"</span> ) ) );
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> assertFalse( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"/usr/share/bin/"</span> ) ) );
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> assertFalse( path.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http:///maven.apache.org/"</span> ) ) );
+<a class="jxr_linenumber" name="L264" href="#L264">264</a>
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> <strong class="jxr_keyword">final</strong> URIPathDescriptor nullHost = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"http:///maven.apache.org/"</span>, <span class="jxr_string">"doxia"</span> );
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> assertTrue( nullHost.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http:///maven.apache.org/"</span> ) ) );
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> assertFalse( nullHost.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"http://maven.apache.org/"</span> ) ) );
+<a class="jxr_linenumber" name="L268" href="#L268">268</a>
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> URIPathDescriptor newPath = <strong class="jxr_keyword">new</strong> URIPathDescriptor( <span class="jxr_string">"file:///C:/Documents%20and%20Settings/"</span>, <span class="jxr_string">"source"</span> );
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> assertTrue( newPath.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"file:///C:/Documents%20and%20Settings/"</span> ) ) );
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> assertFalse( newPath.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"file://C:/Documents%20and%20Settings/"</span> ) ) );
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> <em class="jxr_comment">// authority is empty</em>
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> assertTrue( newPath.sameSite( <strong class="jxr_keyword">new</strong> URI( <span class="jxr_string">"file:/C:/Documents%20and%20Settings/"</span> ) ) );
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> }
+<a class="jxr_linenumber" name="L275" href="#L275">275</a>
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2005–2022 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
Modified: maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/inheritance/package-frame.html
==============================================================================
--- maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/inheritance/package-frame.html (original)
+++ maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/inheritance/package-frame.html Thu Feb 17 14:02:12 2022
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Doxia Sitetools :: Decoration Model 2.0.0-M1 Reference Package org.apache.maven.doxia.site.decoration.inheritance</title>
+ <title>Doxia Sitetools :: Decoration Model 2.0.0-M2 Reference Package org.apache.maven.doxia.site.decoration.inheritance</title>
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/inheritance/package-summary.html
==============================================================================
--- maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/inheritance/package-summary.html (original)
+++ maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/inheritance/package-summary.html Thu Feb 17 14:02:12 2022
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Doxia Sitetools :: Decoration Model 2.0.0-M1 Reference Package org.apache.maven.doxia.site.decoration.inheritance</title>
+ <title>Doxia Sitetools :: Decoration Model 2.0.0-M2 Reference Package org.apache.maven.doxia.site.decoration.inheritance</title>
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/package-frame.html
==============================================================================
--- maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/package-frame.html (original)
+++ maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/package-frame.html Thu Feb 17 14:02:12 2022
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Doxia Sitetools :: Decoration Model 2.0.0-M1 Reference Package org.apache.maven.doxia.site.decoration</title>
+ <title>Doxia Sitetools :: Decoration Model 2.0.0-M2 Reference Package org.apache.maven.doxia.site.decoration</title>
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/package-summary.html
==============================================================================
--- maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/package-summary.html (original)
+++ maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/org/apache/maven/doxia/site/decoration/package-summary.html Thu Feb 17 14:02:12 2022
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Doxia Sitetools :: Decoration Model 2.0.0-M1 Reference Package org.apache.maven.doxia.site.decoration</title>
+ <title>Doxia Sitetools :: Decoration Model 2.0.0-M2 Reference Package org.apache.maven.doxia.site.decoration</title>
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/overview-frame.html
==============================================================================
--- maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/overview-frame.html (original)
+++ maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/overview-frame.html Thu Feb 17 14:02:12 2022
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Doxia Sitetools :: Decoration Model 2.0.0-M1 Reference</title>
+ <title>Doxia Sitetools :: Decoration Model 2.0.0-M2 Reference</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
</head>
<body>
Modified: maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/overview-summary.html
==============================================================================
--- maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/overview-summary.html (original)
+++ maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref-test/overview-summary.html Thu Feb 17 14:02:12 2022
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Doxia Sitetools :: Decoration Model 2.0.0-M1 Reference</title>
+ <title>Doxia Sitetools :: Decoration Model 2.0.0-M2 Reference</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
</head>
<body>
@@ -24,7 +24,7 @@
</ul>
</div>
- <h2>Doxia Sitetools :: Decoration Model 2.0.0-M1 Reference</h2>
+ <h2>Doxia Sitetools :: Decoration Model 2.0.0-M2 Reference</h2>
<table class="summary">
<thead>
Modified: maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/index.html
==============================================================================
--- maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/index.html (original)
+++ maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/index.html Thu Feb 17 14:02:12 2022
@@ -4,7 +4,7 @@
<!-- this is a JXR report set -->
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Doxia Sitetools :: Decoration Model 2.0.0-M1 Reference</title>
+ <title>Doxia Sitetools :: Decoration Model 2.0.0-M2 Reference</title>
</head>
<frameset cols="20%,80%">
<frameset rows="30%,70%">
Modified: maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.html
==============================================================================
--- maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.html (original)
+++ maven/doxia/website/components/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.html Thu Feb 17 14:02:12 2022
@@ -36,48 +36,45 @@
<a class="jxr_linenumber" name="L28" href="#L28">28</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">interface</strong> <a href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.html">DecorationModelInheritanceAssembler</a>
<a class="jxr_linenumber" name="L30" href="#L30">30</a> {
-<a class="jxr_linenumber" name="L31" href="#L31">31</a> <em class="jxr_javadoccomment">/** Plexus lookup role. */</em>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> String ROLE = DecorationModelInheritanceAssembler.<strong class="jxr_keyword">class</strong>.getName();
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>
-<a class="jxr_linenumber" name="L34" href="#L34">34</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <em class="jxr_javadoccomment"> * Manage inheritance of the decoration model between a parent and child.</em>
+<a class="jxr_linenumber" name="L31" href="#L31">31</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L32" href="#L32">32</a> <em class="jxr_javadoccomment"> * Manage inheritance of the decoration model between a parent and child.</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L34" href="#L34">34</a> <em class="jxr_javadoccomment"> * Any relative links in the parent model will be re-based to work from the merged child</em>
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <em class="jxr_javadoccomment"> * model, otherwise no content from either the parent or child model should be modified.</em>
<a class="jxr_linenumber" name="L36" href="#L36">36</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a> <em class="jxr_javadoccomment"> * Any relative links in the parent model will be re-based to work from the merged child</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> * model, otherwise no content from either the parent or child model should be modified.</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <em class="jxr_javadoccomment"> * @param name a name, used for breadcrumb.</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <em class="jxr_javadoccomment"> * If the parent model contains breadcrumbs and the child doesn't,</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <em class="jxr_javadoccomment"> * a child breadcrumb will be added to the merged model with this name. Not null.</em>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <em class="jxr_javadoccomment"> * @param child the child DecorationModel to be merged with parent.</em>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> <em class="jxr_javadoccomment"> * Not null. If parent == null, the child is unchanged, otherwise</em>
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <em class="jxr_javadoccomment"> * child will contain the merged model upon exit.</em>
-<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em class="jxr_javadoccomment"> * @param parent the parent DecorationModel. Unchanged upon exit.</em>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> <em class="jxr_javadoccomment"> * May be null in which case the child is not changed.</em>
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <em class="jxr_javadoccomment"> * @param childBaseUrl the child base URL.</em>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a> <em class="jxr_javadoccomment"> * @param name a name, used for breadcrumb.</em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> * If the parent model contains breadcrumbs and the child doesn't,</em>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> <em class="jxr_javadoccomment"> * a child breadcrumb will be added to the merged model with this name. Not null.</em>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a> <em class="jxr_javadoccomment"> * @param child the child DecorationModel to be merged with parent.</em>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <em class="jxr_javadoccomment"> * Not null. If parent == null, the child is unchanged, otherwise</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <em class="jxr_javadoccomment"> * child will contain the merged model upon exit.</em>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <em class="jxr_javadoccomment"> * @param parent the parent DecorationModel. Unchanged upon exit.</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <em class="jxr_javadoccomment"> * May be null in which case the child is not changed.</em>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> <em class="jxr_javadoccomment"> * @param childBaseUrl the child base URL.</em>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em class="jxr_javadoccomment"> * May be null, in which case relative links inherited from the parent</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <em class="jxr_javadoccomment"> * will not be resolved in the merged child.</em>
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> <em class="jxr_javadoccomment"> * @param parentBaseUrl the parent base URL.</em>
<a class="jxr_linenumber" name="L49" href="#L49">49</a> <em class="jxr_javadoccomment"> * May be null, in which case relative links inherited from the parent</em>
<a class="jxr_linenumber" name="L50" href="#L50">50</a> <em class="jxr_javadoccomment"> * will not be resolved in the merged child.</em>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em class="jxr_javadoccomment"> * @param parentBaseUrl the parent base URL.</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <em class="jxr_javadoccomment"> * May be null, in which case relative links inherited from the parent</em>
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <em class="jxr_javadoccomment"> * will not be resolved in the merged child.</em>
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">void</strong> assembleModelInheritance( String name, DecorationModel child, DecorationModel parent,
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> String childBaseUrl, String parentBaseUrl );
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em class="jxr_javadoccomment"> * Resolve relative paths for a DecorationModel given a base URL.</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <em class="jxr_javadoccomment"> * Note that 'resolve' here means 'relativize' in the sense of</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> <em class="jxr_javadoccomment"> * {@link java.net.URI#relativize(java.net.URI)}, ie if any link in the decoration model</em>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <em class="jxr_javadoccomment"> * has a base URL that is equal to the given baseUrl, it is replaced by a relative link</em>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> <em class="jxr_javadoccomment"> * with respect to that base.</em>
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> <em class="jxr_javadoccomment"> * @param decoration the DecorationModel.</em>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> <em class="jxr_javadoccomment"> * Not null.</em>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a> <em class="jxr_javadoccomment"> * @param baseUrl the base URL.</em>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> <em class="jxr_javadoccomment"> * May be null in which case the decoration model is unchanged.</em>
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong class="jxr_keyword">void</strong> resolvePaths( DecorationModel decoration, String baseUrl );
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> }
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">void</strong> assembleModelInheritance( String name, DecorationModel child, DecorationModel parent,
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> String childBaseUrl, String parentBaseUrl );
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> <em class="jxr_javadoccomment"> * Resolve relative paths for a DecorationModel given a base URL.</em>
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L58" href="#L58">58</a> <em class="jxr_javadoccomment"> * Note that 'resolve' here means 'relativize' in the sense of</em>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em class="jxr_javadoccomment"> * {@link java.net.URI#relativize(java.net.URI)}, ie if any link in the decoration model</em>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em class="jxr_javadoccomment"> * has a base URL that is equal to the given baseUrl, it is replaced by a relative link</em>
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> <em class="jxr_javadoccomment"> * with respect to that base.</em>
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> <em class="jxr_javadoccomment"> * @param decoration the DecorationModel.</em>
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> <em class="jxr_javadoccomment"> * Not null.</em>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> <em class="jxr_javadoccomment"> * @param baseUrl the base URL.</em>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a> <em class="jxr_javadoccomment"> * May be null in which case the decoration model is unchanged.</em>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">void</strong> resolvePaths( DecorationModel decoration, String baseUrl );
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2005–2022 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>