logging-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carn...@apache.org
Subject svn commit: r569257 [10/18] - in /logging/site/trunk/docs/log4j/companions/extras: ./ apidocs/ apidocs/org/apache/log4j/ apidocs/org/apache/log4j/class-use/ apidocs/org/apache/log4j/extras/ apidocs/org/apache/log4j/extras/class-use/ apidocs/org/apache/...
Date Fri, 24 Aug 2007 05:43:56 GMT
Modified: logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/pattern/NameAbbreviatorTest.html
URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/pattern/NameAbbreviatorTest.html?rev=569257&r1=569256&r2=569257&view=diff
==============================================================================
--- logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/pattern/NameAbbreviatorTest.html (original)
+++ logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/pattern/NameAbbreviatorTest.html Thu Aug 23 22:43:39 2007
@@ -33,284 +33,283 @@
 <a name="24" href="#24">24</a>  <em> * Tests for NameAbbrevator.</em>
 <a name="25" href="#25">25</a>  <em> *</em>
 <a name="26" href="#26">26</a>  <em> * @author Curt Arnold</em>
-<a name="27" href="#27">27</a>  <em> * @since 1.3</em>
-<a name="28" href="#28">28</a>  <em> *</em>
-<a name="29" href="#29">29</a>  <em> */</em>
-<a name="30" href="#30">30</a>  <strong>public</strong> <strong>class</strong> <a href="../../../../org/apache/log4j/pattern/NameAbbreviatorTest.html">NameAbbreviatorTest</a> <strong>extends</strong> TestCase {
-<a name="31" href="#31">31</a>    <em>/**<em>*</em></em>
-<a name="32" href="#32">32</a>  <em>   * Create a new instance.</em>
-<a name="33" href="#33">33</a>  <em>   *</em>
-<a name="34" href="#34">34</a>  <em>   * @param name test name</em>
-<a name="35" href="#35">35</a>  <em>   */</em>
-<a name="36" href="#36">36</a>    <strong>public</strong> <a href="../../../../org/apache/log4j/pattern/NameAbbreviatorTest.html">NameAbbreviatorTest</a>(<strong>final</strong> String name) {
-<a name="37" href="#37">37</a>      <strong>super</strong>(name);
-<a name="38" href="#38">38</a>    }
-<a name="39" href="#39">39</a>  
-<a name="40" href="#40">40</a>    <em>/**<em>*</em></em>
-<a name="41" href="#41">41</a>  <em>   * Check that getDefaultAbbreviator does not return null.</em>
-<a name="42" href="#42">42</a>  <em>   *</em>
-<a name="43" href="#43">43</a>  <em>   */</em>
-<a name="44" href="#44">44</a>    <strong>public</strong> <strong>void</strong> testGetDefault() {
-<a name="45" href="#45">45</a>      NameAbbreviator abbrev = NameAbbreviator.getDefaultAbbreviator();
-<a name="46" href="#46">46</a>      assertNotNull(abbrev);
-<a name="47" href="#47">47</a>    }
-<a name="48" href="#48">48</a>  
-<a name="49" href="#49">49</a>    <em>/**<em>*</em></em>
-<a name="50" href="#50">50</a>  <em>   * Check that "0" drops all name content.</em>
-<a name="51" href="#51">51</a>  <em>   *</em>
-<a name="52" href="#52">52</a>  <em>   */</em>
-<a name="53" href="#53">53</a>    <strong>public</strong> <strong>void</strong> testZero() {
-<a name="54" href="#54">54</a>      NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">"0"</span>);
-<a name="55" href="#55">55</a>      StringBuffer buf = <strong>new</strong> StringBuffer(<span class="string">"DEBUG - "</span>);
-<a name="56" href="#56">56</a>      <strong>int</strong> fieldStart = buf.length();
-<a name="57" href="#57">57</a>      buf.append(<span class="string">"org.example.foo.bar"</span>);
-<a name="58" href="#58">58</a>      abbrev.abbreviate(fieldStart, buf);
-<a name="59" href="#59">59</a>      assertEquals(<span class="string">"DEBUG - "</span>, buf.toString());
-<a name="60" href="#60">60</a>    }
-<a name="61" href="#61">61</a>  
-<a name="62" href="#62">62</a>    <em>/**<em>*</em></em>
-<a name="63" href="#63">63</a>  <em>   * Check that getAbbreviator(" ") returns default abbreviator.</em>
-<a name="64" href="#64">64</a>  <em>   *</em>
-<a name="65" href="#65">65</a>  <em>   */</em>
-<a name="66" href="#66">66</a>    <strong>public</strong> <strong>void</strong> testBlank() {
-<a name="67" href="#67">67</a>      NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">"   "</span>);
-<a name="68" href="#68">68</a>      NameAbbreviator defaultAbbrev = NameAbbreviator.getDefaultAbbreviator();
-<a name="69" href="#69">69</a>      assertTrue(abbrev == defaultAbbrev);
-<a name="70" href="#70">70</a>    }
-<a name="71" href="#71">71</a>  
-<a name="72" href="#72">72</a>    <em>/**<em>*</em></em>
-<a name="73" href="#73">73</a>  <em>   * Check that getAbbreviator("1").abbreviate() drops all but the final name element.</em>
-<a name="74" href="#74">74</a>  <em>   *</em>
-<a name="75" href="#75">75</a>  <em>   */</em>
-<a name="76" href="#76">76</a>    <strong>public</strong> <strong>void</strong> testOne() {
-<a name="77" href="#77">77</a>      NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">"1"</span>);
-<a name="78" href="#78">78</a>      StringBuffer buf = <strong>new</strong> StringBuffer(<span class="string">"DEBUG - "</span>);
-<a name="79" href="#79">79</a>      <strong>int</strong> fieldStart = buf.length();
-<a name="80" href="#80">80</a>      buf.append(<span class="string">"org.example.foo.bar"</span>);
-<a name="81" href="#81">81</a>      abbrev.abbreviate(fieldStart, buf);
-<a name="82" href="#82">82</a>      assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
-<a name="83" href="#83">83</a>  
-<a name="84" href="#84">84</a>      buf.setLength(0);
-<a name="85" href="#85">85</a>      buf.append(<span class="string">"DEBUG - "</span>);
-<a name="86" href="#86">86</a>      fieldStart = buf.length();
-<a name="87" href="#87">87</a>      buf.append(<span class="string">"bar"</span>);
-<a name="88" href="#88">88</a>      abbrev.abbreviate(fieldStart, buf);
-<a name="89" href="#89">89</a>      assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
-<a name="90" href="#90">90</a>  
-<a name="91" href="#91">91</a>      buf.setLength(0);
-<a name="92" href="#92">92</a>      buf.append(<span class="string">"DEBUG - "</span>);
-<a name="93" href="#93">93</a>      fieldStart = buf.length();
-<a name="94" href="#94">94</a>      abbrev.abbreviate(fieldStart, buf);
-<a name="95" href="#95">95</a>      assertEquals(<span class="string">"DEBUG - "</span>, buf.toString());
-<a name="96" href="#96">96</a>    }
-<a name="97" href="#97">97</a>  
-<a name="98" href="#98">98</a>    <em>/**<em>*</em></em>
-<a name="99" href="#99">99</a>  <em>   * Check that blanks are trimmed in evaluating abbreviation pattern.</em>
-<a name="100" href="#100">100</a> <em>   */</em>
-<a name="101" href="#101">101</a>   <strong>public</strong> <strong>void</strong> testBlankOne() {
-<a name="102" href="#102">102</a>     NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">" 1 "</span>);
-<a name="103" href="#103">103</a>     StringBuffer buf = <strong>new</strong> StringBuffer(<span class="string">"DEBUG - "</span>);
-<a name="104" href="#104">104</a>     <strong>int</strong> fieldStart = buf.length();
-<a name="105" href="#105">105</a>     buf.append(<span class="string">"org.example.foo.bar"</span>);
-<a name="106" href="#106">106</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="107" href="#107">107</a>     assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
-<a name="108" href="#108">108</a> 
-<a name="109" href="#109">109</a>     buf.setLength(0);
-<a name="110" href="#110">110</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="111" href="#111">111</a>     fieldStart = buf.length();
-<a name="112" href="#112">112</a>     buf.append(<span class="string">"bar"</span>);
-<a name="113" href="#113">113</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="114" href="#114">114</a>     assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
-<a name="115" href="#115">115</a> 
-<a name="116" href="#116">116</a>     buf.setLength(0);
-<a name="117" href="#117">117</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="118" href="#118">118</a>     fieldStart = buf.length();
-<a name="119" href="#119">119</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="120" href="#120">120</a>     assertEquals(<span class="string">"DEBUG - "</span>, buf.toString());
-<a name="121" href="#121">121</a>   }
-<a name="122" href="#122">122</a> 
-<a name="123" href="#123">123</a>   <em>/**<em>*</em></em>
-<a name="124" href="#124">124</a> <em>   * Check that getAbbreviator("2").abbreviate drops all but the last two elements.</em>
-<a name="125" href="#125">125</a> <em>   *</em>
-<a name="126" href="#126">126</a> <em>   */</em>
-<a name="127" href="#127">127</a>   <strong>public</strong> <strong>void</strong> testTwo() {
-<a name="128" href="#128">128</a>     NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">"2"</span>);
-<a name="129" href="#129">129</a>     StringBuffer buf = <strong>new</strong> StringBuffer(<span class="string">"DEBUG - "</span>);
-<a name="130" href="#130">130</a>     <strong>int</strong> fieldStart = buf.length();
-<a name="131" href="#131">131</a>     buf.append(<span class="string">"org.example.foo.bar"</span>);
-<a name="132" href="#132">132</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="133" href="#133">133</a>     assertEquals(<span class="string">"DEBUG - foo.bar"</span>, buf.toString());
-<a name="134" href="#134">134</a> 
-<a name="135" href="#135">135</a>     buf.setLength(0);
-<a name="136" href="#136">136</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="137" href="#137">137</a>     fieldStart = buf.length();
-<a name="138" href="#138">138</a>     buf.append(<span class="string">"foo.bar"</span>);
-<a name="139" href="#139">139</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="140" href="#140">140</a>     assertEquals(<span class="string">"DEBUG - foo.bar"</span>, buf.toString());
-<a name="141" href="#141">141</a> 
-<a name="142" href="#142">142</a>     buf.setLength(0);
-<a name="143" href="#143">143</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="144" href="#144">144</a>     fieldStart = buf.length();
-<a name="145" href="#145">145</a>     buf.append(<span class="string">"bar"</span>);
-<a name="146" href="#146">146</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="147" href="#147">147</a>     assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
-<a name="148" href="#148">148</a>   }
-<a name="149" href="#149">149</a> 
-<a name="150" href="#150">150</a>   <em>/**<em>*</em></em>
-<a name="151" href="#151">151</a> <em>   * Check that getAbbreviator("1.").abbreviate abbreviates non-final elements</em>
-<a name="152" href="#152">152</a> <em>   * to one character.</em>
-<a name="153" href="#153">153</a> <em>   *</em>
-<a name="154" href="#154">154</a> <em>   */</em>
-<a name="155" href="#155">155</a>   <strong>public</strong> <strong>void</strong> testOneDot() {
-<a name="156" href="#156">156</a>     NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">"1."</span>);
-<a name="157" href="#157">157</a>     StringBuffer buf = <strong>new</strong> StringBuffer(<span class="string">"DEBUG - "</span>);
-<a name="158" href="#158">158</a>     <strong>int</strong> fieldStart = buf.length();
-<a name="159" href="#159">159</a>     buf.append(<span class="string">"org.example.foo.bar"</span>);
-<a name="160" href="#160">160</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="161" href="#161">161</a>     assertEquals(<span class="string">"DEBUG - o.e.f.bar"</span>, buf.toString());
-<a name="162" href="#162">162</a> 
-<a name="163" href="#163">163</a>     buf.setLength(0);
-<a name="164" href="#164">164</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="165" href="#165">165</a>     fieldStart = buf.length();
-<a name="166" href="#166">166</a>     buf.append(<span class="string">"org.example.foo."</span>);
-<a name="167" href="#167">167</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="168" href="#168">168</a>     assertEquals(<span class="string">"DEBUG - o.e.f."</span>, buf.toString());
+<a name="27" href="#27">27</a>  <em> *</em>
+<a name="28" href="#28">28</a>  <em> */</em>
+<a name="29" href="#29">29</a>  <strong>public</strong> <strong>class</strong> <a href="../../../../org/apache/log4j/pattern/NameAbbreviatorTest.html">NameAbbreviatorTest</a> <strong>extends</strong> TestCase {
+<a name="30" href="#30">30</a>    <em>/**<em>*</em></em>
+<a name="31" href="#31">31</a>  <em>   * Create a new instance.</em>
+<a name="32" href="#32">32</a>  <em>   *</em>
+<a name="33" href="#33">33</a>  <em>   * @param name test name</em>
+<a name="34" href="#34">34</a>  <em>   */</em>
+<a name="35" href="#35">35</a>    <strong>public</strong> <a href="../../../../org/apache/log4j/pattern/NameAbbreviatorTest.html">NameAbbreviatorTest</a>(<strong>final</strong> String name) {
+<a name="36" href="#36">36</a>      <strong>super</strong>(name);
+<a name="37" href="#37">37</a>    }
+<a name="38" href="#38">38</a>  
+<a name="39" href="#39">39</a>    <em>/**<em>*</em></em>
+<a name="40" href="#40">40</a>  <em>   * Check that getDefaultAbbreviator does not return null.</em>
+<a name="41" href="#41">41</a>  <em>   *</em>
+<a name="42" href="#42">42</a>  <em>   */</em>
+<a name="43" href="#43">43</a>    <strong>public</strong> <strong>void</strong> testGetDefault() {
+<a name="44" href="#44">44</a>      NameAbbreviator abbrev = NameAbbreviator.getDefaultAbbreviator();
+<a name="45" href="#45">45</a>      assertNotNull(abbrev);
+<a name="46" href="#46">46</a>    }
+<a name="47" href="#47">47</a>  
+<a name="48" href="#48">48</a>    <em>/**<em>*</em></em>
+<a name="49" href="#49">49</a>  <em>   * Check that "0" drops all name content.</em>
+<a name="50" href="#50">50</a>  <em>   *</em>
+<a name="51" href="#51">51</a>  <em>   */</em>
+<a name="52" href="#52">52</a>    <strong>public</strong> <strong>void</strong> testZero() {
+<a name="53" href="#53">53</a>      NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">"0"</span>);
+<a name="54" href="#54">54</a>      StringBuffer buf = <strong>new</strong> StringBuffer(<span class="string">"DEBUG - "</span>);
+<a name="55" href="#55">55</a>      <strong>int</strong> fieldStart = buf.length();
+<a name="56" href="#56">56</a>      buf.append(<span class="string">"org.example.foo.bar"</span>);
+<a name="57" href="#57">57</a>      abbrev.abbreviate(fieldStart, buf);
+<a name="58" href="#58">58</a>      assertEquals(<span class="string">"DEBUG - "</span>, buf.toString());
+<a name="59" href="#59">59</a>    }
+<a name="60" href="#60">60</a>  
+<a name="61" href="#61">61</a>    <em>/**<em>*</em></em>
+<a name="62" href="#62">62</a>  <em>   * Check that getAbbreviator(" ") returns default abbreviator.</em>
+<a name="63" href="#63">63</a>  <em>   *</em>
+<a name="64" href="#64">64</a>  <em>   */</em>
+<a name="65" href="#65">65</a>    <strong>public</strong> <strong>void</strong> testBlank() {
+<a name="66" href="#66">66</a>      NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">"   "</span>);
+<a name="67" href="#67">67</a>      NameAbbreviator defaultAbbrev = NameAbbreviator.getDefaultAbbreviator();
+<a name="68" href="#68">68</a>      assertTrue(abbrev == defaultAbbrev);
+<a name="69" href="#69">69</a>    }
+<a name="70" href="#70">70</a>  
+<a name="71" href="#71">71</a>    <em>/**<em>*</em></em>
+<a name="72" href="#72">72</a>  <em>   * Check that getAbbreviator("1").abbreviate() drops all but the final name element.</em>
+<a name="73" href="#73">73</a>  <em>   *</em>
+<a name="74" href="#74">74</a>  <em>   */</em>
+<a name="75" href="#75">75</a>    <strong>public</strong> <strong>void</strong> testOne() {
+<a name="76" href="#76">76</a>      NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">"1"</span>);
+<a name="77" href="#77">77</a>      StringBuffer buf = <strong>new</strong> StringBuffer(<span class="string">"DEBUG - "</span>);
+<a name="78" href="#78">78</a>      <strong>int</strong> fieldStart = buf.length();
+<a name="79" href="#79">79</a>      buf.append(<span class="string">"org.example.foo.bar"</span>);
+<a name="80" href="#80">80</a>      abbrev.abbreviate(fieldStart, buf);
+<a name="81" href="#81">81</a>      assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
+<a name="82" href="#82">82</a>  
+<a name="83" href="#83">83</a>      buf.setLength(0);
+<a name="84" href="#84">84</a>      buf.append(<span class="string">"DEBUG - "</span>);
+<a name="85" href="#85">85</a>      fieldStart = buf.length();
+<a name="86" href="#86">86</a>      buf.append(<span class="string">"bar"</span>);
+<a name="87" href="#87">87</a>      abbrev.abbreviate(fieldStart, buf);
+<a name="88" href="#88">88</a>      assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
+<a name="89" href="#89">89</a>  
+<a name="90" href="#90">90</a>      buf.setLength(0);
+<a name="91" href="#91">91</a>      buf.append(<span class="string">"DEBUG - "</span>);
+<a name="92" href="#92">92</a>      fieldStart = buf.length();
+<a name="93" href="#93">93</a>      abbrev.abbreviate(fieldStart, buf);
+<a name="94" href="#94">94</a>      assertEquals(<span class="string">"DEBUG - "</span>, buf.toString());
+<a name="95" href="#95">95</a>    }
+<a name="96" href="#96">96</a>  
+<a name="97" href="#97">97</a>    <em>/**<em>*</em></em>
+<a name="98" href="#98">98</a>  <em>   * Check that blanks are trimmed in evaluating abbreviation pattern.</em>
+<a name="99" href="#99">99</a>  <em>   */</em>
+<a name="100" href="#100">100</a>   <strong>public</strong> <strong>void</strong> testBlankOne() {
+<a name="101" href="#101">101</a>     NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">" 1 "</span>);
+<a name="102" href="#102">102</a>     StringBuffer buf = <strong>new</strong> StringBuffer(<span class="string">"DEBUG - "</span>);
+<a name="103" href="#103">103</a>     <strong>int</strong> fieldStart = buf.length();
+<a name="104" href="#104">104</a>     buf.append(<span class="string">"org.example.foo.bar"</span>);
+<a name="105" href="#105">105</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="106" href="#106">106</a>     assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
+<a name="107" href="#107">107</a> 
+<a name="108" href="#108">108</a>     buf.setLength(0);
+<a name="109" href="#109">109</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="110" href="#110">110</a>     fieldStart = buf.length();
+<a name="111" href="#111">111</a>     buf.append(<span class="string">"bar"</span>);
+<a name="112" href="#112">112</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="113" href="#113">113</a>     assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
+<a name="114" href="#114">114</a> 
+<a name="115" href="#115">115</a>     buf.setLength(0);
+<a name="116" href="#116">116</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="117" href="#117">117</a>     fieldStart = buf.length();
+<a name="118" href="#118">118</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="119" href="#119">119</a>     assertEquals(<span class="string">"DEBUG - "</span>, buf.toString());
+<a name="120" href="#120">120</a>   }
+<a name="121" href="#121">121</a> 
+<a name="122" href="#122">122</a>   <em>/**<em>*</em></em>
+<a name="123" href="#123">123</a> <em>   * Check that getAbbreviator("2").abbreviate drops all but the last two elements.</em>
+<a name="124" href="#124">124</a> <em>   *</em>
+<a name="125" href="#125">125</a> <em>   */</em>
+<a name="126" href="#126">126</a>   <strong>public</strong> <strong>void</strong> testTwo() {
+<a name="127" href="#127">127</a>     NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">"2"</span>);
+<a name="128" href="#128">128</a>     StringBuffer buf = <strong>new</strong> StringBuffer(<span class="string">"DEBUG - "</span>);
+<a name="129" href="#129">129</a>     <strong>int</strong> fieldStart = buf.length();
+<a name="130" href="#130">130</a>     buf.append(<span class="string">"org.example.foo.bar"</span>);
+<a name="131" href="#131">131</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="132" href="#132">132</a>     assertEquals(<span class="string">"DEBUG - foo.bar"</span>, buf.toString());
+<a name="133" href="#133">133</a> 
+<a name="134" href="#134">134</a>     buf.setLength(0);
+<a name="135" href="#135">135</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="136" href="#136">136</a>     fieldStart = buf.length();
+<a name="137" href="#137">137</a>     buf.append(<span class="string">"foo.bar"</span>);
+<a name="138" href="#138">138</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="139" href="#139">139</a>     assertEquals(<span class="string">"DEBUG - foo.bar"</span>, buf.toString());
+<a name="140" href="#140">140</a> 
+<a name="141" href="#141">141</a>     buf.setLength(0);
+<a name="142" href="#142">142</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="143" href="#143">143</a>     fieldStart = buf.length();
+<a name="144" href="#144">144</a>     buf.append(<span class="string">"bar"</span>);
+<a name="145" href="#145">145</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="146" href="#146">146</a>     assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
+<a name="147" href="#147">147</a>   }
+<a name="148" href="#148">148</a> 
+<a name="149" href="#149">149</a>   <em>/**<em>*</em></em>
+<a name="150" href="#150">150</a> <em>   * Check that getAbbreviator("1.").abbreviate abbreviates non-final elements</em>
+<a name="151" href="#151">151</a> <em>   * to one character.</em>
+<a name="152" href="#152">152</a> <em>   *</em>
+<a name="153" href="#153">153</a> <em>   */</em>
+<a name="154" href="#154">154</a>   <strong>public</strong> <strong>void</strong> testOneDot() {
+<a name="155" href="#155">155</a>     NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">"1."</span>);
+<a name="156" href="#156">156</a>     StringBuffer buf = <strong>new</strong> StringBuffer(<span class="string">"DEBUG - "</span>);
+<a name="157" href="#157">157</a>     <strong>int</strong> fieldStart = buf.length();
+<a name="158" href="#158">158</a>     buf.append(<span class="string">"org.example.foo.bar"</span>);
+<a name="159" href="#159">159</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="160" href="#160">160</a>     assertEquals(<span class="string">"DEBUG - o.e.f.bar"</span>, buf.toString());
+<a name="161" href="#161">161</a> 
+<a name="162" href="#162">162</a>     buf.setLength(0);
+<a name="163" href="#163">163</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="164" href="#164">164</a>     fieldStart = buf.length();
+<a name="165" href="#165">165</a>     buf.append(<span class="string">"org.example.foo."</span>);
+<a name="166" href="#166">166</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="167" href="#167">167</a>     assertEquals(<span class="string">"DEBUG - o.e.f."</span>, buf.toString());
+<a name="168" href="#168">168</a> 
 <a name="169" href="#169">169</a> 
-<a name="170" href="#170">170</a> 
-<a name="171" href="#171">171</a>     buf.setLength(0);
-<a name="172" href="#172">172</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="173" href="#173">173</a>     fieldStart = buf.length();
-<a name="174" href="#174">174</a>     buf.append(<span class="string">"foo.bar"</span>);
-<a name="175" href="#175">175</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="176" href="#176">176</a>     assertEquals(<span class="string">"DEBUG - f.bar"</span>, buf.toString());
-<a name="177" href="#177">177</a> 
-<a name="178" href="#178">178</a>     buf.setLength(0);
-<a name="179" href="#179">179</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="180" href="#180">180</a>     fieldStart = buf.length();
-<a name="181" href="#181">181</a>     buf.append(<span class="string">"bar"</span>);
-<a name="182" href="#182">182</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="183" href="#183">183</a>     assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
-<a name="184" href="#184">184</a> 
-<a name="185" href="#185">185</a>     buf.setLength(0);
-<a name="186" href="#186">186</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="187" href="#187">187</a>     fieldStart = buf.length();
-<a name="188" href="#188">188</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="189" href="#189">189</a>     assertEquals(<span class="string">"DEBUG - "</span>, buf.toString());
-<a name="190" href="#190">190</a> 
-<a name="191" href="#191">191</a>     buf.setLength(0);
-<a name="192" href="#192">192</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="193" href="#193">193</a>     fieldStart = buf.length();
-<a name="194" href="#194">194</a>     buf.append(<span class="string">"."</span>);
-<a name="195" href="#195">195</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="196" href="#196">196</a>     assertEquals(<span class="string">"DEBUG - ."</span>, buf.toString());
-<a name="197" href="#197">197</a>   }
-<a name="198" href="#198">198</a> 
-<a name="199" href="#199">199</a>   <em>/**<em>*</em></em>
-<a name="200" href="#200">200</a> <em>   * Check that getAbbreviator("1~.").abbreviate abbreviates non-final elements</em>
-<a name="201" href="#201">201</a> <em>   * to one character and a tilde.</em>
-<a name="202" href="#202">202</a> <em>   *</em>
-<a name="203" href="#203">203</a> <em>   */</em>
-<a name="204" href="#204">204</a>   <strong>public</strong> <strong>void</strong> testOneTildeDot() {
-<a name="205" href="#205">205</a>     NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">"1~."</span>);
-<a name="206" href="#206">206</a>     StringBuffer buf = <strong>new</strong> StringBuffer(<span class="string">"DEBUG - "</span>);
-<a name="207" href="#207">207</a>     <strong>int</strong> fieldStart = buf.length();
-<a name="208" href="#208">208</a>     buf.append(<span class="string">"org.example.foo.bar"</span>);
-<a name="209" href="#209">209</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="210" href="#210">210</a>     assertEquals(<span class="string">"DEBUG - o~.e~.f~.bar"</span>, buf.toString());
-<a name="211" href="#211">211</a> 
-<a name="212" href="#212">212</a>     buf.setLength(0);
-<a name="213" href="#213">213</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="214" href="#214">214</a>     fieldStart = buf.length();
-<a name="215" href="#215">215</a>     buf.append(<span class="string">"org.example.foo."</span>);
-<a name="216" href="#216">216</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="217" href="#217">217</a>     assertEquals(<span class="string">"DEBUG - o~.e~.f~."</span>, buf.toString());
-<a name="218" href="#218">218</a> 
-<a name="219" href="#219">219</a>     buf.setLength(0);
-<a name="220" href="#220">220</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="221" href="#221">221</a>     fieldStart = buf.length();
-<a name="222" href="#222">222</a>     buf.append(<span class="string">"foo.bar"</span>);
-<a name="223" href="#223">223</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="224" href="#224">224</a>     assertEquals(<span class="string">"DEBUG - f~.bar"</span>, buf.toString());
-<a name="225" href="#225">225</a> 
-<a name="226" href="#226">226</a>     buf.setLength(0);
-<a name="227" href="#227">227</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="228" href="#228">228</a>     fieldStart = buf.length();
-<a name="229" href="#229">229</a>     buf.append(<span class="string">"bar"</span>);
-<a name="230" href="#230">230</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="231" href="#231">231</a>     assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
-<a name="232" href="#232">232</a> 
-<a name="233" href="#233">233</a>     buf.setLength(0);
-<a name="234" href="#234">234</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="235" href="#235">235</a>     fieldStart = buf.length();
-<a name="236" href="#236">236</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="237" href="#237">237</a>     assertEquals(<span class="string">"DEBUG - "</span>, buf.toString());
+<a name="170" href="#170">170</a>     buf.setLength(0);
+<a name="171" href="#171">171</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="172" href="#172">172</a>     fieldStart = buf.length();
+<a name="173" href="#173">173</a>     buf.append(<span class="string">"foo.bar"</span>);
+<a name="174" href="#174">174</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="175" href="#175">175</a>     assertEquals(<span class="string">"DEBUG - f.bar"</span>, buf.toString());
+<a name="176" href="#176">176</a> 
+<a name="177" href="#177">177</a>     buf.setLength(0);
+<a name="178" href="#178">178</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="179" href="#179">179</a>     fieldStart = buf.length();
+<a name="180" href="#180">180</a>     buf.append(<span class="string">"bar"</span>);
+<a name="181" href="#181">181</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="182" href="#182">182</a>     assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
+<a name="183" href="#183">183</a> 
+<a name="184" href="#184">184</a>     buf.setLength(0);
+<a name="185" href="#185">185</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="186" href="#186">186</a>     fieldStart = buf.length();
+<a name="187" href="#187">187</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="188" href="#188">188</a>     assertEquals(<span class="string">"DEBUG - "</span>, buf.toString());
+<a name="189" href="#189">189</a> 
+<a name="190" href="#190">190</a>     buf.setLength(0);
+<a name="191" href="#191">191</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="192" href="#192">192</a>     fieldStart = buf.length();
+<a name="193" href="#193">193</a>     buf.append(<span class="string">"."</span>);
+<a name="194" href="#194">194</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="195" href="#195">195</a>     assertEquals(<span class="string">"DEBUG - ."</span>, buf.toString());
+<a name="196" href="#196">196</a>   }
+<a name="197" href="#197">197</a> 
+<a name="198" href="#198">198</a>   <em>/**<em>*</em></em>
+<a name="199" href="#199">199</a> <em>   * Check that getAbbreviator("1~.").abbreviate abbreviates non-final elements</em>
+<a name="200" href="#200">200</a> <em>   * to one character and a tilde.</em>
+<a name="201" href="#201">201</a> <em>   *</em>
+<a name="202" href="#202">202</a> <em>   */</em>
+<a name="203" href="#203">203</a>   <strong>public</strong> <strong>void</strong> testOneTildeDot() {
+<a name="204" href="#204">204</a>     NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">"1~."</span>);
+<a name="205" href="#205">205</a>     StringBuffer buf = <strong>new</strong> StringBuffer(<span class="string">"DEBUG - "</span>);
+<a name="206" href="#206">206</a>     <strong>int</strong> fieldStart = buf.length();
+<a name="207" href="#207">207</a>     buf.append(<span class="string">"org.example.foo.bar"</span>);
+<a name="208" href="#208">208</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="209" href="#209">209</a>     assertEquals(<span class="string">"DEBUG - o~.e~.f~.bar"</span>, buf.toString());
+<a name="210" href="#210">210</a> 
+<a name="211" href="#211">211</a>     buf.setLength(0);
+<a name="212" href="#212">212</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="213" href="#213">213</a>     fieldStart = buf.length();
+<a name="214" href="#214">214</a>     buf.append(<span class="string">"org.example.foo."</span>);
+<a name="215" href="#215">215</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="216" href="#216">216</a>     assertEquals(<span class="string">"DEBUG - o~.e~.f~."</span>, buf.toString());
+<a name="217" href="#217">217</a> 
+<a name="218" href="#218">218</a>     buf.setLength(0);
+<a name="219" href="#219">219</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="220" href="#220">220</a>     fieldStart = buf.length();
+<a name="221" href="#221">221</a>     buf.append(<span class="string">"foo.bar"</span>);
+<a name="222" href="#222">222</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="223" href="#223">223</a>     assertEquals(<span class="string">"DEBUG - f~.bar"</span>, buf.toString());
+<a name="224" href="#224">224</a> 
+<a name="225" href="#225">225</a>     buf.setLength(0);
+<a name="226" href="#226">226</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="227" href="#227">227</a>     fieldStart = buf.length();
+<a name="228" href="#228">228</a>     buf.append(<span class="string">"bar"</span>);
+<a name="229" href="#229">229</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="230" href="#230">230</a>     assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
+<a name="231" href="#231">231</a> 
+<a name="232" href="#232">232</a>     buf.setLength(0);
+<a name="233" href="#233">233</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="234" href="#234">234</a>     fieldStart = buf.length();
+<a name="235" href="#235">235</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="236" href="#236">236</a>     assertEquals(<span class="string">"DEBUG - "</span>, buf.toString());
+<a name="237" href="#237">237</a> 
 <a name="238" href="#238">238</a> 
-<a name="239" href="#239">239</a> 
-<a name="240" href="#240">240</a>     buf.setLength(0);
-<a name="241" href="#241">241</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="242" href="#242">242</a>     fieldStart = buf.length();
-<a name="243" href="#243">243</a>     buf.append(<span class="string">"."</span>);
-<a name="244" href="#244">244</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="245" href="#245">245</a>     assertEquals(<span class="string">"DEBUG - ."</span>, buf.toString());
+<a name="239" href="#239">239</a>     buf.setLength(0);
+<a name="240" href="#240">240</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="241" href="#241">241</a>     fieldStart = buf.length();
+<a name="242" href="#242">242</a>     buf.append(<span class="string">"."</span>);
+<a name="243" href="#243">243</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="244" href="#244">244</a>     assertEquals(<span class="string">"DEBUG - ."</span>, buf.toString());
+<a name="245" href="#245">245</a> 
 <a name="246" href="#246">246</a> 
-<a name="247" href="#247">247</a> 
-<a name="248" href="#248">248</a>     buf.setLength(0);
-<a name="249" href="#249">249</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="250" href="#250">250</a>     fieldStart = buf.length();
-<a name="251" href="#251">251</a>     buf.append(<span class="string">"o.e.f.bar"</span>);
-<a name="252" href="#252">252</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="253" href="#253">253</a>     assertEquals(<span class="string">"DEBUG - o.e.f.bar"</span>, buf.toString());
-<a name="254" href="#254">254</a>   }
-<a name="255" href="#255">255</a> 
-<a name="256" href="#256">256</a>   <em>/**<em>*</em></em>
-<a name="257" href="#257">257</a> <em>   * Check that getAbbreviator("1.*.2").abbreviate drops all but the first</em>
-<a name="258" href="#258">258</a> <em>   * character from the first element, uses all of the second element and</em>
-<a name="259" href="#259">259</a> <em>   * drops all but the first two characters of the rest of the non-final elements.</em>
-<a name="260" href="#260">260</a> <em>   *</em>
-<a name="261" href="#261">261</a> <em>   */</em>
-<a name="262" href="#262">262</a>   <strong>public</strong> <strong>void</strong> testMulti() {
-<a name="263" href="#263">263</a>     NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">"1.*.2"</span>);
-<a name="264" href="#264">264</a>     StringBuffer buf = <strong>new</strong> StringBuffer(<span class="string">"DEBUG - "</span>);
-<a name="265" href="#265">265</a>     <strong>int</strong> fieldStart = buf.length();
-<a name="266" href="#266">266</a>     buf.append(<span class="string">"org.example.foo.bar"</span>);
-<a name="267" href="#267">267</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="268" href="#268">268</a>     assertEquals(<span class="string">"DEBUG - o.example.fo.bar"</span>, buf.toString());
-<a name="269" href="#269">269</a> 
-<a name="270" href="#270">270</a>     buf.setLength(0);
-<a name="271" href="#271">271</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="272" href="#272">272</a>     fieldStart = buf.length();
-<a name="273" href="#273">273</a>     buf.append(<span class="string">"org.example.foo."</span>);
-<a name="274" href="#274">274</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="275" href="#275">275</a>     assertEquals(<span class="string">"DEBUG - o.example.fo."</span>, buf.toString());
-<a name="276" href="#276">276</a> 
-<a name="277" href="#277">277</a>     buf.setLength(0);
-<a name="278" href="#278">278</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="279" href="#279">279</a>     fieldStart = buf.length();
-<a name="280" href="#280">280</a>     buf.append(<span class="string">"foo.bar"</span>);
-<a name="281" href="#281">281</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="282" href="#282">282</a>     assertEquals(<span class="string">"DEBUG - f.bar"</span>, buf.toString());
-<a name="283" href="#283">283</a> 
-<a name="284" href="#284">284</a>     buf.setLength(0);
-<a name="285" href="#285">285</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="286" href="#286">286</a>     fieldStart = buf.length();
-<a name="287" href="#287">287</a>     buf.append(<span class="string">"bar"</span>);
-<a name="288" href="#288">288</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="289" href="#289">289</a>     assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
-<a name="290" href="#290">290</a> 
-<a name="291" href="#291">291</a>     buf.setLength(0);
-<a name="292" href="#292">292</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="293" href="#293">293</a>     fieldStart = buf.length();
-<a name="294" href="#294">294</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="295" href="#295">295</a>     assertEquals(<span class="string">"DEBUG - "</span>, buf.toString());
-<a name="296" href="#296">296</a> 
-<a name="297" href="#297">297</a>     buf.setLength(0);
-<a name="298" href="#298">298</a>     buf.append(<span class="string">"DEBUG - "</span>);
-<a name="299" href="#299">299</a>     fieldStart = buf.length();
-<a name="300" href="#300">300</a>     buf.append(<span class="string">"."</span>);
-<a name="301" href="#301">301</a>     abbrev.abbreviate(fieldStart, buf);
-<a name="302" href="#302">302</a>     assertEquals(<span class="string">"DEBUG - ."</span>, buf.toString());
-<a name="303" href="#303">303</a>   }
-<a name="304" href="#304">304</a> }
+<a name="247" href="#247">247</a>     buf.setLength(0);
+<a name="248" href="#248">248</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="249" href="#249">249</a>     fieldStart = buf.length();
+<a name="250" href="#250">250</a>     buf.append(<span class="string">"o.e.f.bar"</span>);
+<a name="251" href="#251">251</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="252" href="#252">252</a>     assertEquals(<span class="string">"DEBUG - o.e.f.bar"</span>, buf.toString());
+<a name="253" href="#253">253</a>   }
+<a name="254" href="#254">254</a> 
+<a name="255" href="#255">255</a>   <em>/**<em>*</em></em>
+<a name="256" href="#256">256</a> <em>   * Check that getAbbreviator("1.*.2").abbreviate drops all but the first</em>
+<a name="257" href="#257">257</a> <em>   * character from the first element, uses all of the second element and</em>
+<a name="258" href="#258">258</a> <em>   * drops all but the first two characters of the rest of the non-final elements.</em>
+<a name="259" href="#259">259</a> <em>   *</em>
+<a name="260" href="#260">260</a> <em>   */</em>
+<a name="261" href="#261">261</a>   <strong>public</strong> <strong>void</strong> testMulti() {
+<a name="262" href="#262">262</a>     NameAbbreviator abbrev = NameAbbreviator.getAbbreviator(<span class="string">"1.*.2"</span>);
+<a name="263" href="#263">263</a>     StringBuffer buf = <strong>new</strong> StringBuffer(<span class="string">"DEBUG - "</span>);
+<a name="264" href="#264">264</a>     <strong>int</strong> fieldStart = buf.length();
+<a name="265" href="#265">265</a>     buf.append(<span class="string">"org.example.foo.bar"</span>);
+<a name="266" href="#266">266</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="267" href="#267">267</a>     assertEquals(<span class="string">"DEBUG - o.example.fo.bar"</span>, buf.toString());
+<a name="268" href="#268">268</a> 
+<a name="269" href="#269">269</a>     buf.setLength(0);
+<a name="270" href="#270">270</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="271" href="#271">271</a>     fieldStart = buf.length();
+<a name="272" href="#272">272</a>     buf.append(<span class="string">"org.example.foo."</span>);
+<a name="273" href="#273">273</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="274" href="#274">274</a>     assertEquals(<span class="string">"DEBUG - o.example.fo."</span>, buf.toString());
+<a name="275" href="#275">275</a> 
+<a name="276" href="#276">276</a>     buf.setLength(0);
+<a name="277" href="#277">277</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="278" href="#278">278</a>     fieldStart = buf.length();
+<a name="279" href="#279">279</a>     buf.append(<span class="string">"foo.bar"</span>);
+<a name="280" href="#280">280</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="281" href="#281">281</a>     assertEquals(<span class="string">"DEBUG - f.bar"</span>, buf.toString());
+<a name="282" href="#282">282</a> 
+<a name="283" href="#283">283</a>     buf.setLength(0);
+<a name="284" href="#284">284</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="285" href="#285">285</a>     fieldStart = buf.length();
+<a name="286" href="#286">286</a>     buf.append(<span class="string">"bar"</span>);
+<a name="287" href="#287">287</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="288" href="#288">288</a>     assertEquals(<span class="string">"DEBUG - bar"</span>, buf.toString());
+<a name="289" href="#289">289</a> 
+<a name="290" href="#290">290</a>     buf.setLength(0);
+<a name="291" href="#291">291</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="292" href="#292">292</a>     fieldStart = buf.length();
+<a name="293" href="#293">293</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="294" href="#294">294</a>     assertEquals(<span class="string">"DEBUG - "</span>, buf.toString());
+<a name="295" href="#295">295</a> 
+<a name="296" href="#296">296</a>     buf.setLength(0);
+<a name="297" href="#297">297</a>     buf.append(<span class="string">"DEBUG - "</span>);
+<a name="298" href="#298">298</a>     fieldStart = buf.length();
+<a name="299" href="#299">299</a>     buf.append(<span class="string">"."</span>);
+<a name="300" href="#300">300</a>     abbrev.abbreviate(fieldStart, buf);
+<a name="301" href="#301">301</a>     assertEquals(<span class="string">"DEBUG - ."</span>, buf.toString());
+<a name="302" href="#302">302</a>   }
+<a name="303" href="#303">303</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/pattern/package-frame.html
URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/pattern/package-frame.html?rev=569257&r1=569256&r2=569257&view=diff
==============================================================================
--- logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/pattern/package-frame.html (original)
+++ logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/pattern/package-frame.html Thu Aug 23 22:43:39 2007
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache Extras Companion for log4j 1.2. 1.0-SNAPSHOT Reference Package org.apache.log4j.pattern</title>
+		<title>Apache Extras Companion for log4j 1.2. 1.0 Reference Package org.apache.log4j.pattern</title>
 		<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/pattern/package-summary.html
URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/pattern/package-summary.html?rev=569257&r1=569256&r2=569257&view=diff
==============================================================================
--- logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/pattern/package-summary.html (original)
+++ logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/pattern/package-summary.html Thu Aug 23 22:43:39 2007
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache Extras Companion for log4j 1.2. 1.0-SNAPSHOT Reference Package $name</title>
+		<title>Apache Extras Companion for log4j 1.2. 1.0 Reference Package $name</title>
 		<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/FilterBasedRollingTest.html
URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/FilterBasedRollingTest.html?rev=569257&r1=569256&r2=569257&view=diff
==============================================================================
--- logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/FilterBasedRollingTest.html (original)
+++ logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/FilterBasedRollingTest.html Thu Aug 23 22:43:39 2007
@@ -35,7 +35,7 @@
 <a name="26" href="#26">26</a>  <strong>import</strong> org.apache.log4j.PatternLayout;
 <a name="27" href="#27">27</a>  <strong>import</strong> org.apache.log4j.filter.LevelRangeFilter;
 <a name="28" href="#28">28</a>  <strong>import</strong> org.apache.log4j.util.Compare;
-<a name="29" href="#29">29</a>  <strong>import</strong> org.apache.log4j.rolling.RollingConfigurator;
+<a name="29" href="#29">29</a>  <strong>import</strong> org.apache.log4j.extras.DOMConfigurator;
 <a name="30" href="#30">30</a>  
 <a name="31" href="#31">31</a>  <strong>import</strong> java.io.FileNotFoundException;
 <a name="32" href="#32">32</a>  <strong>import</strong> java.io.IOException;
@@ -47,115 +47,114 @@
 <a name="38" href="#38">38</a>  <em> * Tests of rolling file appender with a filter based triggering policy.</em>
 <a name="39" href="#39">39</a>  <em> *</em>
 <a name="40" href="#40">40</a>  <em> * @author Curt Arnold</em>
-<a name="41" href="#41">41</a>  <em> * @since 1.3</em>
-<a name="42" href="#42">42</a>  <em> *</em>
-<a name="43" href="#43">43</a>  <em> */</em>
-<a name="44" href="#44">44</a>  <strong>public</strong> <strong>class</strong> <a href="../../../../org/apache/log4j/rolling/FilterBasedRollingTest.html">FilterBasedRollingTest</a> <strong>extends</strong> TestCase {
-<a name="45" href="#45">45</a>    <strong>public</strong> <a href="../../../../org/apache/log4j/rolling/FilterBasedRollingTest.html">FilterBasedRollingTest</a>(String name) {
-<a name="46" href="#46">46</a>      <strong>super</strong>(name);
-<a name="47" href="#47">47</a>    }
-<a name="48" href="#48">48</a>  
-<a name="49" href="#49">49</a>    <strong>public</strong> <strong>void</strong> setUp() {
-<a name="50" href="#50">50</a>        Appender ca = <strong>new</strong> ConsoleAppender(<strong>new</strong> PatternLayout(<span class="string">"%d %level %c -%m%n"</span>));
-<a name="51" href="#51">51</a>        ca.setName(<span class="string">"CONSOLE"</span>);
-<a name="52" href="#52">52</a>        Logger.getRootLogger().addAppender(ca);
-<a name="53" href="#53">53</a>    }
-<a name="54" href="#54">54</a>  
-<a name="55" href="#55">55</a>    <strong>public</strong> <strong>void</strong> tearDown() {
-<a name="56" href="#56">56</a>      LogManager.getLoggerRepository().resetConfiguration();
-<a name="57" href="#57">57</a>    }
-<a name="58" href="#58">58</a>  
-<a name="59" href="#59">59</a>      <strong>private</strong> <strong>static</strong> <strong>void</strong> configure(<strong>final</strong> String configName) throws IOException {
-<a name="60" href="#60">60</a>        String resourceName = configName;
-<a name="61" href="#61">61</a>        <strong>int</strong> lastSlash = resourceName.lastIndexOf(<span class="string">"/"</span>);
-<a name="62" href="#62">62</a>        <strong>if</strong> (lastSlash >= 0) {
-<a name="63" href="#63">63</a>            resourceName = resourceName.substring(lastSlash + 1);
-<a name="64" href="#64">64</a>        }
-<a name="65" href="#65">65</a>        InputStream is = TimeBasedRollingTest.<strong>class</strong>.getResourceAsStream(resourceName);
-<a name="66" href="#66">66</a>        <strong>if</strong> (is == <strong>null</strong>) {
-<a name="67" href="#67">67</a>            <strong>throw</strong> <strong>new</strong> FileNotFoundException(<span class="string">"Could not find resource "</span> + resourceName);
-<a name="68" href="#68">68</a>        }
-<a name="69" href="#69">69</a>        RollingConfigurator configurator = <strong>new</strong> RollingConfigurator();
-<a name="70" href="#70">70</a>        configurator.doConfigure(is, LogManager.getLoggerRepository());
-<a name="71" href="#71">71</a>    }
-<a name="72" href="#72">72</a>    <em>/**<em>*</em></em>
-<a name="73" href="#73">73</a>  <em>   * Test basic rolling functionality using configuration file.</em>
-<a name="74" href="#74">74</a>  <em>   */</em>
-<a name="75" href="#75">75</a>    <strong>public</strong> <strong>void</strong> test1() throws Exception {
-<a name="76" href="#76">76</a>      configure(<span class="string">"./input/rolling/filter1.xml"</span>);
-<a name="77" href="#77">77</a>      common(<span class="string">"filterBased-test1"</span>);
-<a name="78" href="#78">78</a>    }
-<a name="79" href="#79">79</a>  
-<a name="80" href="#80">80</a>    <em>/**<em>*</em></em>
-<a name="81" href="#81">81</a>  <em>   * Test basic rolling functionality using explicit configuration.</em>
-<a name="82" href="#82">82</a>  <em>   * Test fails when run immediately after test1.</em>
-<a name="83" href="#83">83</a>  <em>   */</em>
-<a name="84" href="#84">84</a>    <strong>public</strong> <strong>void</strong> test2() throws Exception {
-<a name="85" href="#85">85</a>      PatternLayout layout = <strong>new</strong> PatternLayout(<span class="string">"%m\n"</span>);
-<a name="86" href="#86">86</a>      RollingFileAppender rfa = <strong>new</strong> RollingFileAppender();
-<a name="87" href="#87">87</a>      rfa.setName(<span class="string">"ROLLING"</span>);
-<a name="88" href="#88">88</a>      rfa.setLayout(layout);
-<a name="89" href="#89">89</a>  
-<a name="90" href="#90">90</a>      FixedWindowRollingPolicy swrp = <strong>new</strong> FixedWindowRollingPolicy();
-<a name="91" href="#91">91</a>      FilterBasedTriggeringPolicy fbtp = <strong>new</strong> FilterBasedTriggeringPolicy();
-<a name="92" href="#92">92</a>  
-<a name="93" href="#93">93</a>      LevelRangeFilter rf = <strong>new</strong> LevelRangeFilter();
-<a name="94" href="#94">94</a>      rf.setLevelMin(Level.INFO);
-<a name="95" href="#95">95</a>      fbtp.addFilter(rf);
-<a name="96" href="#96">96</a>      fbtp.activateOptions();
-<a name="97" href="#97">97</a>  
-<a name="98" href="#98">98</a>      swrp.setMinIndex(0);
-<a name="99" href="#99">99</a>      rfa.setFile(<span class="string">"filterBased-test2.log"</span>);
-<a name="100" href="#100">100</a>     rfa.setAppend(false);
-<a name="101" href="#101">101</a> 
-<a name="102" href="#102">102</a>     swrp.setFileNamePattern(<span class="string">"filterBased-test2.%i"</span>);
-<a name="103" href="#103">103</a>     swrp.activateOptions();
-<a name="104" href="#104">104</a> 
-<a name="105" href="#105">105</a>     rfa.setRollingPolicy(swrp);
-<a name="106" href="#106">106</a>     rfa.setTriggeringPolicy(fbtp);
-<a name="107" href="#107">107</a>     rfa.activateOptions();
-<a name="108" href="#108">108</a>     Logger.getRootLogger().addAppender(rfa);
-<a name="109" href="#109">109</a>     Logger.getRootLogger().setLevel(Level.DEBUG);
-<a name="110" href="#110">110</a> 
-<a name="111" href="#111">111</a>     common(<span class="string">"filterBased-test2"</span>);
-<a name="112" href="#112">112</a>   }
-<a name="113" href="#113">113</a> 
-<a name="114" href="#114">114</a>   <em>/**<em>*</em></em>
-<a name="115" href="#115">115</a> <em>   *   Common aspects of test1 and test2</em>
-<a name="116" href="#116">116</a> <em>   */</em>
-<a name="117" href="#117">117</a>   <strong>private</strong> <strong>void</strong> common(String baseName) throws Exception {
-<a name="118" href="#118">118</a>     Logger logger = Logger.getLogger(FilterBasedRollingTest.<strong>class</strong>);
-<a name="119" href="#119">119</a> 
-<a name="120" href="#120">120</a>     <em class="comment">// Write exactly 10 bytes with each log</em>
-<a name="121" href="#121">121</a>     <strong>for</strong> (<strong>int</strong> i = 0; i &lt; 25; i++) {
-<a name="122" href="#122">122</a>       Thread.sleep(100);
-<a name="123" href="#123">123</a> 
-<a name="124" href="#124">124</a>       <strong>if</strong> (i &lt; 10) {
-<a name="125" href="#125">125</a>         logger.debug(<span class="string">"Hello---"</span> + i);
-<a name="126" href="#126">126</a>       } <strong>else</strong> <strong>if</strong> (i &lt; 100) {
-<a name="127" href="#127">127</a>         <strong>if</strong> ((i % 10) == 0) {
-<a name="128" href="#128">128</a>           <em class="comment">//  on the 10th and 20th request, raise the severity</em>
-<a name="129" href="#129">129</a>           logger.warn(<span class="string">"Hello--"</span> + i);
-<a name="130" href="#130">130</a>         } <strong>else</strong> {
-<a name="131" href="#131">131</a>           logger.debug(<span class="string">"Hello--"</span> + i);
-<a name="132" href="#132">132</a>         }
-<a name="133" href="#133">133</a>       }
-<a name="134" href="#134">134</a>     }
-<a name="135" href="#135">135</a> 
-<a name="136" href="#136">136</a>     <em class="comment">//</em>
-<a name="137" href="#137">137</a>     <em class="comment">//  test was constructed to mimic SizeBasedRollingTest.test2</em>
-<a name="138" href="#138">138</a>     <em class="comment">//</em>
-<a name="139" href="#139">139</a>     assertTrue(
-<a name="140" href="#140">140</a>       Compare.compare(FilterBasedRollingTest.<strong>class</strong>,
-<a name="141" href="#141">141</a>               baseName + <span class="string">".log"</span>, <span class="string">"witness/rolling/sbr-test2.log"</span>));
-<a name="142" href="#142">142</a>     assertTrue(
-<a name="143" href="#143">143</a>       Compare.compare(FilterBasedRollingTest.<strong>class</strong>,
-<a name="144" href="#144">144</a>               baseName + <span class="string">".0"</span>, <span class="string">"witness/rolling/sbr-test2.0"</span>));
-<a name="145" href="#145">145</a>     assertTrue(
-<a name="146" href="#146">146</a>       Compare.compare(FilterBasedRollingTest.<strong>class</strong>,
-<a name="147" href="#147">147</a>               baseName + <span class="string">".1"</span>, <span class="string">"witness/rolling/sbr-test2.1"</span>));
-<a name="148" href="#148">148</a>   }
-<a name="149" href="#149">149</a> }
+<a name="41" href="#41">41</a>  <em> *</em>
+<a name="42" href="#42">42</a>  <em> */</em>
+<a name="43" href="#43">43</a>  <strong>public</strong> <strong>class</strong> <a href="../../../../org/apache/log4j/rolling/FilterBasedRollingTest.html">FilterBasedRollingTest</a> <strong>extends</strong> TestCase {
+<a name="44" href="#44">44</a>    <strong>public</strong> <a href="../../../../org/apache/log4j/rolling/FilterBasedRollingTest.html">FilterBasedRollingTest</a>(String name) {
+<a name="45" href="#45">45</a>      <strong>super</strong>(name);
+<a name="46" href="#46">46</a>    }
+<a name="47" href="#47">47</a>  
+<a name="48" href="#48">48</a>    <strong>public</strong> <strong>void</strong> setUp() {
+<a name="49" href="#49">49</a>        Appender ca = <strong>new</strong> ConsoleAppender(<strong>new</strong> PatternLayout(<span class="string">"%d %level %c -%m%n"</span>));
+<a name="50" href="#50">50</a>        ca.setName(<span class="string">"CONSOLE"</span>);
+<a name="51" href="#51">51</a>        Logger.getRootLogger().addAppender(ca);
+<a name="52" href="#52">52</a>    }
+<a name="53" href="#53">53</a>  
+<a name="54" href="#54">54</a>    <strong>public</strong> <strong>void</strong> tearDown() {
+<a name="55" href="#55">55</a>      LogManager.getLoggerRepository().resetConfiguration();
+<a name="56" href="#56">56</a>    }
+<a name="57" href="#57">57</a>  
+<a name="58" href="#58">58</a>      <strong>private</strong> <strong>static</strong> <strong>void</strong> configure(<strong>final</strong> String configName) throws IOException {
+<a name="59" href="#59">59</a>        String resourceName = configName;
+<a name="60" href="#60">60</a>        <strong>int</strong> lastSlash = resourceName.lastIndexOf(<span class="string">"/"</span>);
+<a name="61" href="#61">61</a>        <strong>if</strong> (lastSlash >= 0) {
+<a name="62" href="#62">62</a>            resourceName = resourceName.substring(lastSlash + 1);
+<a name="63" href="#63">63</a>        }
+<a name="64" href="#64">64</a>        InputStream is = TimeBasedRollingTest.<strong>class</strong>.getResourceAsStream(resourceName);
+<a name="65" href="#65">65</a>        <strong>if</strong> (is == <strong>null</strong>) {
+<a name="66" href="#66">66</a>            <strong>throw</strong> <strong>new</strong> FileNotFoundException(<span class="string">"Could not find resource "</span> + resourceName);
+<a name="67" href="#67">67</a>        }
+<a name="68" href="#68">68</a>        DOMConfigurator configurator = <strong>new</strong> DOMConfigurator();
+<a name="69" href="#69">69</a>        configurator.doConfigure(is, LogManager.getLoggerRepository());
+<a name="70" href="#70">70</a>    }
+<a name="71" href="#71">71</a>    <em>/**<em>*</em></em>
+<a name="72" href="#72">72</a>  <em>   * Test basic rolling functionality using configuration file.</em>
+<a name="73" href="#73">73</a>  <em>   */</em>
+<a name="74" href="#74">74</a>    <strong>public</strong> <strong>void</strong> test1() throws Exception {
+<a name="75" href="#75">75</a>      configure(<span class="string">"./input/rolling/filter1.xml"</span>);
+<a name="76" href="#76">76</a>      common(<span class="string">"filterBased-test1"</span>);
+<a name="77" href="#77">77</a>    }
+<a name="78" href="#78">78</a>  
+<a name="79" href="#79">79</a>    <em>/**<em>*</em></em>
+<a name="80" href="#80">80</a>  <em>   * Test basic rolling functionality using explicit configuration.</em>
+<a name="81" href="#81">81</a>  <em>   * Test fails when run immediately after test1.</em>
+<a name="82" href="#82">82</a>  <em>   */</em>
+<a name="83" href="#83">83</a>    <strong>public</strong> <strong>void</strong> test2() throws Exception {
+<a name="84" href="#84">84</a>      PatternLayout layout = <strong>new</strong> PatternLayout(<span class="string">"%m\n"</span>);
+<a name="85" href="#85">85</a>      RollingFileAppender rfa = <strong>new</strong> RollingFileAppender();
+<a name="86" href="#86">86</a>      rfa.setName(<span class="string">"ROLLING"</span>);
+<a name="87" href="#87">87</a>      rfa.setLayout(layout);
+<a name="88" href="#88">88</a>  
+<a name="89" href="#89">89</a>      FixedWindowRollingPolicy swrp = <strong>new</strong> FixedWindowRollingPolicy();
+<a name="90" href="#90">90</a>      FilterBasedTriggeringPolicy fbtp = <strong>new</strong> FilterBasedTriggeringPolicy();
+<a name="91" href="#91">91</a>  
+<a name="92" href="#92">92</a>      LevelRangeFilter rf = <strong>new</strong> LevelRangeFilter();
+<a name="93" href="#93">93</a>      rf.setLevelMin(Level.INFO);
+<a name="94" href="#94">94</a>      fbtp.addFilter(rf);
+<a name="95" href="#95">95</a>      fbtp.activateOptions();
+<a name="96" href="#96">96</a>  
+<a name="97" href="#97">97</a>      swrp.setMinIndex(0);
+<a name="98" href="#98">98</a>      rfa.setFile(<span class="string">"filterBased-test2.log"</span>);
+<a name="99" href="#99">99</a>      rfa.setAppend(false);
+<a name="100" href="#100">100</a> 
+<a name="101" href="#101">101</a>     swrp.setFileNamePattern(<span class="string">"filterBased-test2.%i"</span>);
+<a name="102" href="#102">102</a>     swrp.activateOptions();
+<a name="103" href="#103">103</a> 
+<a name="104" href="#104">104</a>     rfa.setRollingPolicy(swrp);
+<a name="105" href="#105">105</a>     rfa.setTriggeringPolicy(fbtp);
+<a name="106" href="#106">106</a>     rfa.activateOptions();
+<a name="107" href="#107">107</a>     Logger.getRootLogger().addAppender(rfa);
+<a name="108" href="#108">108</a>     Logger.getRootLogger().setLevel(Level.DEBUG);
+<a name="109" href="#109">109</a> 
+<a name="110" href="#110">110</a>     common(<span class="string">"filterBased-test2"</span>);
+<a name="111" href="#111">111</a>   }
+<a name="112" href="#112">112</a> 
+<a name="113" href="#113">113</a>   <em>/**<em>*</em></em>
+<a name="114" href="#114">114</a> <em>   *   Common aspects of test1 and test2</em>
+<a name="115" href="#115">115</a> <em>   */</em>
+<a name="116" href="#116">116</a>   <strong>private</strong> <strong>void</strong> common(String baseName) throws Exception {
+<a name="117" href="#117">117</a>     Logger logger = Logger.getLogger(FilterBasedRollingTest.<strong>class</strong>);
+<a name="118" href="#118">118</a> 
+<a name="119" href="#119">119</a>     <em class="comment">// Write exactly 10 bytes with each log</em>
+<a name="120" href="#120">120</a>     <strong>for</strong> (<strong>int</strong> i = 0; i &lt; 25; i++) {
+<a name="121" href="#121">121</a>       Thread.sleep(100);
+<a name="122" href="#122">122</a> 
+<a name="123" href="#123">123</a>       <strong>if</strong> (i &lt; 10) {
+<a name="124" href="#124">124</a>         logger.debug(<span class="string">"Hello---"</span> + i);
+<a name="125" href="#125">125</a>       } <strong>else</strong> <strong>if</strong> (i &lt; 100) {
+<a name="126" href="#126">126</a>         <strong>if</strong> ((i % 10) == 0) {
+<a name="127" href="#127">127</a>           <em class="comment">//  on the 10th and 20th request, raise the severity</em>
+<a name="128" href="#128">128</a>           logger.warn(<span class="string">"Hello--"</span> + i);
+<a name="129" href="#129">129</a>         } <strong>else</strong> {
+<a name="130" href="#130">130</a>           logger.debug(<span class="string">"Hello--"</span> + i);
+<a name="131" href="#131">131</a>         }
+<a name="132" href="#132">132</a>       }
+<a name="133" href="#133">133</a>     }
+<a name="134" href="#134">134</a> 
+<a name="135" href="#135">135</a>     <em class="comment">//</em>
+<a name="136" href="#136">136</a>     <em class="comment">//  test was constructed to mimic SizeBasedRollingTest.test2</em>
+<a name="137" href="#137">137</a>     <em class="comment">//</em>
+<a name="138" href="#138">138</a>     assertTrue(
+<a name="139" href="#139">139</a>       Compare.compare(FilterBasedRollingTest.<strong>class</strong>,
+<a name="140" href="#140">140</a>               baseName + <span class="string">".log"</span>, <span class="string">"witness/rolling/sbr-test2.log"</span>));
+<a name="141" href="#141">141</a>     assertTrue(
+<a name="142" href="#142">142</a>       Compare.compare(FilterBasedRollingTest.<strong>class</strong>,
+<a name="143" href="#143">143</a>               baseName + <span class="string">".0"</span>, <span class="string">"witness/rolling/sbr-test2.0"</span>));
+<a name="144" href="#144">144</a>     assertTrue(
+<a name="145" href="#145">145</a>       Compare.compare(FilterBasedRollingTest.<strong>class</strong>,
+<a name="146" href="#146">146</a>               baseName + <span class="string">".1"</span>, <span class="string">"witness/rolling/sbr-test2.1"</span>));
+<a name="147" href="#147">147</a>   }
+<a name="148" href="#148">148</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/TimeBasedRollingTest.html
URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/TimeBasedRollingTest.html?rev=569257&r1=569256&r2=569257&view=diff
==============================================================================
--- logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/TimeBasedRollingTest.html (original)
+++ logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/TimeBasedRollingTest.html Thu Aug 23 22:43:39 2007
@@ -32,7 +32,7 @@
 <a name="23" href="#23">23</a>  <strong>import</strong> org.apache.log4j.Logger;
 <a name="24" href="#24">24</a>  <strong>import</strong> org.apache.log4j.PatternLayout;
 <a name="25" href="#25">25</a>  <strong>import</strong> org.apache.log4j.util.Compare;
-<a name="26" href="#26">26</a>  <strong>import</strong> org.apache.log4j.rolling.RollingConfigurator;
+<a name="26" href="#26">26</a>  <strong>import</strong> org.apache.log4j.extras.DOMConfigurator;
 <a name="27" href="#27">27</a>  
 <a name="28" href="#28">28</a>  <strong>import</strong> java.io.FileNotFoundException;
 <a name="29" href="#29">29</a>  <strong>import</strong> java.io.IOException;
@@ -99,7 +99,7 @@
 <a name="90" href="#90">90</a>        <strong>if</strong> (is == <strong>null</strong>) {
 <a name="91" href="#91">91</a>            <strong>throw</strong> <strong>new</strong> FileNotFoundException(<span class="string">"Could not find resource "</span> + resourceName);
 <a name="92" href="#92">92</a>        }
-<a name="93" href="#93">93</a>        RollingConfigurator configurator = <strong>new</strong> RollingConfigurator();
+<a name="93" href="#93">93</a>        DOMConfigurator configurator = <strong>new</strong> DOMConfigurator();
 <a name="94" href="#94">94</a>        configurator.doConfigure(is, LogManager.getLoggerRepository());
 <a name="95" href="#95">95</a>    }
 <a name="96" href="#96">96</a>  

Modified: logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/helper/package-frame.html
URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/helper/package-frame.html?rev=569257&r1=569256&r2=569257&view=diff
==============================================================================
--- logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/helper/package-frame.html (original)
+++ logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/helper/package-frame.html Thu Aug 23 22:43:39 2007
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache Extras Companion for log4j 1.2. 1.0-SNAPSHOT Reference Package org.apache.log4j.rolling.helper</title>
+		<title>Apache Extras Companion for log4j 1.2. 1.0 Reference Package org.apache.log4j.rolling.helper</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/helper/package-summary.html
URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/helper/package-summary.html?rev=569257&r1=569256&r2=569257&view=diff
==============================================================================
--- logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/helper/package-summary.html (original)
+++ logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/helper/package-summary.html Thu Aug 23 22:43:39 2007
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache Extras Companion for log4j 1.2. 1.0-SNAPSHOT Reference Package $name</title>
+		<title>Apache Extras Companion for log4j 1.2. 1.0 Reference Package $name</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/package-frame.html
URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/package-frame.html?rev=569257&r1=569256&r2=569257&view=diff
==============================================================================
--- logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/package-frame.html (original)
+++ logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/package-frame.html Thu Aug 23 22:43:39 2007
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache Extras Companion for log4j 1.2. 1.0-SNAPSHOT Reference Package org.apache.log4j.rolling</title>
+		<title>Apache Extras Companion for log4j 1.2. 1.0 Reference Package org.apache.log4j.rolling</title>
 		<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/package-summary.html
URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/package-summary.html?rev=569257&r1=569256&r2=569257&view=diff
==============================================================================
--- logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/package-summary.html (original)
+++ logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/rolling/package-summary.html Thu Aug 23 22:43:39 2007
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache Extras Companion for log4j 1.2. 1.0-SNAPSHOT Reference Package $name</title>
+		<title>Apache Extras Companion for log4j 1.2. 1.0 Reference Package $name</title>
 		<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/AbsoluteDateAndTimeFilter.html
URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/AbsoluteDateAndTimeFilter.html?rev=569257&r1=569256&r2=569257&view=diff
==============================================================================
--- logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/AbsoluteDateAndTimeFilter.html (original)
+++ logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/AbsoluteDateAndTimeFilter.html Thu Aug 23 22:43:39 2007
@@ -26,23 +26,25 @@
 <a name="17" href="#17">17</a>  
 <a name="18" href="#18">18</a>  <strong>package</strong> org.apache.log4j.util;
 <a name="19" href="#19">19</a>  
-<a name="20" href="#20">20</a>  <strong>import</strong> org.apache.oro.text.perl.Perl5Util;
+<a name="20" href="#20">20</a>  <strong>import</strong> java.util.regex.Pattern;
 <a name="21" href="#21">21</a>  
 <a name="22" href="#22">22</a>  
 <a name="23" href="#23">23</a>  <strong>public</strong> <strong>class</strong> <a href="../../../../org/apache/log4j/util/AbsoluteDateAndTimeFilter.html">AbsoluteDateAndTimeFilter</a> implements <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a> {
-<a name="24" href="#24">24</a>    Perl5Util util = <strong>new</strong> Perl5Util();
+<a name="24" href="#24">24</a>    <strong>private</strong> <strong>final</strong> Pattern pattern;
 <a name="25" href="#25">25</a>  
-<a name="26" href="#26">26</a>    <strong>public</strong> String filter(String in) {
-<a name="27" href="#27">27</a>      String pat = <span class="string">"/"</span> + Filter.ABSOLUTE_DATE_AND_TIME_PAT + <span class="string">"/"</span>;
-<a name="28" href="#28">28</a>  
-<a name="29" href="#29">29</a>      <strong>if</strong> (util.match(pat, in)) {
-<a name="30" href="#30">30</a>        <strong>return</strong> util.substitute(
-<a name="31" href="#31">31</a>          <span class="string">"s/"</span> + Filter.ABSOLUTE_DATE_AND_TIME_PAT + <span class="string">"//"</span>, in);
-<a name="32" href="#32">32</a>      } <strong>else</strong> {
-<a name="33" href="#33">33</a>        <strong>return</strong> in;
-<a name="34" href="#34">34</a>      }
-<a name="35" href="#35">35</a>    }
-<a name="36" href="#36">36</a>  }
+<a name="26" href="#26">26</a>    <strong>public</strong> <a href="../../../../org/apache/log4j/util/AbsoluteDateAndTimeFilter.html">AbsoluteDateAndTimeFilter</a>() {
+<a name="27" href="#27">27</a>        pattern = Pattern.compile(Filter.ABSOLUTE_DATE_AND_TIME_PAT);
+<a name="28" href="#28">28</a>    }
+<a name="29" href="#29">29</a>  
+<a name="30" href="#30">30</a>    <strong>public</strong> String filter(String in) {
+<a name="31" href="#31">31</a>  
+<a name="32" href="#32">32</a>      <strong>if</strong> (pattern.matcher(in).find()) {
+<a name="33" href="#33">33</a>          <strong>return</strong> pattern.matcher(in).replaceAll(<span class="string">""</span>);
+<a name="34" href="#34">34</a>      } <strong>else</strong> {
+<a name="35" href="#35">35</a>        <strong>return</strong> in;
+<a name="36" href="#36">36</a>      }
+<a name="37" href="#37">37</a>    }
+<a name="38" href="#38">38</a>  }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/AbsoluteTimeFilter.html
URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/AbsoluteTimeFilter.html?rev=569257&r1=569256&r2=569257&view=diff
==============================================================================
--- logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/AbsoluteTimeFilter.html (original)
+++ logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/AbsoluteTimeFilter.html Thu Aug 23 22:43:39 2007
@@ -26,21 +26,23 @@
 <a name="17" href="#17">17</a>  
 <a name="18" href="#18">18</a>  <strong>package</strong> org.apache.log4j.util;
 <a name="19" href="#19">19</a>  
