You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/05 21:13:34 UTC
svn commit: r1781806 - in
/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java: config/
config/gui/ sampler/ test/
Author: pmouawad
Date: Sun Feb 5 21:13:34 2017
New Revision: 1781806
URL: http://svn.apache.org/viewvc?rev=1781806&view=rev
Log:
Bug 60564 - Migrating LogKit to SLF4J - Replace logkit loggers with slf4j ones with keeping the current logkit binding solution
Contributed by Woonsan Ko
This closes #250
Bugzilla Id: 60564
Modified:
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/JavaConfig.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/JavaConfig.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/JavaConfig.java?rev=1781806&r1=1781805&r2=1781806&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/JavaConfig.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/JavaConfig.java Sun Feb 5 21:13:34 2017
@@ -31,7 +31,6 @@ import org.apache.jmeter.testelement.pro
* {@link org.apache.jmeter.protocol.java.sampler.JavaSamplerClient} instance to
* perform performance test samples.
*
- * @version $Revision$
*/
public class JavaConfig extends ConfigTestElement implements Serializable {
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java?rev=1781806&r1=1781805&r2=1781806&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java Sun Feb 5 21:13:34 2017
@@ -48,9 +48,9 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.JLabeledChoice;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.reflect.ClassFinder;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The <code>JavaConfigGui</code> class provides the user interface for the
@@ -61,7 +61,7 @@ public class JavaConfigGui extends Abstr
private static final long serialVersionUID = 241L;
/** Logging */
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JavaConfigGui.class);
/** A combo box allowing the user to choose a test class. */
private JLabeledChoice classNameLabeledChoice;
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java?rev=1781806&r1=1781805&r2=1781806&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/AbstractJavaSamplerClient.java Sun Feb 5 21:13:34 2017
@@ -21,6 +21,7 @@ package org.apache.jmeter.protocol.java.
import org.apache.jmeter.config.Arguments;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
+import org.slf4j.LoggerFactory;
/**
* An abstract implementation of the JavaSamplerClient interface. This
@@ -48,9 +49,9 @@ import org.apache.log.Logger;
*
* @see JavaSamplerClient#runTest(JavaSamplerContext)
*
- * @version $Revision$
*/
public abstract class AbstractJavaSamplerClient implements JavaSamplerClient {
+ private static final org.slf4j.Logger logger = LoggerFactory.getLogger(AbstractJavaSamplerClient.class);
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -78,8 +79,15 @@ public abstract class AbstractJavaSample
* (jmeter.protocol.java).
*
* @return a Logger instance which can be used for logging
+ * @deprecated Will be removed in 3.3, use {@link AbstractJavaSamplerClient#getNewLogger()}
*/
+ @Deprecated
protected Logger getLogger() {
return log;
}
+
+ @Deprecated
+ protected org.slf4j.Logger getNewLogger() {
+ return logger;
+ }
}
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java?rev=1781806&r1=1781805&r2=1781806&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java Sun Feb 5 21:13:34 2017
@@ -27,6 +27,7 @@ import java.util.concurrent.ConcurrentHa
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.ConfigTestElement;
+import org.apache.jmeter.protocol.java.test.JavaTest;
import org.apache.jmeter.samplers.AbstractSampler;
import org.apache.jmeter.samplers.Entry;
import org.apache.jmeter.samplers.Interruptible;
@@ -34,8 +35,8 @@ import org.apache.jmeter.samplers.Sample
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.TestStateListener;
import org.apache.jmeter.testelement.property.TestElementProperty;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A sampler for executing custom Java code in each sample. See
@@ -45,9 +46,9 @@ import org.apache.log.Logger;
*/
public class JavaSampler extends AbstractSampler implements TestStateListener, Interruptible {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JavaTest.class);
- private static final long serialVersionUID = 232L; // Remember to change this when the class changes ...
+ private static final long serialVersionUID = 233L; // Remember to change this when the class changes ...
private static final Set<String> APPLIABLE_CONFIG_CLASSES = new HashSet<>(
Arrays.asList(
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java?rev=1781806&r1=1781805&r2=1781806&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java Sun Feb 5 21:13:34 2017
@@ -22,8 +22,9 @@ import java.util.Iterator;
import java.util.Map;
import org.apache.jmeter.config.Arguments;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.apache.jmeter.protocol.java.test.JavaTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* JavaSamplerContext is used to provide context information to a
@@ -31,7 +32,6 @@ import org.apache.log.Logger;
* initialization parameters which were specified in the GUI. Additional data
* may be accessible through JavaSamplerContext in the future.
*
- * @version $Revision$
*/
public class JavaSamplerContext {
/*
@@ -46,7 +46,7 @@ public class JavaSamplerContext {
*/
/** Logging */
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JavaTest.class);
/**
* Map containing the initialization parameters for the JavaSamplerClient.
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java?rev=1781806&r1=1781805&r2=1781806&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java Sun Feb 5 21:13:34 2017
@@ -28,8 +28,8 @@ import org.apache.jmeter.protocol.java.s
import org.apache.jmeter.samplers.Interruptible;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The <code>JavaTest</code> class is a simple sampler which is intended for
@@ -70,9 +70,9 @@ import org.apache.log.Logger;
public class JavaTest extends AbstractJavaSamplerClient implements Serializable, Interruptible {
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger LOG = LoggerFactory.getLogger(JavaTest.class);
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
/** The base number of milliseconds to sleep during each sample. */
private long sleepTime;
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java?rev=1781806&r1=1781805&r2=1781806&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java Sun Feb 5 21:13:34 2017
@@ -27,8 +27,8 @@ import org.apache.jmeter.protocol.java.s
import org.apache.jmeter.samplers.Interruptible;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The <code>SleepTest</code> class is a simple example class for a JMeter
@@ -46,11 +46,10 @@ import org.apache.log.Logger;
* Thus, the SleepMask provides a way to add a random component to the sleep
* time.
*
- * @version $Revision$
*/
public class SleepTest extends AbstractJavaSamplerClient implements Serializable, Interruptible {
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger LOG = LoggerFactory.getLogger(JavaTest.class);
private static final long serialVersionUID = 240L;