mstover1 02/05/29 16:35:56
Modified: src_1/org/apache/jmeter/gui/util JLabeledChoice.java
src_1/org/apache/jmeter/protocol/http/config UrlConfig.java
src_1/org/apache/jmeter/protocol/http/modifier
UserParameterModifier.java
UserParameterXMLContentHandler.java
UserParameterXMLParser.java UserSequence.java
src_1/org/apache/jmeter/protocol/http/sampler
HTTPSampler.java
Log:
updating User Param Modifier to preserve ordering of XML file
Revision Changes Path
1.3 +1 -8
jakarta-jmeter/src_1/org/apache/jmeter/gui/util/JLabeledChoice.java
Index: JLabeledChoice.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/util/JLabeledChoice.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JLabeledChoice.java 29 May 2002 22:52:35 -0000 1.2
+++ JLabeledChoice.java 29 May 2002 23:35:55 -0000 1.3
@@ -64,14 +64,7 @@
import java.util.*;
import javax.swing.plaf.basic.BasicComboBoxEditor;
-/**
- * A Helper component that wraps a JTextField with a label into
- * a JPanel (this). This component also has an efficient event handling
- * mechanism for handling the text changing in the Text Field. The registered
- * change listeners are only called when the text has changed.
- *
- * @author S.Coleman
- */
+
public class JLabeledChoice extends JPanel implements JLabeledField
{
private JLabel mLabel = new JLabel();
1.7 +11 -2
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/config/UrlConfig.java
Index: UrlConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/config/UrlConfig.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UrlConfig.java 29 May 2002 22:41:53 -0000 1.6
+++ UrlConfig.java 29 May 2002 23:35:55 -0000 1.7
@@ -72,8 +72,8 @@
* the value you specify here.
*
*@author Michael Stover
- *@created $Date: 2002/05/29 22:41:53 $
- *@version $Revision: 1.6 $
+ *@created $Date: 2002/05/29 23:35:55 $
+ *@version $Revision: 1.7 $
*/
public class UrlConfig extends AbstractTestElement implements Serializable
@@ -165,6 +165,15 @@
public void setDomain(String domain)
{
setProperty(HTTPSampler.DOMAIN, domain);
+ }
+
+ public String toString()
+ {
+ try {
+ return getUrl().toString() +"?"+ getQueryString();
+ } catch(MalformedURLException e) {
+ return "Malformed URL";
+ }
}
/**
1.4 +3 -2
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/modifier/UserParameterModifier.java
Index: UserParameterModifier.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/modifier/UserParameterModifier.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UserParameterModifier.java 23 May 2002 15:47:05 -0000 1.3
+++ UserParameterModifier.java 29 May 2002 23:35:55 -0000 1.4
@@ -84,7 +84,7 @@
*<P>For example if userid and password are defined in the XML parameter file
* for each user (ie thread), then simulated multiple user activity can occur
*@author Mark Walsh
- *@created $Date: 2002/05/23 15:47:05 $
+ *@created $Date: 2002/05/29 23:35:55 $
*@version 1.0
***********************************************************/
public class UserParameterModifier
@@ -115,12 +115,13 @@
public void testStarted() {
System.out.println("Starting test in UserParameterModifier");
// try to populate allUsers, if fail, leave as any empty set
- Set allUsers = new HashSet();
+ List allUsers = new LinkedList();
try {
UserParameterXMLParser readXMLParameters = new
UserParameterXMLParser();
allUsers = readXMLParameters.getXMLParameters(getXmlUri());
}
catch (Exception e) {
+ e.printStackTrace();
// do nothing, now object allUsers contains an empty set
System.err.println("Unable to read parameters from xml file "
+ getXmlUri());
System.err.println(
1.3 +9 -10
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java
Index: UserParameterXMLContentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserParameterXMLContentHandler.java 2 May 2002 22:54:59 -0000 1.2
+++ UserParameterXMLContentHandler.java 29 May 2002 23:35:55 -0000 1.3
@@ -63,7 +63,7 @@
* Apache
* <P>The handler used to read in XML parameter data
*@author Mark Walsh
- *@created $Date: 2002/05/02 22:54:59 $
+ *@created $Date: 2002/05/29 23:35:55 $
*@version 1.0
***********************************************************/
@@ -75,7 +75,7 @@
// Note UserParameterXML access this variable
// to obtain the Set data via method getParsedParameters()
- private Set userThreads = new HashSet();
+ private List userThreads = new LinkedList();
private String paramname = "";
private String paramvalue = "";
@@ -127,14 +127,14 @@
// haven't got to reset paramname & paramvalue
// but did it to keep the code looking correct
- if (localName.equals("parameter")) {
+ if (qName.equals("parameter")) {
paramname="";
paramvalue="";
}
// must create a new object,
// or else end up with a set full of the same Map object
- if (localName.equals("thread")) {
+ if (qName.equals("thread")) {
nameValuePair = new HashMap();
}
@@ -144,17 +144,16 @@
String localName,
String qName)
throws SAXException {
-
- if (localName.equals("paramname")) {
+ if (qName.equals("paramname")) {
paramname = contents.toString();
}
- if (localName.equals("paramvalue")) {
+ if (qName.equals("paramvalue")) {
paramvalue = contents.toString();
}
- if (localName.equals("parameter")) {
+ if (qName.equals("parameter")) {
nameValuePair.put(paramname,paramvalue);
}
- if (localName.equals("thread")) {
+ if (qName.equals("thread")) {
userThreads.add(nameValuePair);
}
}
@@ -189,7 +188,7 @@
* results of parsing all user parameter data defined in XML file.
* @return all users name value pairs obtained from XML file
*/
- public Set getParsedParameters() {
+ public List getParsedParameters() {
return userThreads;
}
} // end class
1.3 +4 -3
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/modifier/UserParameterXMLParser.java
Index: UserParameterXMLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/modifier/UserParameterXMLParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserParameterXMLParser.java 2 May 2002 22:54:59 -0000 1.2
+++ UserParameterXMLParser.java 29 May 2002 23:35:55 -0000 1.3
@@ -58,6 +58,7 @@
import org.xml.sax.helpers.*;
import java.io.*;
import java.util.*;
+import org.apache.jmeter.util.JMeterUtils;
/************************************************************
* Title: Jakarta-JMeter Description: Copyright: Copyright (c) 2001 Company:
@@ -66,7 +67,7 @@
* for all users defined in the XML file.
*
*@author Mark Walsh
- *@created $Date: 2002/05/02 22:54:59 $
+ *@created $Date: 2002/05/29 23:35:55 $
*@version 1.0
***********************************************************/
public class UserParameterXMLParser {
@@ -89,12 +90,12 @@
* @param Name of the XML to load users parameter data
* @return all users name value pairs obtained from XML file
*/
- public Set getXMLParameters(String xmlURI)
+ public List getXMLParameters(String xmlURI)
throws SAXException, IOException {
//create instances needed for parsing
- XMLReader reader = XMLReaderFactory.createXMLReader(vendorParseClass);
+ XMLReader reader =
JMeterUtils.getXMLParser();//XMLReaderFactory.createXMLReader(vendorParseClass);
UserParameterXMLContentHandler threadParametersContentHandler = new
UserParameterXMLContentHandler();
UserParameterXMLErrorHandler parameterErrorHandler = new
UserParameterXMLErrorHandler();
1.3 +3 -3
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/modifier/UserSequence.java
Index: UserSequence.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/modifier/UserSequence.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserSequence.java 2 May 2002 22:54:59 -0000 1.2
+++ UserSequence.java 29 May 2002 23:35:55 -0000 1.3
@@ -64,7 +64,7 @@
* <BR>
* <P> This module uses round robin allocation of users.
*@author Mark Walsh
- *@created $Date: 2002/05/02 22:54:59 $
+ *@created $Date: 2002/05/29 23:35:55 $
*@version 1.0
***********************************************************/
@@ -74,7 +74,7 @@
//-------------------------------------------
// Constants and Data Members
//-------------------------------------------
- private Set allUsers;
+ private List allUsers;
private Iterator indexOfUsers;
//-------------------------------------------
@@ -91,7 +91,7 @@
* ie a Set of Mapped "parameter names and parameter values" for each user to
be loader into the sequencer
*/
- public UserSequence(Set allUsers) {
+ public UserSequence(List allUsers) {
this.allUsers = allUsers;
// initalise pointer to first user
1.11 +3 -3
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Index: HTTPSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HTTPSampler.java 23 May 2002 15:47:06 -0000 1.10
+++ HTTPSampler.java 29 May 2002 23:35:56 -0000 1.11
@@ -80,8 +80,8 @@
* HTTP requests, including cookies and authentication.
*
*@author Michael Stover
- *@created $Date: 2002/05/23 15:47:06 $
- *@version $Revision: 1.10 $
+ *@created $Date: 2002/05/29 23:35:56 $
+ *@version $Revision: 1.11 $
***************************************/
public class HTTPSampler extends AbstractSampler
{
@@ -646,7 +646,7 @@
try
{
u = url.getUrl();
- res.setSampleLabel(u.toString());
+ res.setSampleLabel(url.toString());
// specify the data to the result.
res.setSamplerData(this);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