-<a name="20" href="#20">20</a>  <strong>import</strong> org.apache.oro.text.perl.Perl5Util;
-<a name="21" href="#21">21</a>  
-<a name="22" href="#22">22</a>  <strong>public</strong> <strong>class</strong> <a href="../../../../org/apache/log4j/util/AbsoluteTimeFilter.html">AbsoluteTimeFilter</a> implements <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a> {
-<a name="23" href="#23">23</a>    Perl5Util util = <strong>new</strong> Perl5Util();
+<a name="20" href="#20">20</a>  <strong>import</strong> java.util.regex.Matcher;
+<a name="21" href="#21">21</a>  <strong>import</strong> java.util.regex.Pattern;
+<a name="22" href="#22">22</a>  
+<a name="23" href="#23">23</a>  <strong>public</strong> <strong>class</strong> <a href="../../../../org/apache/log4j/util/AbsoluteTimeFilter.html">AbsoluteTimeFilter</a> implements <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a> {
 <a name="24" href="#24">24</a>  
 <a name="25" href="#25">25</a>    <strong>public</strong> String filter(String in) {
-<a name="26" href="#26">26</a>      String pat = <span class="string">"/"</span> + Filter.ABSOLUTE_TIME_PAT + <span class="string">"/"</span>;
+<a name="26" href="#26">26</a>      String pat = Filter.ABSOLUTE_TIME_PAT;
 <a name="27" href="#27">27</a>  
-<a name="28" href="#28">28</a>      <strong>if</strong> (util.match(pat, in)) {
-<a name="29" href="#29">29</a>        <strong>return</strong> util.substitute(<span class="string">"s/"</span> + Filter.ABSOLUTE_TIME_PAT + <span class="string">"//"</span>, in);
-<a name="30" href="#30">30</a>      } <strong>else</strong> {
-<a name="31" href="#31">31</a>        <strong>return</strong> in;
-<a name="32" href="#32">32</a>      }
-<a name="33" href="#33">33</a>    }
-<a name="34" href="#34">34</a>  }
+<a name="28" href="#28">28</a>      Pattern pattern = Pattern.compile(pat);
+<a name="29" href="#29">29</a>      Matcher matcher = pattern.matcher(in);
+<a name="30" href="#30">30</a>      <strong>if</strong> (matcher.find()) {
+<a name="31" href="#31">31</a>        <strong>return</strong> matcher.replaceAll(<span class="string">""</span>);  
+<a name="32" href="#32">32</a>      } <strong>else</strong> {
+<a name="33" href="#33">33</a>        <strong>return</strong> in;
+<a name="34" href="#34">34</a>      }
+<a name="35" href="#35">35</a>    }
+<a name="36" href="#36">36</a>  }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/ControlFilter.html
URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/ControlFilter.html?rev=569257&r1=569256&r2=569257&view=diff
==============================================================================
--- logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/ControlFilter.html (original)
+++ logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/ControlFilter.html Thu Aug 23 22:43:39 2007
@@ -26,31 +26,28 @@
 <a name="17" href="#17">17</a>  
 <a name="18" href="#18">18</a>  <strong>package</strong> org.apache.log4j.util;
 <a name="19" href="#19">19</a>  
