Author: pmouawad
Date: Sun Feb 5 14:14:27 2017
New Revision: 1781767
URL: http://svn.apache.org/viewvc?rev=1781767&view=rev
Log:
Bug 60589 - Migrate LogKit to SLF4J - Drop avalon, logkit and excalibur with
backward compatibility for 3rd party modules
svn:eol
Bugzilla Id: 60589
Modified:
jmeter/trunk/src/jorphan/org/apache/jorphan/logging/Slf4jLogkitLogger.java
(props changed)
jmeter/trunk/src/jorphan/org/apache/log/ContextMap.java (contents, props
changed)
jmeter/trunk/src/jorphan/org/apache/log/LogEvent.java (props changed)
jmeter/trunk/src/jorphan/org/apache/log/LogTarget.java (props changed)
jmeter/trunk/src/jorphan/org/apache/log/Logger.java (props changed)
jmeter/trunk/src/jorphan/org/apache/log/Priority.java (props changed)
jmeter/trunk/test/src/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java
(props changed)
jmeter/trunk/test/src/org/apache/jmeter/util/LogRecord.java (props
changed)
jmeter/trunk/test/src/org/apache/jmeter/util/LogRecordingDelegatingLogger.java
(props changed)
Propchange:
jmeter/trunk/src/jorphan/org/apache/jorphan/logging/Slf4jLogkitLogger.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jmeter/trunk/src/jorphan/org/apache/log/ContextMap.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/log/ContextMap.java?rev=1781767&r1=1781766&r2=1781767&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/log/ContextMap.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/log/ContextMap.java Sun Feb 5 14:14:27
2017
@@ -29,8 +29,8 @@ import java.util.Hashtable;
* <li>hostname ->helm.realityforge.org</li>
* <li>ipaddress ->1.2.3.4</li>
* <li>interface ->127.0.0.1</li>
- * <li>caller � �->com.biz.MyCaller.method(MyCaller.java:18)</li>
- * <li>source � �->1.6.3.2:33</li>
+ * <li>caller ->com.biz.MyCaller.method(MyCaller.java:18)</li>
+ * <li>source ->1.6.3.2:33</li>
* </ul>
* The context is bound to a thread (and inherited by sub-threads) but
* it can also be added to by LogTargets.
Propchange: jmeter/trunk/src/jorphan/org/apache/log/ContextMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jmeter/trunk/src/jorphan/org/apache/log/LogEvent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jmeter/trunk/src/jorphan/org/apache/log/LogTarget.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jmeter/trunk/src/jorphan/org/apache/log/Logger.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jmeter/trunk/src/jorphan/org/apache/log/Priority.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jmeter/trunk/test/src/org/apache/jmeter/gui/logging/TestGuiLogEventAppender.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jmeter/trunk/test/src/org/apache/jmeter/util/LogRecord.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jmeter/trunk/test/src/org/apache/jmeter/util/LogRecordingDelegatingLogger.java
------------------------------------------------------------------------------
svn:eol-style = native