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 22:28:52 UTC
svn commit: r1781819 - in
/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler:
LDAPExtSampler.java LDAPSampler.java LdapClient.java LdapExtClient.java
Author: pmouawad
Date: Sun Feb 5 22:28:52 2017
New Revision: 1781819
URL: http://svn.apache.org/viewvc?rev=1781819&view=rev
Log:
Bug 60564 - Migrating LogKit to SLF4J - Replace logkit loggers with slf4j ones with keeping the current logkit binding solution
Bugzilla Id: 60564
Modified:
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java
Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java?rev=1781819&r1=1781818&r2=1781819&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java Sun Feb 5 22:28:52 2017
@@ -55,9 +55,9 @@ import org.apache.jmeter.testelement.pro
import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jmeter.testelement.property.TestElementProperty;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.XMLBuffer;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/*******************************************************************************
* Ldap Sampler class is main class for the LDAP test. This will control all the
@@ -65,7 +65,7 @@ import org.apache.log.Logger;
******************************************************************************/
public class LDAPExtSampler extends AbstractSampler implements TestStateListener {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(LDAPExtSampler.class);
private static final long serialVersionUID = 240L;
Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java?rev=1781819&r1=1781818&r2=1781819&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java Sun Feb 5 22:28:52 2017
@@ -42,8 +42,8 @@ import org.apache.jmeter.testelement.pro
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.testelement.property.StringProperty;
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;
/**
* Ldap Sampler class is main class for the LDAP test. This will control all the
@@ -51,7 +51,7 @@ import org.apache.log.Logger;
*
*/
public class LDAPSampler extends AbstractSampler {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(LDAPSampler.class);
private static final long serialVersionUID = 240L;
Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java?rev=1781819&r1=1781818&r2=1781819&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java Sun Feb 5 22:28:52 2017
@@ -29,10 +29,9 @@ import javax.naming.directory.DirContext
import javax.naming.directory.InitialDirContext;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
-// import javax.naming.directory.SearchResult;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Ldap Client class is main class to create, modify, search and delete all the
@@ -40,7 +39,7 @@ import org.apache.log.Logger;
*
*/
public class LdapClient {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(LdapClient.class);
private DirContext dirContext = null;
Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java?rev=1781819&r1=1781818&r2=1781819&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java Sun Feb 5 22:28:52 2017
@@ -21,8 +21,8 @@ package org.apache.jmeter.protocol.ldap.
import java.util.Hashtable;
import javax.naming.Context;
-import javax.naming.NamingException;
import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
@@ -31,8 +31,8 @@ import javax.naming.directory.SearchCont
import javax.naming.directory.SearchResult;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/*******************************************************************************
*
@@ -43,11 +43,10 @@ import org.apache.log.Logger;
* company Siemens Netherlands N.V..
*
* Based on the work of: author T.Elanjchezhiyan(chezhiyan@siptech.co.in)
- * created Apr 29 2003 11:00 AM company Sip Technologies and Exports Ltd.
*
******************************************************************************/
public class LdapExtClient {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(LdapExtClient.class);
private static final String CONTEXT_IS_NULL = "Context is null";