Modified: logging/site/trunk/docs/log4j/1.2/xref-test/org/apache/log4j/xml/XMLLayoutTestCase.html URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/1.2/xref-test/org/apache/log4j/xml/XMLLayoutTestCase.html?rev=569613&r1=569612&r2=569613&view=diff ============================================================================== --- logging/site/trunk/docs/log4j/1.2/xref-test/org/apache/log4j/xml/XMLLayoutTestCase.html (original) +++ logging/site/trunk/docs/log4j/1.2/xref-test/org/apache/log4j/xml/XMLLayoutTestCase.html Fri Aug 24 21:22:14 2007 @@ -32,176 +32,229 @@ <a name="23" href="#23">23</a> <strong>import</strong> org.apache.log4j.FileAppender; <a name="24" href="#24">24</a> <strong>import</strong> org.apache.log4j.Level; <a name="25" href="#25">25</a> <strong>import</strong> org.apache.log4j.Logger; -<a name="26" href="#26">26</a> <strong>import</strong> org.apache.log4j.util.Compare; -<a name="27" href="#27">27</a> <strong>import</strong> org.apache.log4j.util.Filter; -<a name="28" href="#28">28</a> <strong>import</strong> org.apache.log4j.util.JunitTestRunnerFilter; -<a name="29" href="#29">29</a> <strong>import</strong> org.apache.log4j.util.LineNumberFilter; -<a name="30" href="#30">30</a> <strong>import</strong> org.apache.log4j.util.SunReflectFilter; -<a name="31" href="#31">31</a> <strong>import</strong> org.apache.log4j.util.Transformer; -<a name="32" href="#32">32</a> <strong>import</strong> org.apache.log4j.util.XMLLineAttributeFilter; -<a name="33" href="#33">33</a> <strong>import</strong> org.apache.log4j.util.XMLTimestampFilter; -<a name="34" href="#34">34</a> -<a name="35" href="#35">35</a> <strong>public</strong> <strong>class</strong> <a href="../../../../org/apache/log4j/xml/XMLLayoutTestCase.html">XMLLayoutTestCase</a> <strong>extends</strong> TestCase { -<a name="36" href="#36">36</a> -<a name="37" href="#37">37</a> <strong>static</strong> String TEMP = <span class="string">"output/temp"</span>; -<a name="38" href="#38">38</a> <strong>static</strong> String FILTERED = <span class="string">"output/filtered"</span>; +<a name="26" href="#26">26</a> <strong>import</strong> org.apache.log4j.MDC; +<a name="27" href="#27">27</a> <strong>import</strong> org.apache.log4j.util.Compare; +<a name="28" href="#28">28</a> <strong>import</strong> org.apache.log4j.util.Filter; +<a name="29" href="#29">29</a> <strong>import</strong> org.apache.log4j.util.JunitTestRunnerFilter; +<a name="30" href="#30">30</a> <strong>import</strong> org.apache.log4j.util.LineNumberFilter; +<a name="31" href="#31">31</a> <strong>import</strong> org.apache.log4j.util.SunReflectFilter; +<a name="32" href="#32">32</a> <strong>import</strong> org.apache.log4j.util.Transformer; +<a name="33" href="#33">33</a> <strong>import</strong> org.apache.log4j.util.XMLLineAttributeFilter; +<a name="34" href="#34">34</a> <strong>import</strong> org.apache.log4j.util.XMLTimestampFilter; +<a name="35" href="#35">35</a> +<a name="36" href="#36">36</a> <strong>import</strong> java.util.Hashtable; +<a name="37" href="#37">37</a> +<a name="38" href="#38">38</a> <strong>public</strong> <strong>class</strong> <a href="../../../../org/apache/log4j/xml/XMLLayoutTestCase.html">XMLLayoutTestCase</a> <strong>extends</strong> TestCase { <a name="39" href="#39">39</a> -<a name="40" href="#40">40</a> Logger root; -<a name="41" href="#41">41</a> Logger logger; +<a name="40" href="#40">40</a> <strong>static</strong> String TEMP = <span class="string">"output/temp"</span>; +<a name="41" href="#41">41</a> <strong>static</strong> String FILTERED = <span class="string">"output/filtered"</span>; <a name="42" href="#42">42</a> -<a name="43" href="#43">43</a> <strong>public</strong> <a href="../../../../org/apache/log4j/xml/XMLLayoutTestCase.html">XMLLayoutTestCase</a>(String name) { -<a name="44" href="#44">44</a> <strong>super</strong>(name); -<a name="45" href="#45">45</a> } -<a name="46" href="#46">46</a> -<a name="47" href="#47">47</a> <strong>public</strong> <strong>void</strong> setUp() { -<a name="48" href="#48">48</a> root = Logger.getRootLogger(); -<a name="49" href="#49">49</a> root.setLevel(Level.TRACE); -<a name="50" href="#50">50</a> logger = Logger.getLogger(XMLLayoutTestCase.<strong>class</strong>); -<a name="51" href="#51">51</a> logger.setLevel(Level.TRACE); -<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> root.getLoggerRepository().resetConfiguration(); -<a name="56" href="#56">56</a> } -<a name="57" href="#57">57</a> -<a name="58" href="#58">58</a> <strong>public</strong> <strong>void</strong> basic() throws Exception { -<a name="59" href="#59">59</a> XMLLayout xmlLayout = <strong>new</strong> XMLLayout(); -<a name="60" href="#60">60</a> root.addAppender(<strong>new</strong> FileAppender(xmlLayout, TEMP, false)); -<a name="61" href="#61">61</a> common(); -<a name="62" href="#62">62</a> Transformer.transform( -<a name="63" href="#63">63</a> TEMP, FILTERED, -<a name="64" href="#64">64</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a>[] { -<a name="65" href="#65">65</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/LineNumberFilter.html">LineNumberFilter</a>(), -<a name="66" href="#66">66</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/XMLTimestampFilter.html">XMLTimestampFilter</a>(), -<a name="67" href="#67">67</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/JunitTestRunnerFilter.html">JunitTestRunnerFilter</a>(), -<a name="68" href="#68">68</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/SunReflectFilter.html">SunReflectFilter</a>() -<a name="69" href="#69">69</a> }); -<a name="70" href="#70">70</a> assertTrue(Compare.compare(FILTERED, <span class="string">"witness/xmlLayout.1"</span>)); -<a name="71" href="#71">71</a> } -<a name="72" href="#72">72</a> -<a name="73" href="#73">73</a> <strong>public</strong> <strong>void</strong> locationInfo() throws Exception { -<a name="74" href="#74">74</a> XMLLayout xmlLayout = <strong>new</strong> XMLLayout(); -<a name="75" href="#75">75</a> xmlLayout.setLocationInfo(<strong>true</strong>); -<a name="76" href="#76">76</a> root.addAppender(<strong>new</strong> FileAppender(xmlLayout, TEMP, false)); -<a name="77" href="#77">77</a> common(); -<a name="78" href="#78">78</a> Transformer.transform( -<a name="79" href="#79">79</a> TEMP, FILTERED, -<a name="80" href="#80">80</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a>[] { -<a name="81" href="#81">81</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/LineNumberFilter.html">LineNumberFilter</a>(), -<a name="82" href="#82">82</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/XMLTimestampFilter.html">XMLTimestampFilter</a>(), -<a name="83" href="#83">83</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/XMLLineAttributeFilter.html">XMLLineAttributeFilter</a>(), -<a name="84" href="#84">84</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/JunitTestRunnerFilter.html">JunitTestRunnerFilter</a>(), -<a name="85" href="#85">85</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/SunReflectFilter.html">SunReflectFilter</a>() -<a name="86" href="#86">86</a> }); -<a name="87" href="#87">87</a> assertTrue(Compare.compare(FILTERED, <span class="string">"witness/xmlLayout.2"</span>)); -<a name="88" href="#88">88</a> } -<a name="89" href="#89">89</a> -<a name="90" href="#90">90</a> <strong>public</strong> <strong>void</strong> testCDATA() throws Exception { -<a name="91" href="#91">91</a> XMLLayout xmlLayout = <strong>new</strong> XMLLayout(); -<a name="92" href="#92">92</a> xmlLayout.setLocationInfo(<strong>true</strong>); -<a name="93" href="#93">93</a> root.addAppender(<strong>new</strong> FileAppender(xmlLayout, TEMP, false)); -<a name="94" href="#94">94</a> -<a name="95" href="#95">95</a> String oldThreadName = Thread.currentThread().getName(); -<a name="96" href="#96">96</a> Thread.currentThread().setName(<span class="string">"main"</span>); -<a name="97" href="#97">97</a> -<a name="98" href="#98">98</a> logger.trace(<span class="string">"Message with embedded <![CDATA[<hello>hi</hello>]]>."</span>); -<a name="99" href="#99">99</a> logger.debug(<span class="string">"Message with embedded <![CDATA[<hello>hi</hello>]]>."</span>); -<a name="100" href="#100">100</a> -<a name="101" href="#101">101</a> Thread.currentThread().setName(oldThreadName); -<a name="102" href="#102">102</a> -<a name="103" href="#103">103</a> Transformer.transform( -<a name="104" href="#104">104</a> TEMP, FILTERED, -<a name="105" href="#105">105</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a>[] { -<a name="106" href="#106">106</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/LineNumberFilter.html">LineNumberFilter</a>(), -<a name="107" href="#107">107</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/XMLTimestampFilter.html">XMLTimestampFilter</a>(), -<a name="108" href="#108">108</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/XMLLineAttributeFilter.html">XMLLineAttributeFilter</a>(), -<a name="109" href="#109">109</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/SunReflectFilter.html">SunReflectFilter</a>(), -<a name="110" href="#110">110</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/JunitTestRunnerFilter.html">JunitTestRunnerFilter</a>() -<a name="111" href="#111">111</a> -<a name="112" href="#112">112</a> }); -<a name="113" href="#113">113</a> Transformer.transform(TEMP, FILTERED, <strong>new</strong> <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a>[] {<strong>new</strong> LineNumberFilter(), -<a name="114" href="#114">114</a> <strong>new</strong> XMLTimestampFilter(), -<a name="115" href="#115">115</a> <strong>new</strong> XMLLineAttributeFilter()}); -<a name="116" href="#116">116</a> assertTrue(Compare.compare(FILTERED, <span class="string">"witness/xmlLayout.3"</span>)); -<a name="117" href="#117">117</a> } -<a name="118" href="#118">118</a> -<a name="119" href="#119">119</a> <strong>public</strong> <strong>void</strong> testNull() throws Exception { -<a name="120" href="#120">120</a> XMLLayout xmlLayout = <strong>new</strong> XMLLayout(); -<a name="121" href="#121">121</a> root.addAppender(<strong>new</strong> FileAppender(xmlLayout, TEMP, false)); -<a name="122" href="#122">122</a> -<a name="123" href="#123">123</a> String oldThreadName = Thread.currentThread().getName(); -<a name="124" href="#124">124</a> Thread.currentThread().setName(<span class="string">"main"</span>); +<a name="43" href="#43">43</a> Logger root; +<a name="44" href="#44">44</a> Logger logger; +<a name="45" href="#45">45</a> +<a name="46" href="#46">46</a> <strong>public</strong> <a href="../../../../org/apache/log4j/xml/XMLLayoutTestCase.html">XMLLayoutTestCase</a>(String name) { +<a name="47" href="#47">47</a> <strong>super</strong>(name); +<a name="48" href="#48">48</a> } +<a name="49" href="#49">49</a> +<a name="50" href="#50">50</a> <strong>public</strong> <strong>void</strong> setUp() { +<a name="51" href="#51">51</a> root = Logger.getRootLogger(); +<a name="52" href="#52">52</a> root.setLevel(Level.TRACE); +<a name="53" href="#53">53</a> logger = Logger.getLogger(XMLLayoutTestCase.<strong>class</strong>); +<a name="54" href="#54">54</a> logger.setLevel(Level.TRACE); +<a name="55" href="#55">55</a> } +<a name="56" href="#56">56</a> +<a name="57" href="#57">57</a> <strong>public</strong> <strong>void</strong> tearDown() { +<a name="58" href="#58">58</a> root.getLoggerRepository().resetConfiguration(); +<a name="59" href="#59">59</a> } +<a name="60" href="#60">60</a> +<a name="61" href="#61">61</a> <strong>public</strong> <strong>void</strong> basic() throws Exception { +<a name="62" href="#62">62</a> XMLLayout xmlLayout = <strong>new</strong> XMLLayout(); +<a name="63" href="#63">63</a> root.addAppender(<strong>new</strong> FileAppender(xmlLayout, TEMP, false)); +<a name="64" href="#64">64</a> common(); +<a name="65" href="#65">65</a> Transformer.transform( +<a name="66" href="#66">66</a> TEMP, FILTERED, +<a name="67" href="#67">67</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a>[] { +<a name="68" href="#68">68</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/LineNumberFilter.html">LineNumberFilter</a>(), +<a name="69" href="#69">69</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/XMLTimestampFilter.html">XMLTimestampFilter</a>(), +<a name="70" href="#70">70</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/JunitTestRunnerFilter.html">JunitTestRunnerFilter</a>(), +<a name="71" href="#71">71</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/SunReflectFilter.html">SunReflectFilter</a>() +<a name="72" href="#72">72</a> }); +<a name="73" href="#73">73</a> assertTrue(Compare.compare(FILTERED, <span class="string">"witness/xmlLayout.1"</span>)); +<a name="74" href="#74">74</a> } +<a name="75" href="#75">75</a> +<a name="76" href="#76">76</a> <strong>public</strong> <strong>void</strong> locationInfo() throws Exception { +<a name="77" href="#77">77</a> XMLLayout xmlLayout = <strong>new</strong> XMLLayout(); +<a name="78" href="#78">78</a> xmlLayout.setLocationInfo(<strong>true</strong>); +<a name="79" href="#79">79</a> root.addAppender(<strong>new</strong> FileAppender(xmlLayout, TEMP, false)); +<a name="80" href="#80">80</a> common(); +<a name="81" href="#81">81</a> Transformer.transform( +<a name="82" href="#82">82</a> TEMP, FILTERED, +<a name="83" href="#83">83</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a>[] { +<a name="84" href="#84">84</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/LineNumberFilter.html">LineNumberFilter</a>(), +<a name="85" href="#85">85</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/XMLTimestampFilter.html">XMLTimestampFilter</a>(), +<a name="86" href="#86">86</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/XMLLineAttributeFilter.html">XMLLineAttributeFilter</a>(), +<a name="87" href="#87">87</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/JunitTestRunnerFilter.html">JunitTestRunnerFilter</a>(), +<a name="88" href="#88">88</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/SunReflectFilter.html">SunReflectFilter</a>() +<a name="89" href="#89">89</a> }); +<a name="90" href="#90">90</a> assertTrue(Compare.compare(FILTERED, <span class="string">"witness/xmlLayout.2"</span>)); +<a name="91" href="#91">91</a> } +<a name="92" href="#92">92</a> +<a name="93" href="#93">93</a> <strong>public</strong> <strong>void</strong> testCDATA() throws Exception { +<a name="94" href="#94">94</a> XMLLayout xmlLayout = <strong>new</strong> XMLLayout(); +<a name="95" href="#95">95</a> xmlLayout.setLocationInfo(<strong>true</strong>); +<a name="96" href="#96">96</a> root.addAppender(<strong>new</strong> FileAppender(xmlLayout, TEMP, false)); +<a name="97" href="#97">97</a> +<a name="98" href="#98">98</a> String oldThreadName = Thread.currentThread().getName(); +<a name="99" href="#99">99</a> Thread.currentThread().setName(<span class="string">"main"</span>); +<a name="100" href="#100">100</a> +<a name="101" href="#101">101</a> logger.trace(<span class="string">"Message with embedded <![CDATA[<hello>hi</hello>]]>."</span>); +<a name="102" href="#102">102</a> logger.debug(<span class="string">"Message with embedded <![CDATA[<hello>hi</hello>]]>."</span>); +<a name="103" href="#103">103</a> +<a name="104" href="#104">104</a> Thread.currentThread().setName(oldThreadName); +<a name="105" href="#105">105</a> +<a name="106" href="#106">106</a> Transformer.transform( +<a name="107" href="#107">107</a> TEMP, FILTERED, +<a name="108" href="#108">108</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a>[] { +<a name="109" href="#109">109</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/LineNumberFilter.html">LineNumberFilter</a>(), +<a name="110" href="#110">110</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/XMLTimestampFilter.html">XMLTimestampFilter</a>(), +<a name="111" href="#111">111</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/XMLLineAttributeFilter.html">XMLLineAttributeFilter</a>(), +<a name="112" href="#112">112</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/SunReflectFilter.html">SunReflectFilter</a>(), +<a name="113" href="#113">113</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/JunitTestRunnerFilter.html">JunitTestRunnerFilter</a>() +<a name="114" href="#114">114</a> +<a name="115" href="#115">115</a> }); +<a name="116" href="#116">116</a> Transformer.transform(TEMP, FILTERED, <strong>new</strong> <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a>[] {<strong>new</strong> LineNumberFilter(), +<a name="117" href="#117">117</a> <strong>new</strong> XMLTimestampFilter(), +<a name="118" href="#118">118</a> <strong>new</strong> XMLLineAttributeFilter()}); +<a name="119" href="#119">119</a> assertTrue(Compare.compare(FILTERED, <span class="string">"witness/xmlLayout.3"</span>)); +<a name="120" href="#120">120</a> } +<a name="121" href="#121">121</a> +<a name="122" href="#122">122</a> <strong>public</strong> <strong>void</strong> testNull() throws Exception { +<a name="123" href="#123">123</a> XMLLayout xmlLayout = <strong>new</strong> XMLLayout(); +<a name="124" href="#124">124</a> root.addAppender(<strong>new</strong> FileAppender(xmlLayout, TEMP, false)); <a name="125" href="#125">125</a> -<a name="126" href="#126">126</a> logger.debug(<span class="string">"hi"</span>); -<a name="127" href="#127">127</a> logger.debug(<strong>null</strong>); -<a name="128" href="#128">128</a> Exception e = <strong>new</strong> Exception((String) <strong>null</strong>); -<a name="129" href="#129">129</a> logger.debug(<span class="string">"hi"</span>, e); -<a name="130" href="#130">130</a> -<a name="131" href="#131">131</a> Thread.currentThread().setName(oldThreadName); -<a name="132" href="#132">132</a> -<a name="133" href="#133">133</a> Transformer.transform( -<a name="134" href="#134">134</a> TEMP, FILTERED, -<a name="135" href="#135">135</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a>[] { <strong>new</strong> LineNumberFilter(), -<a name="136" href="#136">136</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/XMLTimestampFilter.html">XMLTimestampFilter</a>(), -<a name="137" href="#137">137</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/JunitTestRunnerFilter.html">JunitTestRunnerFilter</a>(), -<a name="138" href="#138">138</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/SunReflectFilter.html">SunReflectFilter</a>()}); -<a name="139" href="#139">139</a> assertTrue(Compare.compare(FILTERED, <span class="string">"witness/xmlLayout.null"</span>)); -<a name="140" href="#140">140</a> } -<a name="141" href="#141">141</a> -<a name="142" href="#142">142</a> <strong>void</strong> common() { -<a name="143" href="#143">143</a> String oldThreadName = Thread.currentThread().getName(); -<a name="144" href="#144">144</a> Thread.currentThread().setName(<span class="string">"main"</span>); -<a name="145" href="#145">145</a> -<a name="146" href="#146">146</a> <strong>int</strong> i = -1; -<a name="147" href="#147">147</a> -<a name="148" href="#148">148</a> <strong>new</strong> X(); -<a name="149" href="#149">149</a> -<a name="150" href="#150">150</a> logger.trace(<span class="string">"Message "</span> + ++i); -<a name="151" href="#151">151</a> root.trace(<span class="string">"Message "</span> + i); -<a name="152" href="#152">152</a> -<a name="153" href="#153">153</a> logger.debug(<span class="string">"Message "</span> + ++i); -<a name="154" href="#154">154</a> root.debug(<span class="string">"Message "</span> + i); -<a name="155" href="#155">155</a> -<a name="156" href="#156">156</a> logger.info(<span class="string">"Message "</span> + ++i); -<a name="157" href="#157">157</a> root.info(<span class="string">"Message "</span> + i); -<a name="158" href="#158">158</a> -<a name="159" href="#159">159</a> logger.warn (<span class="string">"Message "</span> + ++i); -<a name="160" href="#160">160</a> root.warn(<span class="string">"Message "</span> + i); -<a name="161" href="#161">161</a> -<a name="162" href="#162">162</a> logger.error(<span class="string">"Message "</span> + ++i); -<a name="163" href="#163">163</a> root.error(<span class="string">"Message "</span> + i); -<a name="164" href="#164">164</a> -<a name="165" href="#165">165</a> logger.log(Level.FATAL, <span class="string">"Message "</span> + ++i); -<a name="166" href="#166">166</a> root.log(Level.FATAL, <span class="string">"Message "</span> + i); -<a name="167" href="#167">167</a> -<a name="168" href="#168">168</a> Exception e = <strong>new</strong> Exception(<span class="string">"Just testing"</span>); -<a name="169" href="#169">169</a> logger.debug(<span class="string">"Message "</span> + ++i, e); -<a name="170" href="#170">170</a> root.debug(<span class="string">"Message "</span> + i, e); -<a name="171" href="#171">171</a> -<a name="172" href="#172">172</a> logger.error(<span class="string">"Message "</span> + ++i, e); -<a name="173" href="#173">173</a> root.error(<span class="string">"Message "</span> + i, e); -<a name="174" href="#174">174</a> +<a name="126" href="#126">126</a> String oldThreadName = Thread.currentThread().getName(); +<a name="127" href="#127">127</a> Thread.currentThread().setName(<span class="string">"main"</span>); +<a name="128" href="#128">128</a> +<a name="129" href="#129">129</a> logger.debug(<span class="string">"hi"</span>); +<a name="130" href="#130">130</a> logger.debug(<strong>null</strong>); +<a name="131" href="#131">131</a> Exception e = <strong>new</strong> Exception((String) <strong>null</strong>); +<a name="132" href="#132">132</a> logger.debug(<span class="string">"hi"</span>, e); +<a name="133" href="#133">133</a> +<a name="134" href="#134">134</a> Thread.currentThread().setName(oldThreadName); +<a name="135" href="#135">135</a> +<a name="136" href="#136">136</a> Transformer.transform( +<a name="137" href="#137">137</a> TEMP, FILTERED, +<a name="138" href="#138">138</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a>[] { <strong>new</strong> LineNumberFilter(), +<a name="139" href="#139">139</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/XMLTimestampFilter.html">XMLTimestampFilter</a>(), +<a name="140" href="#140">140</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/JunitTestRunnerFilter.html">JunitTestRunnerFilter</a>(), +<a name="141" href="#141">141</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/SunReflectFilter.html">SunReflectFilter</a>()}); +<a name="142" href="#142">142</a> assertTrue(Compare.compare(FILTERED, <span class="string">"witness/xmlLayout.null"</span>)); +<a name="143" href="#143">143</a> } +<a name="144" href="#144">144</a> +<a name="145" href="#145">145</a> <em>/**<em>*</em></em> +<a name="146" href="#146">146</a> <em> * Tests the format of the MDC portion of the layout to ensure</em> +<a name="147" href="#147">147</a> <em> * the key-value pairs we put in turn up in the output file.</em> +<a name="148" href="#148">148</a> <em> * @throws Exception</em> +<a name="149" href="#149">149</a> <em> */</em> +<a name="150" href="#150">150</a> <strong>public</strong> <strong>void</strong> testMDC() throws Exception { +<a name="151" href="#151">151</a> XMLLayout xmlLayout = <strong>new</strong> XMLLayout(); +<a name="152" href="#152">152</a> xmlLayout.setProperties(<strong>true</strong>); +<a name="153" href="#153">153</a> root.addAppender(<strong>new</strong> FileAppender(xmlLayout, TEMP, false)); +<a name="154" href="#154">154</a> +<a name="155" href="#155">155</a> Hashtable context = MDC.getContext(); +<a name="156" href="#156">156</a> <strong>if</strong> (context != <strong>null</strong>) { +<a name="157" href="#157">157</a> context.clear(); +<a name="158" href="#158">158</a> } +<a name="159" href="#159">159</a> MDC.put(<span class="string">"key1"</span>, <span class="string">"val1"</span>); +<a name="160" href="#160">160</a> MDC.put(<span class="string">"key2"</span>, <span class="string">"val2"</span>); +<a name="161" href="#161">161</a> +<a name="162" href="#162">162</a> logger.debug(<span class="string">"Hello"</span>); +<a name="163" href="#163">163</a> Transformer.transform( +<a name="164" href="#164">164</a> TEMP, FILTERED, +<a name="165" href="#165">165</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a>[] { <strong>new</strong> LineNumberFilter(), +<a name="166" href="#166">166</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/JunitTestRunnerFilter.html">JunitTestRunnerFilter</a>(), +<a name="167" href="#167">167</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/XMLTimestampFilter.html">XMLTimestampFilter</a>()}); +<a name="168" href="#168">168</a> assertTrue(Compare.compare(FILTERED, <span class="string">"witness/xmlLayout.mdc.1"</span>)); +<a name="169" href="#169">169</a> } +<a name="170" href="#170">170</a> +<a name="171" href="#171">171</a> <strong>public</strong> <strong>void</strong> testMDCEscaped() throws Exception { +<a name="172" href="#172">172</a> XMLLayout xmlLayout = <strong>new</strong> XMLLayout(); +<a name="173" href="#173">173</a> xmlLayout.setProperties(<strong>true</strong>); +<a name="174" href="#174">174</a> root.addAppender(<strong>new</strong> FileAppender(xmlLayout, TEMP, false)); <a name="175" href="#175">175</a> -<a name="176" href="#176">176</a> Thread.currentThread().setName(oldThreadName); -<a name="177" href="#177">177</a> } -<a name="178" href="#178">178</a> -<a name="179" href="#179">179</a> <strong>public</strong> <strong>static</strong> Test suite() { -<a name="180" href="#180">180</a> TestSuite suite = <strong>new</strong> TestSuite(); -<a name="181" href="#181">181</a> suite.addTest(<strong>new</strong> <a href="../../../../org/apache/log4j/xml/XMLLayoutTestCase.html">XMLLayoutTestCase</a>(<span class="string">"basic"</span>)); -<a name="182" href="#182">182</a> suite.addTest(<strong>new</strong> <a href="../../../../org/apache/log4j/xml/XMLLayoutTestCase.html">XMLLayoutTestCase</a>(<span class="string">"locationInfo"</span>)); -<a name="183" href="#183">183</a> suite.addTest(<strong>new</strong> <a href="../../../../org/apache/log4j/xml/XMLLayoutTestCase.html">XMLLayoutTestCase</a>(<span class="string">"testCDATA"</span>)); -<a name="184" href="#184">184</a> suite.addTest(<strong>new</strong> <a href="../../../../org/apache/log4j/xml/XMLLayoutTestCase.html">XMLLayoutTestCase</a>(<span class="string">"testNull"</span>)); -<a name="185" href="#185">185</a> <strong>return</strong> suite; -<a name="186" href="#186">186</a> } -<a name="187" href="#187">187</a> -<a name="188" href="#188">188</a> -<a name="189" href="#189">189</a> <strong>class</strong> X { -<a name="190" href="#190">190</a> Logger logger = Logger.getLogger(X.<strong>class</strong>); -<a name="191" href="#191">191</a> <strong>public</strong> X() { -<a name="192" href="#192">192</a> logger.info(<span class="string">"in X() constructor"</span>); -<a name="193" href="#193">193</a> } -<a name="194" href="#194">194</a> } -<a name="195" href="#195">195</a> } +<a name="176" href="#176">176</a> Hashtable context = MDC.getContext(); +<a name="177" href="#177">177</a> <strong>if</strong> (context != <strong>null</strong>) { +<a name="178" href="#178">178</a> context.clear(); +<a name="179" href="#179">179</a> } +<a name="180" href="#180">180</a> MDC.put(<span class="string">"blahAttribute"</span>, <span class="string">"<blah value='blah'>"</span>); +<a name="181" href="#181">181</a> MDC.put(<span class="string">"<blahKey value='blah'/>"</span>, <span class="string">"blahValue"</span>); +<a name="182" href="#182">182</a> +<a name="183" href="#183">183</a> logger.debug(<span class="string">"Hello"</span>); +<a name="184" href="#184">184</a> Transformer.transform( +<a name="185" href="#185">185</a> TEMP, FILTERED, +<a name="186" href="#186">186</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/Filter.html">Filter</a>[] { <strong>new</strong> LineNumberFilter(), +<a name="187" href="#187">187</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/JunitTestRunnerFilter.html">JunitTestRunnerFilter</a>(), +<a name="188" href="#188">188</a> <strong>new</strong> <a href="../../../../org/apache/log4j/util/XMLTimestampFilter.html">XMLTimestampFilter</a>() }); +<a name="189" href="#189">189</a> assertTrue(Compare.compare(FILTERED, <span class="string">"witness/xmlLayout.mdc.2"</span>)); +<a name="190" href="#190">190</a> } +<a name="191" href="#191">191</a> +<a name="192" href="#192">192</a> +<a name="193" href="#193">193</a> <strong>void</strong> common() { +<a name="194" href="#194">194</a> String oldThreadName = Thread.currentThread().getName(); +<a name="195" href="#195">195</a> Thread.currentThread().setName(<span class="string">"main"</span>); +<a name="196" href="#196">196</a> +<a name="197" href="#197">197</a> <strong>int</strong> i = -1; +<a name="198" href="#198">198</a> +<a name="199" href="#199">199</a> <strong>new</strong> X(); +<a name="200" href="#200">200</a> +<a name="201" href="#201">201</a> logger.trace(<span class="string">"Message "</span> + ++i); +<a name="202" href="#202">202</a> root.trace(<span class="string">"Message "</span> + i); +<a name="203" href="#203">203</a> +<a name="204" href="#204">204</a> logger.debug(<span class="string">"Message "</span> + ++i); +<a name="205" href="#205">205</a> root.debug(<span class="string">"Message "</span> + i); +<a name="206" href="#206">206</a> +<a name="207" href="#207">207</a> logger.info(<span class="string">"Message "</span> + ++i); +<a name="208" href="#208">208</a> root.info(<span class="string">"Message "</span> + i); +<a name="209" href="#209">209</a> +<a name="210" href="#210">210</a> logger.warn (<span class="string">"Message "</span> + ++i); +<a name="211" href="#211">211</a> root.warn(<span class="string">"Message "</span> + i); +<a name="212" href="#212">212</a> +<a name="213" href="#213">213</a> logger.error(<span class="string">"Message "</span> + ++i); +<a name="214" href="#214">214</a> root.error(<span class="string">"Message "</span> + i); +<a name="215" href="#215">215</a> +<a name="216" href="#216">216</a> logger.log(Level.FATAL, <span class="string">"Message "</span> + ++i); +<a name="217" href="#217">217</a> root.log(Level.FATAL, <span class="string">"Message "</span> + i); +<a name="218" href="#218">218</a> +<a name="219" href="#219">219</a> Exception e = <strong>new</strong> Exception(<span class="string">"Just testing"</span>); +<a name="220" href="#220">220</a> logger.debug(<span class="string">"Message "</span> + ++i, e); +<a name="221" href="#221">221</a> root.debug(<span class="string">"Message "</span> + i, e); +<a name="222" href="#222">222</a> +<a name="223" href="#223">223</a> logger.error(<span class="string">"Message "</span> + ++i, e); +<a name="224" href="#224">224</a> root.error(<span class="string">"Message "</span> + i, e); +<a name="225" href="#225">225</a> +<a name="226" href="#226">226</a> +<a name="227" href="#227">227</a> Thread.currentThread().setName(oldThreadName); +<a name="228" href="#228">228</a> } +<a name="229" href="#229">229</a> +<a name="230" href="#230">230</a> <strong>public</strong> <strong>static</strong> Test suite() { +<a name="231" href="#231">231</a> TestSuite suite = <strong>new</strong> TestSuite(); +<a name="232" href="#232">232</a> suite.addTest(<strong>new</strong> <a href="../../../../org/apache/log4j/xml/XMLLayoutTestCase.html">XMLLayoutTestCase</a>(<span class="string">"basic"</span>)); +<a name="233" href="#233">233</a> suite.addTest(<strong>new</strong> <a href="../../../../org/apache/log4j/xml/XMLLayoutTestCase.html">XMLLayoutTestCase</a>(<span class="string">"locationInfo"</span>)); +<a name="234" href="#234">234</a> suite.addTest(<strong>new</strong> <a href="../../../../org/apache/log4j/xml/XMLLayoutTestCase.html">XMLLayoutTestCase</a>(<span class="string">"testCDATA"</span>)); +<a name="235" href="#235">235</a> suite.addTest(<strong>new</strong> <a href="../../../../org/apache/log4j/xml/XMLLayoutTestCase.html">XMLLayoutTestCase</a>(<span class="string">"testNull"</span>)); +<a name="236" href="#236">236</a> suite.addTest(<strong>new</strong> <a href="../../../../org/apache/log4j/xml/XMLLayoutTestCase.html">XMLLayoutTestCase</a>(<span class="string">"testMDC"</span>)); +<a name="237" href="#237">237</a> suite.addTest(<strong>new</strong> <a href="../../../../org/apache/log4j/xml/XMLLayoutTestCase.html">XMLLayoutTestCase</a>(<span class="string">"testMDCEscaped"</span>)); +<a name="238" href="#238">238</a> <strong>return</strong> suite; +<a name="239" href="#239">239</a> } +<a name="240" href="#240">240</a> +<a name="241" href="#241">241</a> +<a name="242" href="#242">242</a> <strong>class</strong> X { +<a name="243" href="#243">243</a> Logger logger = Logger.getLogger(X.<strong>class</strong>); +<a name="244" href="#244">244</a> <strong>public</strong> X() { +<a name="245" href="#245">245</a> logger.info(<span class="string">"in X() constructor"</span>); +<a name="246" href="#246">246</a> } +<a name="247" href="#247">247</a> } +<a name="248" href="#248">248</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/1.2/xref-test/org/apache/log4j/xml/package-frame.html URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/1.2/xref-test/org/apache/log4j/xml/package-frame.html?rev=569613&r1=569612&r2=569613&view=diff ============================================================================== --- logging/site/trunk/docs/log4j/1.2/xref-test/org/apache/log4j/xml/package-frame.html (original) +++ logging/site/trunk/docs/log4j/1.2/xref-test/org/apache/log4j/xml/package-frame.html Fri Aug 24 21:22:14 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 Log4j 1.2.16-SNAPSHOT Reference Package org.apache.log4j.xml</title> + <title>Apache Log4j 1.2.15 Reference Package org.apache.log4j.xml</title> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" /> </head> <body> Modified: logging/site/trunk/docs/log4j/1.2/xref-test/org/apache/log4j/xml/package-summary.html URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/1.2/xref-test/org/apache/log4j/xml/package-summary.html?rev=569613&r1=569612&r2=569613&view=diff ============================================================================== --- logging/site/trunk/docs/log4j/1.2/xref-test/org/apache/log4j/xml/package-summary.html (original) +++ logging/site/trunk/docs/log4j/1.2/xref-test/org/apache/log4j/xml/package-summary.html Fri Aug 24 21:22:14 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 Log4j 1.2.16-SNAPSHOT Reference Package $name</title> + <title>Apache Log4j 1.2.15 Reference Package $name</title> <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" /> </head> <body> Modified: logging/site/trunk/docs/log4j/1.2/xref-test/overview-frame.html URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/1.2/xref-test/overview-frame.html?rev=569613&r1=569612&r2=569613&view=diff ============================================================================== --- logging/site/trunk/docs/log4j/1.2/xref-test/overview-frame.html (original) +++ logging/site/trunk/docs/log4j/1.2/xref-test/overview-frame.html Fri Aug 24 21:22:14 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 Log4j 1.2.16-SNAPSHOT Reference</title> + <title>Apache Log4j 1.2.15 Reference</title> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" /> </head> <body> Modified: logging/site/trunk/docs/log4j/1.2/xref-test/overview-summary.html URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/1.2/xref-test/overview-summary.html?rev=569613&r1=569612&r2=569613&view=diff ============================================================================== --- logging/site/trunk/docs/log4j/1.2/xref-test/overview-summary.html (original) +++ logging/site/trunk/docs/log4j/1.2/xref-test/overview-summary.html Fri Aug 24 21:22:14 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 Log4j 1.2.16-SNAPSHOT Reference</title> + <title>Apache Log4j 1.2.15 Reference</title> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" /> </head> <body> @@ -24,7 +24,7 @@ </ul> </div> - <h2>Apache Log4j 1.2.16-SNAPSHOT Reference</h2> + <h2>Apache Log4j 1.2.15 Reference</h2> <table class="summary"> <thead> Modified: logging/site/trunk/docs/log4j/1.2/xref/allclasses-frame.html URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/1.2/xref/allclasses-frame.html?rev=569613&r1=569612&r2=569613&view=diff ============================================================================== --- logging/site/trunk/docs/log4j/1.2/xref/allclasses-frame.html (original) +++ logging/site/trunk/docs/log4j/1.2/xref/allclasses-frame.html Fri Aug 24 21:22:14 2007 @@ -333,6 +333,12 @@ <a href="org/apache/log4j/NDC.html" target="classFrame">NDC</a> </li> <li> + <a href="org/apache/log4j/spi/NOPLogger.html" target="classFrame">NOPLogger</a> + </li> + <li> + <a href="org/apache/log4j/spi/NOPLoggerRepository.html" target="classFrame">NOPLoggerRepository</a> + </li> + <li> <a href="org/apache/log4j/nt/NTEventLogAppender.html" target="classFrame">NTEventLogAppender</a> </li> <li> Modified: logging/site/trunk/docs/log4j/1.2/xref/index.html URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/1.2/xref/index.html?rev=569613&r1=569612&r2=569613&view=diff ============================================================================== --- logging/site/trunk/docs/log4j/1.2/xref/index.html (original) +++ logging/site/trunk/docs/log4j/1.2/xref/index.html Fri Aug 24 21:22:14 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 Log4j 1.2.16-SNAPSHOT Reference</title> + <title>Apache Log4j 1.2.15 Reference</title> </head> <frameset cols="20%,80%"> <frameset rows="30%,70%">