-<a name="20" href="#20">20</a>  <strong>import</strong> org.apache.oro.text.perl.Perl5Util;
+<a name="20" href="#20">20</a>  <strong>import</strong> java.util.regex.Pattern;
 <a name="21" href="#21">21</a>  
 <a name="22" href="#22">22</a>  
 <a name="23" href="#23">23</a>  <strong>public</strong> <strong>class</strong> <a href="../../../../org/apache/log4j/util/ControlFilter.html">ControlFilter</a> implements <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a> {
-<a name="24" href="#24">24</a>    Perl5Util util = <strong>new</strong> Perl5Util();
-<a name="25" href="#25">25</a>    String[] allowedPatterns;
-<a name="26" href="#26">26</a>  
-<a name="27" href="#27">27</a>    <strong>public</strong> <a href="../../../../org/apache/log4j/util/ControlFilter.html">ControlFilter</a>(String[] allowedPatterns) {
-<a name="28" href="#28">28</a>      <strong>this</strong>.allowedPatterns = allowedPatterns;
-<a name="29" href="#29">29</a>    }
-<a name="30" href="#30">30</a>  
-<a name="31" href="#31">31</a>    <strong>public</strong> String filter(String in) throws UnexpectedFormatException {
-<a name="32" href="#32">32</a>      <strong>int</strong> len = allowedPatterns.length;
-<a name="33" href="#33">33</a>  
-<a name="34" href="#34">34</a>      <strong>for</strong> (<strong>int</strong> i = 0; i &lt; len; i++) {
-<a name="35" href="#35">35</a>        <em class="comment">//System.out.println("["+allowedPatterns[i]+"]");</em>
-<a name="36" href="#36">36</a>        <strong>if</strong> (util.match(<span class="string">"/"</span> + allowedPatterns[i] + <span class="string">"/"</span>, in)) {
-<a name="37" href="#37">37</a>          <em class="comment">//System.out.println("["+in+"] matched ["+allowedPatterns[i]);</em>
-<a name="38" href="#38">38</a>          <strong>return</strong> in;
-<a name="39" href="#39">39</a>        }
-<a name="40" href="#40">40</a>      }
-<a name="41" href="#41">41</a>  
-<a name="42" href="#42">42</a>      <strong>throw</strong> <strong>new</strong> <a href="../../../../org/apache/log4j/util/UnexpectedFormatException.html">UnexpectedFormatException</a>(<span class="string">"["</span> + in + <span class="string">"]"</span>);
-<a name="43" href="#43">43</a>    }
-<a name="44" href="#44">44</a>  }
+<a name="24" href="#24">24</a>    String[] allowedPatterns;
+<a name="25" href="#25">25</a>  
+<a name="26" href="#26">26</a>    <strong>public</strong> <a href="../../../../org/apache/log4j/util/ControlFilter.html">ControlFilter</a>(String[] allowedPatterns) {
+<a name="27" href="#27">27</a>      <strong>this</strong>.allowedPatterns = allowedPatterns;
+<a name="28" href="#28">28</a>    }
+<a name="29" href="#29">29</a>  
+<a name="30" href="#30">30</a>    <strong>public</strong> String filter(String in) throws UnexpectedFormatException {
+<a name="31" href="#31">31</a>      <strong>int</strong> len = allowedPatterns.length;
+<a name="32" href="#32">32</a>  
+<a name="33" href="#33">33</a>      <strong>for</strong> (<strong>int</strong> i = 0; i &lt; len; i++) {
+<a name="34" href="#34">34</a>        <strong>if</strong> (Pattern.compile(allowedPatterns[i]).matcher(in).find()) {
+<a name="35" href="#35">35</a>            <strong>return</strong> in;
+<a name="36" href="#36">36</a>        }
+<a name="37" href="#37">37</a>      }
+<a name="38" href="#38">38</a>  
+<a name="39" href="#39">39</a>      <strong>throw</strong> <strong>new</strong> <a href="../../../../org/apache/log4j/util/UnexpectedFormatException.html">UnexpectedFormatException</a>(<span class="string">"["</span> + in + <span class="string">"]"</span>);
+<a name="40" href="#40">40</a>    }
+<a name="41" href="#41">41</a>  }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/ISO8601Filter.html
URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/ISO8601Filter.html?rev=569257&r1=569256&r2=569257&view=diff
==============================================================================
--- logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/ISO8601Filter.html (original)
+++ logging/site/trunk/docs/log4j/companions/extras/xref-test/org/apache/log4j/util/ISO8601Filter.html Thu Aug 23 22:43:39 2007
@@ -26,22 +26,24 @@
 <a name="17" href="#17">17</a>  
 <a name="18" href="#18">18</a>  <strong>package</strong> org.apache.log4j.util;
 <a name="19" href="#19">19</a>  
