mstover1 2002/08/19 18:55:24
Modified: src/components/org/apache/jmeter/config Arguments.java
LoginConfig.java
src/protocol/http/org/apache/jmeter/protocol/http/control
AuthManager.java CookieManager.java
HeaderManager.java
src/protocol/java/org/apache/jmeter/protocol/java/config
JavaConfig.java
Log:
Objects that act like Config objects have to extend ConfigTestElement
Revision Changes Path
1.2 +2 -3
jakarta-jmeter/src/components/org/apache/jmeter/config/Arguments.java
Index: Arguments.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/config/Arguments.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Arguments.java 11 Aug 2002 19:24:40 -0000 1.1
+++ Arguments.java 20 Aug 2002 01:55:24 -0000 1.2
@@ -60,7 +60,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.util.JMeterUtils;
// Mark Walsh, 2002-08-03 add method addArgument(String name, Object value, Object
metadata)
@@ -74,7 +73,7 @@
*@version 1.0
***************************************/
-public class Arguments extends AbstractTestElement implements Serializable
+public class Arguments extends ConfigTestElement implements Serializable
{
/****************************************
* !ToDo (Field description)
1.2 +2 -4
jakarta-jmeter/src/components/org/apache/jmeter/config/LoginConfig.java
Index: LoginConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/config/LoginConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoginConfig.java 11 Aug 2002 19:24:40 -0000 1.1
+++ LoginConfig.java 20 Aug 2002 01:55:24 -0000 1.2
@@ -54,9 +54,7 @@
*/
package org.apache.jmeter.config;
-import java.util.*;
-import java.io.*;
-import org.apache.jmeter.testelement.AbstractTestElement;
+import java.io.Serializable;
/************************************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
@@ -66,7 +64,7 @@
*@version 1.0
***********************************************************/
-public class LoginConfig extends AbstractTestElement implements Serializable
+public class LoginConfig extends ConfigTestElement implements Serializable
{
/************************************************************
1.2 +3 -3
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
Index: AuthManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AuthManager.java 11 Aug 2002 19:24:51 -0000 1.1
+++ AuthManager.java 20 Aug 2002 01:55:24 -0000 1.2
@@ -68,8 +68,8 @@
import java.util.StringTokenizer;
import org.apache.jmeter.config.ConfigElement;
+import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.protocol.http.util.Base64Encoder;
-import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
@@ -83,7 +83,7 @@
*@created $Date$
*@version 0.9
***************************************/
-public class AuthManager extends AbstractTestElement implements ConfigElement,
+public class AuthManager extends ConfigTestElement implements ConfigElement,
Serializable
{
private final static String AUTH_LIST = "AuthManager.auth_list";
1.2 +3 -3
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Index: CookieManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CookieManager.java 11 Aug 2002 19:24:51 -0000 1.1
+++ CookieManager.java 20 Aug 2002 01:55:24 -0000 1.2
@@ -76,7 +76,7 @@
import java.util.TimeZone;
import java.util.Vector;
-import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.testelement.PerThreadClonable;
import org.apache.jmeter.util.JMeterUtils;
@@ -87,7 +87,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Dowd</a>
* @version $Revision$ $Date$
*/
-public class CookieManager extends AbstractTestElement implements
+public class CookieManager extends ConfigTestElement implements
Serializable,PerThreadClonable
{
1.2 +12 -11
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
Index: HeaderManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HeaderManager.java 11 Aug 2002 19:24:51 -0000 1.1
+++ HeaderManager.java 20 Aug 2002 01:55:24 -0000 1.2
@@ -58,17 +58,18 @@
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
-import java.net.URL;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.io.*;
-import javax.swing.table.AbstractTableModel;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.Vector;
-import org.apache.jmeter.config.*;
+import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jmeter.testelement.AbstractTestElement;
/**
* This class provides an interface to headers file to
@@ -77,7 +78,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @version $Revision$ $Date$
*/
-public class HeaderManager extends AbstractTestElement implements
+public class HeaderManager extends ConfigTestElement implements
Serializable
{
1.2 +4 -4
jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/config/JavaConfig.java
Index: JavaConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/config/JavaConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaConfig.java 11 Aug 2002 19:24:52 -0000 1.1
+++ JavaConfig.java 20 Aug 2002 01:55:24 -0000 1.2
@@ -57,9 +57,9 @@
import java.io.Serializable;
import org.apache.jmeter.config.Arguments;
+import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.protocol.java.sampler.JavaSampler;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerClient;
-import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.log4j.Category;
@@ -73,7 +73,7 @@
*@version $Revision$
*/
-public class JavaConfig extends AbstractTestElement implements Serializable
+public class JavaConfig extends ConfigTestElement implements Serializable
{
/** Logging */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
