Modified: logging/site/trunk/docs/log4j/1.2/xref/org/apache/log4j/xml/Log4jEntityResolver.html URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/1.2/xref/org/apache/log4j/xml/Log4jEntityResolver.html?rev=569613&r1=569612&r2=569613&view=diff ============================================================================== --- logging/site/trunk/docs/log4j/1.2/xref/org/apache/log4j/xml/Log4jEntityResolver.html (original) +++ logging/site/trunk/docs/log4j/1.2/xref/org/apache/log4j/xml/Log4jEntityResolver.html Fri Aug 24 21:22:14 2007 @@ -31,27 +31,27 @@ <a name="22" href="#22">22</a> <strong>import</strong> org.xml.sax.InputSource; <a name="23" href="#23">23</a> <a name="24" href="#24">24</a> <strong>import</strong> java.io.InputStream; -<a name="25" href="#25">25</a> -<a name="26" href="#26">26</a> <em>/**<em>*</em></em> -<a name="27" href="#27">27</a> <em> * An [EMAIL PROTECTED] EntityResolver} specifically designed to return</em> -<a name="28" href="#28">28</a> <em> * <code>log4j.dtd</code> which is embedded within the log4j jar</em> -<a name="29" href="#29">29</a> <em> * file. </em> -<a name="30" href="#30">30</a> <em> *</em> -<a name="31" href="#31">31</a> <em> * @author Paul Austin</em> -<a name="32" href="#32">32</a> <em> * */</em> -<a name="33" href="#33">33</a> <strong>public</strong> <strong>class</strong> Log4jEntityResolver implements EntityResolver { -<a name="34" href="#34">34</a> -<a name="35" href="#35">35</a> <strong>public</strong> InputSource resolveEntity (String <strong>public</strong>Id, String systemId) { -<a name="36" href="#36">36</a> <strong>if</strong> (systemId.endsWith(<span class="string">"log4j.dtd"</span>)) { -<a name="37" href="#37">37</a> Class clazz = getClass(); -<a name="38" href="#38">38</a> InputStream in = clazz.getResourceAsStream(<span class="string">"/org/apache/log4j/xml/log4j.dtd"</span>); -<a name="39" href="#39">39</a> <strong>if</strong> (in == <strong>null</strong>) { -<a name="40" href="#40">40</a> LogLog.error(<span class="string">"Could not find [log4j.dtd]. Used ["</span> + clazz.getClassLoader() -<a name="41" href="#41">41</a> + <span class="string">"] class loader in the search."</span>); -<a name="42" href="#42">42</a> <strong>return</strong> <strong>null</strong>; -<a name="43" href="#43">43</a> } <strong>else</strong> { -<a name="44" href="#44">44</a> <strong>return</strong> <strong>new</strong> InputSource(in); -<a name="45" href="#45">45</a> } +<a name="25" href="#25">25</a> <strong>import</strong> java.io.ByteArrayInputStream; +<a name="26" href="#26">26</a> +<a name="27" href="#27">27</a> <em>/**<em>*</em></em> +<a name="28" href="#28">28</a> <em> * An [EMAIL PROTECTED] EntityResolver} specifically designed to return</em> +<a name="29" href="#29">29</a> <em> * <code>log4j.dtd</code> which is embedded within the log4j jar</em> +<a name="30" href="#30">30</a> <em> * file. </em> +<a name="31" href="#31">31</a> <em> *</em> +<a name="32" href="#32">32</a> <em> * @author Paul Austin</em> +<a name="33" href="#33">33</a> <em> * */</em> +<a name="34" href="#34">34</a> <strong>public</strong> <strong>class</strong> Log4jEntityResolver implements EntityResolver { +<a name="35" href="#35">35</a> +<a name="36" href="#36">36</a> <strong>public</strong> InputSource resolveEntity (String <strong>public</strong>Id, String systemId) { +<a name="37" href="#37">37</a> <strong>if</strong> (systemId.endsWith(<span class="string">"log4j.dtd"</span>)) { +<a name="38" href="#38">38</a> Class clazz = getClass(); +<a name="39" href="#39">39</a> InputStream in = clazz.getResourceAsStream(<span class="string">"/org/apache/log4j/xml/log4j.dtd"</span>); +<a name="40" href="#40">40</a> <strong>if</strong> (in == <strong>null</strong>) { +<a name="41" href="#41">41</a> LogLog.warn(<span class="string">"Could not find [log4j.dtd] using ["</span> + clazz.getClassLoader() +<a name="42" href="#42">42</a> + <span class="string">"] class loader, parsed without DTD."</span>); +<a name="43" href="#43">43</a> in = <strong>new</strong> ByteArrayInputStream(<strong>new</strong> byte[0]); +<a name="44" href="#44">44</a> } +<a name="45" href="#45">45</a> <strong>return</strong> <strong>new</strong> InputSource(in); <a name="46" href="#46">46</a> } <strong>else</strong> { <a name="47" href="#47">47</a> <strong>return</strong> <strong>null</strong>; <a name="48" href="#48">48</a> }
Modified: logging/site/trunk/docs/log4j/1.2/xref/org/apache/log4j/xml/XMLLayout.html URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/1.2/xref/org/apache/log4j/xml/XMLLayout.html?rev=569613&r1=569612&r2=569613&view=diff ============================================================================== --- logging/site/trunk/docs/log4j/1.2/xref/org/apache/log4j/xml/XMLLayout.html (original) +++ logging/site/trunk/docs/log4j/1.2/xref/org/apache/log4j/xml/XMLLayout.html Fri Aug 24 21:22:14 2007 @@ -33,148 +33,194 @@ <a name="24" href="#24">24</a> <strong>import</strong> org.apache.log4j.spi.LocationInfo; <a name="25" href="#25">25</a> <strong>import</strong> org.apache.log4j.spi.LoggingEvent; <a name="26" href="#26">26</a> -<a name="27" href="#27">27</a> <em>/**<em>*</em></em> -<a name="28" href="#28">28</a> <em> * The output of the XMLLayout consists of a series of log4j:event</em> -<a name="29" href="#29">29</a> <em> * elements as defined in the <a</em> -<a name="30" href="#30">30</a> <em> * href="log4j.dtd">log4j.dtd</a>. It does not output a</em> -<a name="31" href="#31">31</a> <em> * complete well-formed XML file. The output is designed to be</em> -<a name="32" href="#32">32</a> <em> * included as an <em>external entity</em> in a separate file to form</em> -<a name="33" href="#33">33</a> <em> * a correct XML file.</em> -<a name="34" href="#34">34</a> <em> *</em> -<a name="35" href="#35">35</a> <em> * <p>For example, if <code>abc</code> is the name of the file where</em> -<a name="36" href="#36">36</a> <em> * the XMLLayout ouput goes, then a well-formed XML file would be:</em> +<a name="27" href="#27">27</a> <strong>import</strong> java.util.Set; +<a name="28" href="#28">28</a> <strong>import</strong> java.util.Arrays; +<a name="29" href="#29">29</a> +<a name="30" href="#30">30</a> <em>/**<em>*</em></em> +<a name="31" href="#31">31</a> <em> * The output of the XMLLayout consists of a series of log4j:event</em> +<a name="32" href="#32">32</a> <em> * elements as defined in the <a</em> +<a name="33" href="#33">33</a> <em> * href="log4j.dtd">log4j.dtd</a>. It does not output a</em> +<a name="34" href="#34">34</a> <em> * complete well-formed XML file. The output is designed to be</em> +<a name="35" href="#35">35</a> <em> * included as an <em>external entity</em> in a separate file to form</em> +<a name="36" href="#36">36</a> <em> * a correct XML file.</em> <a name="37" href="#37">37</a> <em> *</em> -<a name="38" href="#38">38</a> <em> <pre></em> -<a name="39" href="#39">39</a> <em> &lt;?xml version="1.0" ?&gt;</em> -<a name="40" href="#40">40</a> <em> </em> -<a name="41" href="#41">41</a> <em> &lt;!DOCTYPE log4j:eventSet SYSTEM "log4j.dtd" [&lt;!ENTITY data SYSTEM "abc"&gt;]&gt;</em> -<a name="42" href="#42">42</a> <em> </em> -<a name="43" href="#43">43</a> <em> &lt;log4j:eventSet version="1.2" xmlns:log4j="<a href="http://jakarta.apache.org/log4j/"; target="alexandria_uri">http://jakarta.apache.org/log4j/</a>"&gt;</em> -<a name="44" href="#44">44</a> <em> &nbsp;&nbsp;&data;</em> -<a name="45" href="#45">45</a> <em> &lt;/log4j:eventSet&gt;</em> -<a name="46" href="#46">46</a> <em> </pre></em> -<a name="47" href="#47">47</a> <em> </em> -<a name="48" href="#48">48</a> <em> * <p>This approach enforces the independence of the XMLLayout and the</em> -<a name="49" href="#49">49</a> <em> * appender where it is embedded.</em> -<a name="50" href="#50">50</a> <em> *</em> -<a name="51" href="#51">51</a> <em> * <p>The <code>version</code> attribute helps components to correctly</em> -<a name="52" href="#52">52</a> <em> * intrepret output generated by XMLLayout. The value of this</em> -<a name="53" href="#53">53</a> <em> * attribute should be "1.1" for output generated by log4j versions</em> -<a name="54" href="#54">54</a> <em> * prior to log4j 1.2 (final release) and "1.2" for relase 1.2 and</em> -<a name="55" href="#55">55</a> <em> * later.</em> -<a name="56" href="#56">56</a> <em> *</em> -<a name="57" href="#57">57</a> <em> * @author Ceki G&uuml;lc&uuml;</em> -<a name="58" href="#58">58</a> <em> * @since 0.9.0 </em> -<a name="59" href="#59">59</a> <em> * */</em> -<a name="60" href="#60">60</a> <strong>public</strong> <strong>class</strong> <a href="../../../../org/apache/log4j/xml/XMLLayout.html">XMLLayout</a> <strong>extends</strong> <a href="../../../../org/apache/log4j/Layout.html">Layout</a> { -<a name="61" href="#61">61</a> -<a name="62" href="#62">62</a> <strong>private</strong> <strong>final</strong> <strong>int</strong> DEFAULT_SIZE = 256; -<a name="63" href="#63">63</a> <strong>private</strong> <strong>final</strong> <strong>int</strong> UPPER_LIMIT = 2048; -<a name="64" href="#64">64</a> -<a name="65" href="#65">65</a> <strong>private</strong> StringBuffer buf = <strong>new</strong> StringBuffer(DEFAULT_SIZE); -<a name="66" href="#66">66</a> <strong>private</strong> <strong>boolean</strong> locationInfo = false; -<a name="67" href="#67">67</a> -<a name="68" href="#68">68</a> <em>/**<em>*</em></em> -<a name="69" href="#69">69</a> <em> * The <b>LocationInfo</b> option takes a boolean value. By default,</em> -<a name="70" href="#70">70</a> <em> * it is set to false which means there will be no location</em> -<a name="71" href="#71">71</a> <em> * information output by this layout. If the the option is set to</em> -<a name="72" href="#72">72</a> <em> * true, then the file name and line number of the statement at the</em> -<a name="73" href="#73">73</a> <em> * origin of the log statement will be output.</em> -<a name="74" href="#74">74</a> <em> *</em> -<a name="75" href="#75">75</a> <em> * <p>If you are embedding this layout within an [EMAIL PROTECTED]</em> -<a name="76" href="#76">76</a> <em> * org.apache.log4j.net.SMTPAppender} then make sure to set the</em> -<a name="77" href="#77">77</a> <em> * <b>LocationInfo</b> option of that appender as well.</em> -<a name="78" href="#78">78</a> <em> * */</em> -<a name="79" href="#79">79</a> <strong>public</strong> <strong>void</strong> setLocationInfo(<strong>boolean</strong> flag) { -<a name="80" href="#80">80</a> locationInfo = flag; -<a name="81" href="#81">81</a> } -<a name="82" href="#82">82</a> -<a name="83" href="#83">83</a> <em>/**<em>*</em></em> -<a name="84" href="#84">84</a> <em> Returns the current value of the <b>LocationInfo</b> option.</em> -<a name="85" href="#85">85</a> <em> */</em> -<a name="86" href="#86">86</a> <strong>public</strong> <strong>boolean</strong> getLocationInfo() { -<a name="87" href="#87">87</a> <strong>return</strong> locationInfo; -<a name="88" href="#88">88</a> } -<a name="89" href="#89">89</a> -<a name="90" href="#90">90</a> <em>/**<em>* No options to activate. */</em></em> -<a name="91" href="#91">91</a> <strong>public</strong> <strong>void</strong> activateOptions() { -<a name="92" href="#92">92</a> } -<a name="93" href="#93">93</a> -<a name="94" href="#94">94</a> -<a name="95" href="#95">95</a> <em>/**<em>*</em></em> -<a name="96" href="#96">96</a> <em> * Formats a [EMAIL PROTECTED] org.apache.log4j.spi.LoggingEvent} in conformance with the log4j.dtd.</em> -<a name="97" href="#97">97</a> <em> * */</em> -<a name="98" href="#98">98</a> <strong>public</strong> String format(<a href="../../../../org/apache/log4j/spi/LoggingEvent.html">LoggingEvent</a> event) { -<a name="99" href="#99">99</a> -<a name="100" href="#100">100</a> <em class="comment">// Reset working buffer. If the buffer is too large, then we need a new</em> -<a name="101" href="#101">101</a> <em class="comment">// one in order to avoid the penalty of creating a large array.</em> -<a name="102" href="#102">102</a> <strong>if</strong>(buf.capacity() > UPPER_LIMIT) { -<a name="103" href="#103">103</a> buf = <strong>new</strong> StringBuffer(DEFAULT_SIZE); -<a name="104" href="#104">104</a> } <strong>else</strong> { -<a name="105" href="#105">105</a> buf.setLength(0); -<a name="106" href="#106">106</a> } -<a name="107" href="#107">107</a> -<a name="108" href="#108">108</a> <em class="comment">// We yield to the \r\n heresy.</em> -<a name="109" href="#109">109</a> -<a name="110" href="#110">110</a> buf.append(<span class="string">"<log4j:event logger=\""</span>); -<a name="111" href="#111">111</a> buf.append(event.getLoggerName()); -<a name="112" href="#112">112</a> buf.append(<span class="string">"\" timestamp=\""</span>); -<a name="113" href="#113">113</a> buf.append(event.timeStamp); -<a name="114" href="#114">114</a> buf.append(<span class="string">"\" level=\""</span>); -<a name="115" href="#115">115</a> buf.append(event.getLevel()); -<a name="116" href="#116">116</a> buf.append(<span class="string">"\" thread=\""</span>); -<a name="117" href="#117">117</a> buf.append(event.getThreadName()); -<a name="118" href="#118">118</a> buf.append(<span class="string">"\">\r\n"</span>); +<a name="38" href="#38">38</a> <em> * <p>For example, if <code>abc</code> is the name of the file where</em> +<a name="39" href="#39">39</a> <em> * the XMLLayout ouput goes, then a well-formed XML file would be:</em> +<a name="40" href="#40">40</a> <em> *</em> +<a name="41" href="#41">41</a> <em> <pre></em> +<a name="42" href="#42">42</a> <em> &lt;?xml version="1.0" ?&gt;</em> +<a name="43" href="#43">43</a> <em> </em> +<a name="44" href="#44">44</a> <em> &lt;!DOCTYPE log4j:eventSet SYSTEM "log4j.dtd" [&lt;!ENTITY data SYSTEM "abc"&gt;]&gt;</em> +<a name="45" href="#45">45</a> <em> </em> +<a name="46" href="#46">46</a> <em> &lt;log4j:eventSet version="1.2" xmlns:log4j="<a href="http://jakarta.apache.org/log4j/"; target="alexandria_uri">http://jakarta.apache.org/log4j/</a>"&gt;</em> +<a name="47" href="#47">47</a> <em> &nbsp;&nbsp;&data;</em> +<a name="48" href="#48">48</a> <em> &lt;/log4j:eventSet&gt;</em> +<a name="49" href="#49">49</a> <em> </pre></em> +<a name="50" href="#50">50</a> <em> </em> +<a name="51" href="#51">51</a> <em> * <p>This approach enforces the independence of the XMLLayout and the</em> +<a name="52" href="#52">52</a> <em> * appender where it is embedded.</em> +<a name="53" href="#53">53</a> <em> *</em> +<a name="54" href="#54">54</a> <em> * <p>The <code>version</code> attribute helps components to correctly</em> +<a name="55" href="#55">55</a> <em> * intrepret output generated by XMLLayout. The value of this</em> +<a name="56" href="#56">56</a> <em> * attribute should be "1.1" for output generated by log4j versions</em> +<a name="57" href="#57">57</a> <em> * prior to log4j 1.2 (final release) and "1.2" for relase 1.2 and</em> +<a name="58" href="#58">58</a> <em> * later.</em> +<a name="59" href="#59">59</a> <em> *</em> +<a name="60" href="#60">60</a> <em> * Appenders using this layout should have their encoding</em> +<a name="61" href="#61">61</a> <em> * set to UTF-8 or UTF-16, otherwise events containing</em> +<a name="62" href="#62">62</a> <em> * non ASCII characters could result in corrupted</em> +<a name="63" href="#63">63</a> <em> * log files. </em> +<a name="64" href="#64">64</a> <em> *</em> +<a name="65" href="#65">65</a> <em> * @author Ceki G&uuml;lc&uuml;</em> +<a name="66" href="#66">66</a> <em> * @since 0.9.0 </em> +<a name="67" href="#67">67</a> <em> * */</em> +<a name="68" href="#68">68</a> <strong>public</strong> <strong>class</strong> <a href="../../../../org/apache/log4j/xml/XMLLayout.html">XMLLayout</a> <strong>extends</strong> <a href="../../../../org/apache/log4j/Layout.html">Layout</a> { +<a name="69" href="#69">69</a> +<a name="70" href="#70">70</a> <strong>private</strong> <strong>final</strong> <strong>int</strong> DEFAULT_SIZE = 256; +<a name="71" href="#71">71</a> <strong>private</strong> <strong>final</strong> <strong>int</strong> UPPER_LIMIT = 2048; +<a name="72" href="#72">72</a> +<a name="73" href="#73">73</a> <strong>private</strong> StringBuffer buf = <strong>new</strong> StringBuffer(DEFAULT_SIZE); +<a name="74" href="#74">74</a> <strong>private</strong> <strong>boolean</strong> locationInfo = false; +<a name="75" href="#75">75</a> <strong>private</strong> <strong>boolean</strong> properties = false; +<a name="76" href="#76">76</a> +<a name="77" href="#77">77</a> <em>/**<em>*</em></em> +<a name="78" href="#78">78</a> <em> * The <b>LocationInfo</b> option takes a boolean value. By default,</em> +<a name="79" href="#79">79</a> <em> * it is set to false which means there will be no location</em> +<a name="80" href="#80">80</a> <em> * information output by this layout. If the the option is set to</em> +<a name="81" href="#81">81</a> <em> * true, then the file name and line number of the statement at the</em> +<a name="82" href="#82">82</a> <em> * origin of the log statement will be output.</em> +<a name="83" href="#83">83</a> <em> *</em> +<a name="84" href="#84">84</a> <em> * <p>If you are embedding this layout within an [EMAIL PROTECTED]</em> +<a name="85" href="#85">85</a> <em> * org.apache.log4j.net.SMTPAppender} then make sure to set the</em> +<a name="86" href="#86">86</a> <em> * <b>LocationInfo</b> option of that appender as well.</em> +<a name="87" href="#87">87</a> <em> * */</em> +<a name="88" href="#88">88</a> <strong>public</strong> <strong>void</strong> setLocationInfo(<strong>boolean</strong> flag) { +<a name="89" href="#89">89</a> locationInfo = flag; +<a name="90" href="#90">90</a> } +<a name="91" href="#91">91</a> +<a name="92" href="#92">92</a> <em>/**<em>*</em></em> +<a name="93" href="#93">93</a> <em> Returns the current value of the <b>LocationInfo</b> option.</em> +<a name="94" href="#94">94</a> <em> */</em> +<a name="95" href="#95">95</a> <strong>public</strong> <strong>boolean</strong> getLocationInfo() { +<a name="96" href="#96">96</a> <strong>return</strong> locationInfo; +<a name="97" href="#97">97</a> } +<a name="98" href="#98">98</a> +<a name="99" href="#99">99</a> <em>/**<em>*</em></em> +<a name="100" href="#100">100</a> <em> * Sets whether MDC key-value pairs should be output, default false.</em> +<a name="101" href="#101">101</a> <em> * @param flag new value.</em> +<a name="102" href="#102">102</a> <em> */</em> +<a name="103" href="#103">103</a> <strong>public</strong> <strong>void</strong> setProperties(<strong>final</strong> <strong>boolean</strong> flag) { +<a name="104" href="#104">104</a> properties = flag; +<a name="105" href="#105">105</a> } +<a name="106" href="#106">106</a> +<a name="107" href="#107">107</a> <em>/**<em>*</em></em> +<a name="108" href="#108">108</a> <em> * Gets whether MDC key-value pairs should be output.</em> +<a name="109" href="#109">109</a> <em> * @return true if MDC key-value pairs are output.</em> +<a name="110" href="#110">110</a> <em> */</em> +<a name="111" href="#111">111</a> <strong>public</strong> <strong>boolean</strong> getProperties() { +<a name="112" href="#112">112</a> <strong>return</strong> properties; +<a name="113" href="#113">113</a> } +<a name="114" href="#114">114</a> +<a name="115" href="#115">115</a> <em>/**<em>* No options to activate. */</em></em> +<a name="116" href="#116">116</a> <strong>public</strong> <strong>void</strong> activateOptions() { +<a name="117" href="#117">117</a> } +<a name="118" href="#118">118</a> <a name="119" href="#119">119</a> -<a name="120" href="#120">120</a> buf.append(<span class="string">"<log4j:message><![CDATA["</span>); -<a name="121" href="#121">121</a> <em class="comment">// Append the rendered message. Also make sure to escape any</em> -<a name="122" href="#122">122</a> <em class="comment">// existing CDATA sections.</em> -<a name="123" href="#123">123</a> Transform.appendEscapingCDATA(buf, event.getRenderedMessage()); -<a name="124" href="#124">124</a> buf.append(<span class="string">"]]></log4j:message>\r\n"</span>); -<a name="125" href="#125">125</a> -<a name="126" href="#126">126</a> String ndc = event.getNDC(); -<a name="127" href="#127">127</a> <strong>if</strong>(ndc != <strong>null</strong>) { -<a name="128" href="#128">128</a> buf.append(<span class="string">"<log4j:NDC><![CDATA["</span>); -<a name="129" href="#129">129</a> buf.append(ndc); -<a name="130" href="#130">130</a> buf.append(<span class="string">"]]></log4j:NDC>\r\n"</span>); +<a name="120" href="#120">120</a> <em>/**<em>*</em></em> +<a name="121" href="#121">121</a> <em> * Formats a [EMAIL PROTECTED] org.apache.log4j.spi.LoggingEvent} in conformance with the log4j.dtd.</em> +<a name="122" href="#122">122</a> <em> * */</em> +<a name="123" href="#123">123</a> <strong>public</strong> String format(<strong>final</strong> <a href="../../../../org/apache/log4j/spi/LoggingEvent.html">LoggingEvent</a> event) { +<a name="124" href="#124">124</a> +<a name="125" href="#125">125</a> <em class="comment">// Reset working buffer. If the buffer is too large, then we need a new</em> +<a name="126" href="#126">126</a> <em class="comment">// one in order to avoid the penalty of creating a large array.</em> +<a name="127" href="#127">127</a> <strong>if</strong>(buf.capacity() > UPPER_LIMIT) { +<a name="128" href="#128">128</a> buf = <strong>new</strong> StringBuffer(DEFAULT_SIZE); +<a name="129" href="#129">129</a> } <strong>else</strong> { +<a name="130" href="#130">130</a> buf.setLength(0); <a name="131" href="#131">131</a> } <a name="132" href="#132">132</a> -<a name="133" href="#133">133</a> String[] s = event.getThrowableStrRep(); -<a name="134" href="#134">134</a> <strong>if</strong>(s != <strong>null</strong>) { -<a name="135" href="#135">135</a> buf.append(<span class="string">"<log4j:throwable><![CDATA["</span>); -<a name="136" href="#136">136</a> <strong>for</strong>(<strong>int</strong> i = 0; i < s.length; i++) { -<a name="137" href="#137">137</a> buf.append(s[i]); -<a name="138" href="#138">138</a> buf.append(<span class="string">"\r\n"</span>); -<a name="139" href="#139">139</a> } -<a name="140" href="#140">140</a> buf.append(<span class="string">"]]></log4j:throwable>\r\n"</span>); -<a name="141" href="#141">141</a> } -<a name="142" href="#142">142</a> -<a name="143" href="#143">143</a> <strong>if</strong>(locationInfo) { -<a name="144" href="#144">144</a> <a href="../../../../org/apache/log4j/spi/LocationInfo.html">LocationInfo</a> locationInfo = event.getLocationInformation(); -<a name="145" href="#145">145</a> buf.append(<span class="string">"<log4j:locationInfo class=\""</span>); -<a name="146" href="#146">146</a> buf.append(Transform.escapeTags(locationInfo.getClassName())); -<a name="147" href="#147">147</a> buf.append(<span class="string">"\" method=\""</span>); -<a name="148" href="#148">148</a> buf.append(Transform.escapeTags(locationInfo.getMethodName())); -<a name="149" href="#149">149</a> buf.append(<span class="string">"\" file=\""</span>); -<a name="150" href="#150">150</a> buf.append(locationInfo.getFileName()); -<a name="151" href="#151">151</a> buf.append(<span class="string">"\" line=\""</span>); -<a name="152" href="#152">152</a> buf.append(locationInfo.getLineNumber()); -<a name="153" href="#153">153</a> buf.append(<span class="string">"\"/>\r\n"</span>); -<a name="154" href="#154">154</a> } -<a name="155" href="#155">155</a> -<a name="156" href="#156">156</a> buf.append(<span class="string">"</log4j:event>\r\n\r\n"</span>); +<a name="133" href="#133">133</a> <em class="comment">// We yield to the \r\n heresy.</em> +<a name="134" href="#134">134</a> +<a name="135" href="#135">135</a> buf.append(<span class="string">"<log4j:event logger=\""</span>); +<a name="136" href="#136">136</a> buf.append(Transform.escapeTags(event.getLoggerName())); +<a name="137" href="#137">137</a> buf.append(<span class="string">"\" timestamp=\""</span>); +<a name="138" href="#138">138</a> buf.append(event.timeStamp); +<a name="139" href="#139">139</a> buf.append(<span class="string">"\" level=\""</span>); +<a name="140" href="#140">140</a> buf.append(Transform.escapeTags(String.valueOf(event.getLevel()))); +<a name="141" href="#141">141</a> buf.append(<span class="string">"\" thread=\""</span>); +<a name="142" href="#142">142</a> buf.append(Transform.escapeTags(event.getThreadName())); +<a name="143" href="#143">143</a> buf.append(<span class="string">"\">\r\n"</span>); +<a name="144" href="#144">144</a> +<a name="145" href="#145">145</a> buf.append(<span class="string">"<log4j:message><![CDATA["</span>); +<a name="146" href="#146">146</a> <em class="comment">// Append the rendered message. Also make sure to escape any</em> +<a name="147" href="#147">147</a> <em class="comment">// existing CDATA sections.</em> +<a name="148" href="#148">148</a> Transform.appendEscapingCDATA(buf, event.getRenderedMessage()); +<a name="149" href="#149">149</a> buf.append(<span class="string">"]]></log4j:message>\r\n"</span>); +<a name="150" href="#150">150</a> +<a name="151" href="#151">151</a> String ndc = event.getNDC(); +<a name="152" href="#152">152</a> <strong>if</strong>(ndc != <strong>null</strong>) { +<a name="153" href="#153">153</a> buf.append(<span class="string">"<log4j:NDC><![CDATA["</span>); +<a name="154" href="#154">154</a> Transform.appendEscapingCDATA(buf, ndc); +<a name="155" href="#155">155</a> buf.append(<span class="string">"]]></log4j:NDC>\r\n"</span>); +<a name="156" href="#156">156</a> } <a name="157" href="#157">157</a> -<a name="158" href="#158">158</a> <strong>return</strong> buf.toString(); -<a name="159" href="#159">159</a> } -<a name="160" href="#160">160</a> -<a name="161" href="#161">161</a> <em>/**<em>*</em></em> -<a name="162" href="#162">162</a> <em> The XMLLayout prints and does not ignore exceptions. Hence the</em> -<a name="163" href="#163">163</a> <em> return value <code>false</code>.</em> -<a name="164" href="#164">164</a> <em> */</em> -<a name="165" href="#165">165</a> <strong>public</strong> <strong>boolean</strong> ignoresThrowable() { -<a name="166" href="#166">166</a> <strong>return</strong> false; -<a name="167" href="#167">167</a> } -<a name="168" href="#168">168</a> } +<a name="158" href="#158">158</a> String[] s = event.getThrowableStrRep(); +<a name="159" href="#159">159</a> <strong>if</strong>(s != <strong>null</strong>) { +<a name="160" href="#160">160</a> buf.append(<span class="string">"<log4j:throwable><![CDATA["</span>); +<a name="161" href="#161">161</a> <strong>for</strong>(<strong>int</strong> i = 0; i < s.length; i++) { +<a name="162" href="#162">162</a> Transform.appendEscapingCDATA(buf, s[i]); +<a name="163" href="#163">163</a> buf.append(<span class="string">"\r\n"</span>); +<a name="164" href="#164">164</a> } +<a name="165" href="#165">165</a> buf.append(<span class="string">"]]></log4j:throwable>\r\n"</span>); +<a name="166" href="#166">166</a> } +<a name="167" href="#167">167</a> +<a name="168" href="#168">168</a> <strong>if</strong>(locationInfo) { +<a name="169" href="#169">169</a> <a href="../../../../org/apache/log4j/spi/LocationInfo.html">LocationInfo</a> locationInfo = event.getLocationInformation(); +<a name="170" href="#170">170</a> buf.append(<span class="string">"<log4j:locationInfo class=\""</span>); +<a name="171" href="#171">171</a> buf.append(Transform.escapeTags(locationInfo.getClassName())); +<a name="172" href="#172">172</a> buf.append(<span class="string">"\" method=\""</span>); +<a name="173" href="#173">173</a> buf.append(Transform.escapeTags(locationInfo.getMethodName())); +<a name="174" href="#174">174</a> buf.append(<span class="string">"\" file=\""</span>); +<a name="175" href="#175">175</a> buf.append(Transform.escapeTags(locationInfo.getFileName())); +<a name="176" href="#176">176</a> buf.append(<span class="string">"\" line=\""</span>); +<a name="177" href="#177">177</a> buf.append(locationInfo.getLineNumber()); +<a name="178" href="#178">178</a> buf.append(<span class="string">"\"/>\r\n"</span>); +<a name="179" href="#179">179</a> } +<a name="180" href="#180">180</a> +<a name="181" href="#181">181</a> <strong>if</strong> (properties) { +<a name="182" href="#182">182</a> Set keySet = event.getPropertyKeySet(); +<a name="183" href="#183">183</a> <strong>if</strong> (keySet.size() > 0) { +<a name="184" href="#184">184</a> buf.append(<span class="string">"<log4j:properties>\r\n"</span>); +<a name="185" href="#185">185</a> Object[] keys = keySet.toArray(); +<a name="186" href="#186">186</a> Arrays.sort(keys); +<a name="187" href="#187">187</a> <strong>for</strong> (<strong>int</strong> i = 0; i < keys.length; i++) { +<a name="188" href="#188">188</a> String key = keys[i].toString(); +<a name="189" href="#189">189</a> Object val = event.getMDC(key); +<a name="190" href="#190">190</a> <strong>if</strong> (val != <strong>null</strong>) { +<a name="191" href="#191">191</a> buf.append(<span class="string">"<log4j:data name=\""</span>); +<a name="192" href="#192">192</a> buf.append(Transform.escapeTags(key)); +<a name="193" href="#193">193</a> buf.append(<span class="string">"\" value=\""</span>); +<a name="194" href="#194">194</a> buf.append(Transform.escapeTags(String.valueOf(val))); +<a name="195" href="#195">195</a> buf.append(<span class="string">"\"/>\r\n"</span>); +<a name="196" href="#196">196</a> } +<a name="197" href="#197">197</a> } +<a name="198" href="#198">198</a> buf.append(<span class="string">"</log4j:properties>\r\n"</span>); +<a name="199" href="#199">199</a> } +<a name="200" href="#200">200</a> } +<a name="201" href="#201">201</a> +<a name="202" href="#202">202</a> buf.append(<span class="string">"</log4j:event>\r\n\r\n"</span>); +<a name="203" href="#203">203</a> +<a name="204" href="#204">204</a> <strong>return</strong> buf.toString(); +<a name="205" href="#205">205</a> } +<a name="206" href="#206">206</a> +<a name="207" href="#207">207</a> <em>/**<em>*</em></em> +<a name="208" href="#208">208</a> <em> The XMLLayout prints and does not ignore exceptions. Hence the</em> +<a name="209" href="#209">209</a> <em> return value <code>false</code>.</em> +<a name="210" href="#210">210</a> <em> */</em> +<a name="211" href="#211">211</a> <strong>public</strong> <strong>boolean</strong> ignoresThrowable() { +<a name="212" href="#212">212</a> <strong>return</strong> false; +<a name="213" href="#213">213</a> } +<a name="214" href="#214">214</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/org/apache/log4j/xml/package-frame.html URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/1.2/xref/org/apache/log4j/xml/package-frame.html?rev=569613&r1=569612&r2=569613&view=diff ============================================================================== --- logging/site/trunk/docs/log4j/1.2/xref/org/apache/log4j/xml/package-frame.html (original) +++ logging/site/trunk/docs/log4j/1.2/xref/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/org/apache/log4j/xml/package-summary.html URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/1.2/xref/org/apache/log4j/xml/package-summary.html?rev=569613&r1=569612&r2=569613&view=diff ============================================================================== --- logging/site/trunk/docs/log4j/1.2/xref/org/apache/log4j/xml/package-summary.html (original) +++ logging/site/trunk/docs/log4j/1.2/xref/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/overview-frame.html URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/1.2/xref/overview-frame.html?rev=569613&r1=569612&r2=569613&view=diff ============================================================================== --- logging/site/trunk/docs/log4j/1.2/xref/overview-frame.html (original) +++ logging/site/trunk/docs/log4j/1.2/xref/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/overview-summary.html URL: http://svn.apache.org/viewvc/logging/site/trunk/docs/log4j/1.2/xref/overview-summary.html?rev=569613&r1=569612&r2=569613&view=diff ============================================================================== --- logging/site/trunk/docs/log4j/1.2/xref/overview-summary.html (original) +++ logging/site/trunk/docs/log4j/1.2/xref/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>
