sebb 2005/07/10 07:49:29
Modified: src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler
LDAPSampler.java LDAPExtSampler.java
Log:
Remove redundant method - addCustomTestElement() - and related imports
Revision Changes Path
1.12 +2 -14
jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
Index: LDAPSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LDAPSampler.java 19 May 2005 23:22:25 -0000 1.11
+++ LDAPSampler.java 10 Jul 2005 14:49:29 -0000 1.12
@@ -28,12 +28,9 @@
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.ConfigTestElement;
-import org.apache.jmeter.config.LoginConfig;
-import org.apache.jmeter.protocol.ldap.config.LdapConfig;
import org.apache.jmeter.samplers.AbstractSampler;
import org.apache.jmeter.samplers.Entry;
import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.testelement.property.StringProperty;
@@ -78,15 +75,6 @@
{
}
-
- public void addCustomTestElement(TestElement element)
- {
- if(element instanceof LdapConfig || element instanceof LoginConfig)
- {
- mergeIn(element);
- }
- }
-
/**
* Gets the username attribute of the LDAP object.
*
1.9 +5 -18
jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
Index: LDAPExtSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LDAPExtSampler.java 9 Jul 2005 23:18:17 -0000 1.8
+++ LDAPExtSampler.java 10 Jul 2005 14:49:29 -0000 1.9
@@ -18,7 +18,10 @@
package org.apache.jmeter.protocol.ldap.sampler;
-import java.util.*;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.BasicAttribute;
@@ -31,16 +34,13 @@
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
-import org.apache.jmeter.config.LoginConfig;
import org.apache.jmeter.engine.event.LoopIterationEvent;
-import org.apache.jmeter.protocol.ldap.config.LdapExtConfig;
import org.apache.jmeter.protocol.ldap.config.gui.LDAPArgument;
import org.apache.jmeter.protocol.ldap.config.gui.LDAPArguments;
import org.apache.jmeter.protocol.ldap.sampler.LdapExtClient;
import org.apache.jmeter.samplers.AbstractSampler;
import org.apache.jmeter.samplers.Entry;
import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.TestListener;
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.testelement.property.StringProperty;
@@ -122,19 +122,6 @@
{
}
-
- /************************************************************
- *
- ***********************************************************/
-
- public void addCustomTestElement(TestElement element)
- {
- if(element instanceof LdapExtConfig || element instanceof
LoginConfig)
- {
- mergeIn(element);
- }
- }
-
/************************************************************
* Gets the username attribute of the LDAP object
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