-<a name="20" href="#20">20</a>  <strong>import</strong> org.apache.oro.text.perl.Perl5Util;
+<a name="20" href="#20">20</a>  <strong>import</strong> java.util.regex.*;
 <a name="21" href="#21">21</a>  
 <a name="22" href="#22">22</a>  
 <a name="23" href="#23">23</a>  <strong>public</strong> <strong>class</strong> ISO8601Filter implements <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a> {
-<a name="24" href="#24">24</a>    Perl5Util util = <strong>new</strong> Perl5Util();
+<a name="24" href="#24">24</a>    <strong>private</strong> <strong>final</strong> Pattern pattern;
 <a name="25" href="#25">25</a>  
-<a name="26" href="#26">26</a>    <strong>public</strong> String filter(String in) {
-<a name="27" href="#27">27</a>      String pat = <span class="string">"/"</span> + ISO8601_PAT + <span class="string">"/"</span>;
-<a name="28" href="#28">28</a>  
-<a name="29" href="#29">29</a>      <strong>if</strong> (util.match(pat, in)) {
-<a name="30" href="#30">30</a>        <strong>return</strong> util.substitute(<span class="string">"s/"</span> + ISO8601_PAT + <span class="string">"//"</span>, in);
-<a name="31" href="#31">31</a>      } <strong>else</strong> {
-<a name="32" href="#32">32</a>        <strong>return</strong> in;
-<a name="33" href="#33">33</a>      }
-<a name="34" href="#34">34</a>    }
-<a name="35" href="#35">35</a>  }
+<a name="26" href="#26">26</a>    <strong>public</strong> ISO8601Filter() {
+<a name="27" href="#27">27</a>        pattern = Pattern.compile(ISO8601_PAT);
+<a name="28" href="#28">28</a>    }
+<a name="29" href="#29">29</a>  
+<a name="30" href="#30">30</a>    <strong>public</strong> String filter(String in) {
+<a name="31" href="#31">31</a>      <strong>if</strong> (pattern.matcher(in).find()) {
+<a name="32" href="#32">32</a>        <strong>return</strong> pattern.matcher(in).replaceAll(<span class="string">""</span>);
+<a name="33" href="#33">33</a>      } <strong>else</strong> {
+<a name="34" href="#34">34</a>        <strong>return</strong> in;
+<a name="35" href="#35">35</a>      }
+<a name="36" href="#36">36</a>    }
+<a name="37" href="#37">37</a>  }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>



Mime
View raw message