mstover1 2002/06/04 20:29:10
Modified: bin jmeter jmeter-server jmeter-server.bat jmeter.bat
src_1/org/apache/jmeter JMeter.java help.txt
src_1/org/apache/jmeter/gui MainFrame.java
src_1/org/apache/jmeter/gui/action Load.java
src_1/org/apache/jmeter/protocol/http/control
AuthManager.java
src_1/org/apache/jmeter/reporters ResultCollector.java
src_1/org/apache/jmeter/resources messages.properties
messages_ja.properties messages_no.properties
src_1/org/apache/jmeter/samplers SampleResult.java
src_1/org/apache/jmeter/save SaveService.java
src_1/org/apache/jmeter/save/old/handlers
AbstractConfigElementHandler.java
AuthManagerHandler.java FilerHandler.java
JMeterComponentHandler.java JMeterHandler.java
ProxyControlHandler.java TimerHandler.java
src_1/org/apache/jmeter/visualizers StatVisualizer.java
Removed: bin jmeter-cl jmeter-cl.bat jmeter-client nongui.bat
nongui.sh
Log:
Reworked startup scripts
improving compatability with JMeter 1.7 test scripts
Revision Changes Path
1.20 +2 -26 jakarta-jmeter/bin/jmeter
Index: jmeter
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jmeter 3 May 2002 00:34:40 -0000 1.19
+++ jmeter 5 Jun 2002 03:29:06 -0000 1.20
@@ -1,27 +1,3 @@
-#!/bin/sh
+#! /bin/sh
-USAGE=$0" [-h proxyHost] [-p proxyPort] [-f property-file]"
-LOG4JCONFIG=log4j.configuration=log4j.conf
-
-PROPERTIES=`dirname $0`/jmeter.properties
-
-while getopts h:p:f: x; do
- case $x in
- h) JAVA_PROPS=$JAVA_PROPS" -Dhttp.proxyHost="$OPTARG"
-Dhttps.proxyHost="$OPTARG;;
- p) JAVA_PROPS=$JAVA_PROPS" -Dhttp.proxyPort="$OPTARG"
-Dhttps.proxyPort="$OPTARG;;
- f) PROPERTIES=$OPTARG;;
- ?) echo $USAGE; exit -1;;
- esac;
-done
-
-for i in `dirname $0`/../lib/*.jar
-do
- CLASSPATH=${CLASSPATH}:$i
-done
-
-for i in `dirname $0`/../ext/*.jar
-do
- CLASSPATH=${CLASSPATH}:$i
-done
-
-java -classpath $CLASSPATH:`dirname $0`/ApacheJMeter.jar $JAVA_PROPS -D$LOG4JCONFIG
org.apache.jmeter.NewDriver $PROPERTIES
+java -Xincgc -jar `dirname $0`/ApacheJMeter.jar "$@"
1.4 +1 -25 jakarta-jmeter/bin/jmeter-server
Index: jmeter-server
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter-server,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jmeter-server 3 May 2002 00:34:40 -0000 1.3
+++ jmeter-server 5 Jun 2002 03:29:06 -0000 1.4
@@ -1,27 +1,3 @@
#!/bin/sh
-USAGE=$0" [-h remote-host] [-p policy-file] [-f property-file]"
-
-PROPERTIES=`dirname $0`/jmeter.properties
-POLICY=`pwd`/default-policy
-
-while getopts h:f:p: x; do
- case $x in
- h) JAVA_PROPS=$OPTARG;;
- p) POLICY=$OPTARG;;
- f) PROPERTIES=$OPTARG;;
- ?) echo $USAGE; exit -1;;
- esac;
-done
-
-for i in `dirname $0`/../lib/*.jar
-do
- CLASSPATH=${CLASSPATH}:$i
-done
-
-for i in `dirname $0`/../ext/*.jar
-do
- CLASSPATH=${CLASSPATH}:$i
-done
-
-java -classpath $CLASSPATH:`dirname $0`/ApacheJMeter.jar
-Djava.security.policy=$POLICY org.apache.jmeter.engine.RemoteJMeterEngineImpl
$PROPERTIES $JAVA_PROPS
\ No newline at end of file
+`dirname $0`/jmeter -s
\ No newline at end of file
1.5 +1 -22 jakarta-jmeter/bin/jmeter-server.bat
Index: jmeter-server.bat
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter-server.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jmeter-server.bat 3 May 2002 00:34:40 -0000 1.4
+++ jmeter-server.bat 5 Jun 2002 03:29:06 -0000 1.5
@@ -1,23 +1,2 @@
@echo off
-
-set PROP=jmeter.properties
-set LOG4JCONFIG=log4j.configuration=log4j.conf
-set HOST=
-set PORT=
-
-IF "%1" == "-f" set PROP=%2
-IF "%1" == "-h" set HOST=-Dhttp.proxyHost=%2 -Dhttps.proxyHost=%2
-IF "%1" == "-p" set PORT=-Dhttp.proxyPort=%2 -Dhttps.proxyPort=%2
-IF "%3" == "-f" set PROP=%4
-IF "%3" == "-h" set HOST=-Dhttp.proxyHost=%4 -Dhttps.proxyHost=%4
-IF "%3" == "-p" set PORT=-Dhttp.proxyPort=%4 -Dhttps.proxyPort=%4
-IF "%5" == "-f" set PROP=%6
-IF "%5" == "-h" set HOST=-Dhttp.proxyHost=%6 -Dhttps.proxyHost=%6
-IF "%5" == "-p" set PORT=-Dhttp.proxyPort=%6 -Dhttps.proxyPort=%6
-
-set LOCALCLASSPATH=%CLASSPATH%
-
-for %%i in ("..\lib\*.jar") do CALL ..\lcp %%i
-for %%i in ("..\ext\*.jar") do CALL ..\lcp %%i
-
-java -cp %LOCALCLASSPATH%;ApacheJMeter.jar -D%LOG4JCONFIG% %HOST% %PORT%
org.apache.jmeter.engine.RemoteJMeterEngineImpl %PROP%
+jmeter -s
1.21 +29 -18 jakarta-jmeter/bin/jmeter.bat
Index: jmeter.bat
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.bat,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jmeter.bat 23 May 2002 15:47:03 -0000 1.20
+++ jmeter.bat 5 Jun 2002 03:29:06 -0000 1.21
@@ -1,22 +1,33 @@
-@echo on
-set PROP=jmeter.properties
-set LOG4JCONFIG=log4j.configuration=log4j.conf
-set HOST=
-set PORT=
-IF "%1" == "-f" set PROP=%2
-IF "%1" == "-h" set HOST=-Dhttp.proxyHost=%2 -Dhttps.proxyHost=%2
-IF "%1" == "-p" set PORT=-Dhttp.proxyPort=%2 -Dhttps.proxyPort=%2
-IF "%3" == "-f" set PROP=%4
-IF "%3" == "-h" set HOST=-Dhttp.proxyHost=%4 -Dhttps.proxyHost=%4
-IF "%3" == "-p" set PORT=-Dhttp.proxyPort=%4 -Dhttps.proxyPort=%4
-IF "%5" == "-f" set PROP=%6
-IF "%5" == "-h" set HOST=-Dhttp.proxyHost=%6 -Dhttps.proxyHost=%6
-IF "%5" == "-p" set PORT=-Dhttp.proxyPort=%6 -Dhttps.proxyPort=%6
+@echo off
+if not "%OS%"=="Windows_NT" goto win9xStart
+:winNTStart
+@setlocal
-set LOCALCLASSPATH=%CLASSPATH%
+rem Need to check if we are using the 4NT shell...
+if "%eval[2+2]" == "4" goto setup4NT
-for %%i in ("..\lib\*.jar") do CALL ..\lcp.bat %%i
-for %%i in ("..\ext\*.jar") do CALL ..\lcp.bat %%i
+rem On NT/2K grab all arguments at once
+set JMETER_CMD_LINE_ARGS=%*
+goto doneStart
+:setup4NT
+set JMETER_CMD_LINE_ARGS=%$
+goto doneStart
-java -cp ApacheJMeter.jar -D%LOG4JCONFIG% %HOST% %PORT% org.apache.jmeter.NewDriver
%PROP%
+:win9xStart
+rem Slurp the command line arguments. This loop allows for an unlimited number of
+rem agruments (up to the command line limit, anyway).
+
+set JMETER_CMD_LINE_ARGS=
+
+:setupArgs
+if %1a==a goto doneStart
+set JMETER_CMD_LINE_ARGS=%JMETER_CMD_LINE_ARGS% %1
+shift
+goto setupArgs
+
+:doneStart
+rem This label provides a place for the argument list loop to break out
+rem and for NT handling to skip to.
+
+java -Xincgc -jar ApacheJMeter.jar %JMETER_CMD_LINE_ARGS%
1.2 +203 -123 jakarta-jmeter/src_1/org/apache/jmeter/JMeter.java
Index: JMeter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/JMeter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMeter.java 23 May 2002 15:47:04 -0000 1.1
+++ JMeter.java 5 Jun 2002 03:29:06 -0000 1.2
@@ -18,7 +18,9 @@
import org.apache.jmeter.gui.tree.JMeterTreeListener;
import org.apache.jmeter.gui.tree.JMeterTreeModel;
import org.apache.jmeter.gui.util.ComponentUtil;
+import org.apache.jmeter.reporters.ResultCollector;
import org.apache.jmeter.save.SaveService;
+import org.apache.jmeter.testelement.TestListener;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.util.ListedHashTree;
@@ -29,166 +31,199 @@
* Window>Preferences>Java>Templates.
*/
public class JMeter {
-
+
private final static int PROPFILE_OPT = 'p';
private final static int TESTFILE_OPT = 't';
private final static int LOGFILE_OPT = 'l';
- private final static int NONGUI_OPT = 'n';
+ private final static int NONGUI_OPT = 'n';
protected static final int HELP_OPT = 'h';
- protected static final int VERSION_OPT = 'v';
- protected static final int SERVER_OPT = 's';
+ protected static final int VERSION_OPT = 'v';
+ protected static final int SERVER_OPT = 's';
+ protected static final int PROXY_HOST = 'H';
+ protected static final int PROXY_PORT = 'P';
- /**
- * Define the understood options. Each CLOptionDescriptor contains:
- * - The "long" version of the option. Eg, "help" means that "--help" will
- * be recognised.
- * - The option flags, governing the option's argument(s).
- * - The "short" version of the option. Eg, 'h' means that "-h" will be
- * recognised.
- * - A description of the option.
- */
- protected static final CLOptionDescriptor [] options = new CLOptionDescriptor
[] {
- new CLOptionDescriptor("help",
- CLOptionDescriptor.ARGUMENT_DISALLOWED,
- HELP_OPT,
- "print this message and exit"),
- new CLOptionDescriptor("version",
- CLOptionDescriptor.ARGUMENT_DISALLOWED,
- VERSION_OPT,
- "print the version information and exit"),
- new CLOptionDescriptor("propfile",
- CLOptionDescriptor.ARGUMENT_REQUIRED,
- PROPFILE_OPT,
- "the jmeter property file to use"),
- new CLOptionDescriptor("testfile",
- CLOptionDescriptor.ARGUMENT_REQUIRED,
- TESTFILE_OPT,
- "the jmeter test(.jmx) file to run"),
- new CLOptionDescriptor("logfile",
- CLOptionDescriptor.ARGUMENT_REQUIRED,
- LOGFILE_OPT,
- "the file to log samples to"),
- new CLOptionDescriptor("logfile",
- CLOptionDescriptor.ARGUMENT_DISALLOWED,
- NONGUI_OPT,
- "run JMeter in nongui mode"),
- new CLOptionDescriptor("server",
- CLOptionDescriptor.ARGUMENT_DISALLOWED,
- SERVER_OPT,
- "run the JMeter server"),
- };
-
- public JMeter()
- {
-
+ /**
+ * Define the understood options. Each CLOptionDescriptor contains:
+ * - The "long" version of the option. Eg, "help" means that "--help" will
+ * be recognised.
+ * - The option flags, governing the option's argument(s).
+ * - The "short" version of the option. Eg, 'h' means that "-h" will be
+ * recognised.
+ * - A description of the option.
+ */
+ protected static final CLOptionDescriptor[] options =
+ new CLOptionDescriptor[] {
+ new CLOptionDescriptor(
+ "help",
+ CLOptionDescriptor.ARGUMENT_DISALLOWED,
+ HELP_OPT,
+ "print this message and exit"),
+ new CLOptionDescriptor(
+ "version",
+ CLOptionDescriptor.ARGUMENT_DISALLOWED,
+ VERSION_OPT,
+ "print the version information and exit"),
+ new CLOptionDescriptor(
+ "propfile",
+ CLOptionDescriptor.ARGUMENT_REQUIRED,
+ PROPFILE_OPT,
+ "the jmeter property file to use"),
+ new CLOptionDescriptor(
+ "testfile",
+ CLOptionDescriptor.ARGUMENT_REQUIRED,
+ TESTFILE_OPT,
+ "the jmeter test(.jmx) file to run"),
+ new CLOptionDescriptor(
+ "logfile",
+ CLOptionDescriptor.ARGUMENT_REQUIRED,
+ LOGFILE_OPT,
+ "the file to log samples to"),
+ new CLOptionDescriptor(
+ "logfile",
+ CLOptionDescriptor.ARGUMENT_DISALLOWED,
+ NONGUI_OPT,
+ "run JMeter in nongui mode"),
+ new CLOptionDescriptor(
+ "server",
+ CLOptionDescriptor.ARGUMENT_DISALLOWED,
+ SERVER_OPT,
+ "run the JMeter server"),
+ new CLOptionDescriptor(
+ "proxyHost",
+ CLOptionDescriptor.ARGUMENT_REQUIRED,
+ PROXY_HOST,
+ "Set a proxy server for JMeter to use"),
+ new CLOptionDescriptor(
+ "proxyPort",
+ CLOptionDescriptor.ARGUMENT_REQUIRED,
+ PROXY_PORT,
+ "Set proxy server port for JMeter to use"),
+ };
+
+ public JMeter() {
}
-
- public void startGui() throws IllegalUserActionException
- {
+
+ /**
+ * Starts up JMeter in GUI mode
+ */
+ public void startGui() throws IllegalUserActionException {
JMeterTreeModel treeModel = new JMeterTreeModel();
JMeterTreeListener treeLis = new JMeterTreeListener(treeModel);
treeLis.setActionHandler(ActionRouter.getInstance());
GuiPackage guiPack = GuiPackage.getInstance(treeLis, treeModel);
- org.apache.jmeter.gui.MainFrame main = new
org.apache.jmeter.gui.MainFrame(ActionRouter.getInstance(),
- treeModel, treeLis);
+ org.apache.jmeter.gui.MainFrame main =
+ new org.apache.jmeter.gui.MainFrame(
+ ActionRouter.getInstance(),
+ treeModel,
+ treeLis);
main.setTitle("Apache JMeter");
main.setIconImage(JMeterUtils.getImage("jmeter.jpg").getImage());
- ComponentUtil.centerComponentInWindow(main,80);
+ ComponentUtil.centerComponentInWindow(main, 80);
main.show();
- ActionRouter.getInstance().actionPerformed(new ActionEvent(
- main,1,CheckDirty.ADD_ALL));
+ ActionRouter.getInstance().actionPerformed(
+ new ActionEvent(main, 1, CheckDirty.ADD_ALL));
}
-
- public void start(String[] args)
- {
+
+ /**
+ * Takes the command line arguments and uses them to determine how to startup
JMeter.
+ */
+ public void start(String[] args) {
CLArgsParser parser = new CLArgsParser(args, options);
- if( null != parser.getErrorString() ) {
- System.err.println( "Error: " + parser.getErrorString() );
- return;
- }
- try {
- initializeProperties(parser);
-
- if(parser.getArgumentById(VERSION_OPT) != null)
- {
- System.out.println("Apache JMeter, Copyright (c) 2002 The
Apache Software Foundation");
- System.out.println("Version "+JMeterUtils.getJMeterVersion());
- }
- else if(parser.getArgumentById(HELP_OPT) != null)
- {
-
System.out.println(JMeterUtils.getResourceFileAsText("org/apache/jmeter/help.txt"));
- }
- else if(parser.getArgumentById(SERVER_OPT) != null)
- {
+ if (null != parser.getErrorString()) {
+ System.err.println("Error: " + parser.getErrorString());
+ return;
+ }
+ try {
+ initializeProperties(parser);
+ setProxy(parser);
+ if (parser.getArgumentById(VERSION_OPT) != null) {
+ System.out.println(
+ "Apache JMeter, Copyright (c) 2002 The Apache
Software Foundation");
+ System.out.println("Version " +
JMeterUtils.getJMeterVersion());
+ } else if (parser.getArgumentById(HELP_OPT) != null) {
+ System.out.println(
+
JMeterUtils.getResourceFileAsText("org/apache/jmeter/help.txt"));
+ } else if (parser.getArgumentById(SERVER_OPT) != null) {
startServer();
- }
- else if(parser.getArgumentById(NONGUI_OPT) == null)
- {
+ } else if (parser.getArgumentById(NONGUI_OPT) == null) {
startGui();
+ } else {
+ startNonGui(
+ parser.getArgumentById(TESTFILE_OPT),
+ parser.getArgumentById(LOGFILE_OPT));
}
- else
- {
-
startNonGui(parser.getArgumentById(TESTFILE_OPT),parser.getArgumentById(LOGFILE_OPT));
- }
- } catch(IllegalUserActionException e) {
+ } catch (IllegalUserActionException e) {
+ System.out.println(e.getMessage());
System.out.println("Incorrect Usage");
System.out.println(CLUtil.describeOptions(options).toString());
}
}
+ /**
+ * Sets a proxy server for the JVM if the command line arguments are specified.
+ */
+ private void setProxy(CLArgsParser parser) throws IllegalUserActionException {
+ if (parser.getArgumentById(PROXY_HOST) != null
+ && parser.getArgumentById(PROXY_PORT) != null) {
+ System.setProperty(
+ "http.proxyHost",
+ parser.getArgumentById(PROXY_HOST).getArgument());
+ System.setProperty(
+ "https.proxyHost",
+ parser.getArgumentById(PROXY_HOST).getArgument());
+ System.setProperty(
+ "http.proxyPort",
+ parser.getArgumentById(PROXY_PORT).getArgument());
+ System.setProperty(
+ "https.proxyPort",
+ parser.getArgumentById(PROXY_PORT).getArgument());
+ } else if (
+ parser.getArgumentById(PROXY_HOST) != null
+ || parser.getArgumentById(PROXY_PORT) != null) {
+ throw new IllegalUserActionException(
+ JMeterUtils.getResString("proxy_cl_error"));
+ }
+ }
+
private void initializeProperties(CLArgsParser parser) {
- if(parser.getArgumentById(PROPFILE_OPT) != null)
- {
+ if (parser.getArgumentById(PROPFILE_OPT) != null) {
JMeterUtils.getProperties(parser.getArgumentById(PROPFILE_OPT).getArgument());
- }
- else
- {
-
JMeterUtils.getProperties(System.getProperty("user.dir")+File.separator+"jmeter.properties");
+ } else {
+ JMeterUtils.getProperties(
+ System.getProperty("user.dir") + File.separator +
"jmeter.properties");
}
}
-
- public void startServer()
- {
- try
- {
+
+ public void startServer() {
+ try {
RemoteJMeterEngine engine = new RemoteJMeterEngineImpl();
- while(true)
- {
+ while (true) {
Thread.sleep(Long.MAX_VALUE);
}
- }
- catch(Exception ex)
- {
+ } catch (Exception ex) {
ex.printStackTrace();
}
}
-
- public void startNonGui(CLOption testFile,CLOption logFile) throws
IllegalUserActionException
- {
+
+ public void startNonGui(CLOption testFile, CLOption logFile)
+ throws IllegalUserActionException {
JMeter driver = new JMeter();
- if(testFile == null)
- {
+ if (testFile == null) {
throw new IllegalUserActionException();
}
- if(logFile == null)
- {
- driver.run(testFile.getArgument(),null);
- }
- else
- {
- driver.run(testFile.getArgument(),logFile.getArgument());
+ if (logFile == null) {
+ driver.run(testFile.getArgument(), null);
+ } else {
+ driver.run(testFile.getArgument(), logFile.getArgument());
}
}
- private void run(String testFile,String logFile)
- {
+ private void run(String testFile, String logFile) {
FileInputStream reader = null;
- try
- {
+ try {
File f = new File(testFile);
- if(!f.exists() || !f.isFile())
- {
+ if (!f.exists() || !f.isFile()) {
println("Could not open " + testFile);
return;
}
@@ -196,22 +231,67 @@
reader = new FileInputStream(f);
ListedHashTree tree = SaveService.loadSubTree(reader);
+ if(logFile != null)
+ {
+ ResultCollector logger = new ResultCollector();
+ logger.setFilename(logFile);
+ tree.add(tree.getArray()[0],logger);
+ }
+ tree.add(tree.getArray()[0],new ListenToTest());
println("Created the tree successfully");
StandardJMeterEngine engine = new StandardJMeterEngine();
engine.configure(tree);
println("Starting the test");
engine.runTest();
- }
- catch(Exception e)
- {
+ } catch (Exception e) {
System.out.println("Error in NonGUIDriver" + e.getMessage());
e.printStackTrace();
}
}
- private static void println(String str)
+ /**
+ * Listen to test and exit program after test completes, after a 5 second
delay to give listeners
+ * a chance to close out their files.
+ */
+ private class ListenToTest implements TestListener,Runnable
{
+ public void testEnded(String host)
+ {
+ }
+
+ public void testEnded()
+ {
+ Thread stopSoon = new Thread(this);
+ stopSoon.start();
+ }
+
+ public void testStarted(String host)
+ {
+ }
+
+ public void testStarted()
+ {
+ System.out.println(JMeterUtils.getResString("running_test"));
+ }
+
+ /**
+ * This is a hack to allow listeners a chance to close their files.
Must implement
+ * a queue for sample responses tied to the engine, and the engine
won't deliver testEnded
+ * signal till all sample responses have been delivered. Should also
improve performance of
+ * remote JMeter testing.
+ */
+ public void run()
+ {
+ try {
+ Thread.sleep(5000);
+ } catch(InterruptedException e) {
+ }
+ System.exit(0);
+ }
+ }
+
+ private static void println(String str) {
System.out.println(str);
}
-}
+}
\ No newline at end of file
1.2 +20 -2 jakarta-jmeter/src_1/org/apache/jmeter/help.txt
Index: help.txt
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/help.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- help.txt 23 May 2002 15:47:04 -0000 1.1
+++ help.txt 5 Jun 2002 03:29:06 -0000 1.2
@@ -1,6 +1,7 @@
To run Apache JMeter in GUI mode:
-Double-click on the ApacheJMeter.jar file. If this doesn't work, open a command
prompt and type:
+Double-click on the ApacheJMeter.jar file.
+If this doesn't work, open a command prompt and type:
java -jar ApacheJMeter.jar [-p property-file]
@@ -16,4 +17,21 @@
To tell Apache JMeter to use a proxy server:
Open a command prompt and type:
-java -Dhttp.proxyHost=your.proxy.host -Dhttps.proxyHost=your.proxy.host
-Dhttp.proxyPort=your.proxy.port -Dhttps.proxyPort=your.proxy.port -jar
ApacheJMeter.jar
+java -jar ApacheJMeter.jar -H [your.proxy.server] -P [your proxy server port]
+
+---------------------------------------------------
+
+To run Apache JMeter in server mode:
+Open a command prompty and type
+
+java -jar ApacheJMeter.jar -s
+
+Or, use the provided script file: jmeter-server.bat(Windows)/jmeter-server(Linux)
+
+---------------------------------------------------
+
+Please note that a script file is provided:
+jmeter.bat(Windows)/jmeter(Linux) that can be
+used in place of "java -jar ApacheJMeter.jar". Example:
+
+jmeter -p jmeter.properties -H my.proxy.com -P 9999
1.10 +4 -3 jakarta-jmeter/src_1/org/apache/jmeter/gui/MainFrame.java
Index: MainFrame.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/MainFrame.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MainFrame.java 1 Jun 2002 13:21:26 -0000 1.9
+++ MainFrame.java 5 Jun 2002 03:29:06 -0000 1.10
@@ -70,7 +70,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/06/01 13:21:26 $
+ *@created $Date: 2002/06/05 03:29:06 $
*@version 1.0
***************************************/
@@ -367,6 +367,7 @@
private void createTreePanel()
{
treePanel = new JScrollPane(makeTree());
+ treePanel.setMinimumSize(new Dimension(100,0));
}
public void drawDraggedComponent(Component dragIcon,int x,int y)
@@ -403,8 +404,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/06/01 13:21:26 $
- *@version $Revision: 1.9 $
+ *@created $Date: 2002/06/05 03:29:06 $
+ *@version $Revision: 1.10 $
***************************************/
private class WindowHappenings extends WindowAdapter
{
1.7 +10 -4 jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Load.java
Index: Load.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Load.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Load.java 1 Jun 2002 13:21:26 -0000 1.6
+++ Load.java 5 Jun 2002 03:29:06 -0000 1.7
@@ -56,7 +56,6 @@
import java.awt.event.ActionEvent;
import java.io.File;
import java.io.FileInputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.util.HashSet;
import java.util.Iterator;
@@ -66,6 +65,7 @@
import javax.swing.JFileChooser;
import org.apache.jmeter.control.GenericController;
+import org.apache.jmeter.control.gui.WorkBenchGui;
import org.apache.jmeter.exceptions.IllegalUserActionException;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.JMeterGUIComponent;
@@ -79,14 +79,13 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.util.ListedHashTree;
import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
/****************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/06/01 13:21:26 $
+ *@created $Date: 2002/06/05 03:29:06 $
*@version 1.0
***************************************/
public class Load implements Command
@@ -184,7 +183,14 @@
private JMeterGUIComponent generateGUIComponent(TestElement item) throws
Exception
{
System.out.println("getting gui for: "+item);
- JMeterGUIComponent gui =
(JMeterGUIComponent)Class.forName((String)item.getProperty(TestElement.GUI_CLASS)).newInstance();
+ JMeterGUIComponent gui = null;
+ try {
+ gui =
(JMeterGUIComponent)Class.forName((String)item.getProperty(TestElement.GUI_CLASS)).newInstance();
+ } catch(Exception e) {
+ System.out.println("Couldn't get gui for "+item);
+ e.printStackTrace();
+ gui = new WorkBenchGui();
+ }
gui.configure(item);
return gui;
}
1.6 +30 -3
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/control/AuthManager.java
Index: AuthManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/control/AuthManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AuthManager.java 2 May 2002 22:54:58 -0000 1.5
+++ AuthManager.java 5 Jun 2002 03:29:07 -0000 1.6
@@ -53,9 +53,20 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.protocol.http.control;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Serializable;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
import org.apache.jmeter.config.ConfigElement;
import org.apache.jmeter.protocol.http.util.Base64Encoder;
import org.apache.jmeter.testelement.AbstractTestElement;
@@ -69,7 +80,7 @@
*
*@author <a href="mailto:[EMAIL PROTECTED]";>Rapha�l Luta
* </a>
- *@created $Date: 2002/05/02 22:54:58 $
+ *@created $Date: 2002/06/05 03:29:07 $
*@version 0.9
***************************************/
public class AuthManager extends AbstractTestElement implements ConfigElement,
@@ -110,6 +121,22 @@
else
{
getAuthObjects().add(auth);
+ }
+ }
+
+ public void addTestElement(TestElement el)
+ {
+ if(el.getProperty("password") != null &&
+ el.getProperty("username") != null &&
+ el.getProperty("url") != null)
+ {
+ addAuth(new Authorization(el.getPropertyAsString("url"),
+ el.getPropertyAsString("username"),
+ el.getPropertyAsString("password")));
+ }
+ else
+ {
+ super.addTestElement(el);
}
}
1.13 +3 -3
jakarta-jmeter/src_1/org/apache/jmeter/reporters/ResultCollector.java
Index: ResultCollector.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/reporters/ResultCollector.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ResultCollector.java 23 May 2002 15:47:06 -0000 1.12
+++ ResultCollector.java 5 Jun 2002 03:29:07 -0000 1.13
@@ -72,7 +72,7 @@
* Title: Description: Copyright: Copyright (c) 2001 Company:
*
*@author Michael Stover
- *@created $Date: 2002/05/23 15:47:06 $
+ *@created $Date: 2002/06/05 03:29:07 $
*@version 1.0
*/
@@ -447,10 +447,10 @@
private synchronized boolean isResultMarked(SampleResult res)
{
- boolean marked = res.isMarked();
+ boolean marked = res.isMarked(getFilename());
if(!marked)
{
- res.setMarked();
+ res.setMarked(getFilename());
}
return marked;
}
1.14 +2 -1
jakarta-jmeter/src_1/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- messages.properties 31 May 2002 01:34:57 -0000 1.13
+++ messages.properties 5 Jun 2002 03:29:07 -0000 1.14
@@ -235,4 +235,5 @@
path_extension_choice=Path Extension (use ";" as separator)
you_must_enter_a_valid_number=You must enter a valid number
invalid_data=Invalid data
-error_occurred=Error Occurred
\ No newline at end of file
+error_occurred=Error Occurred
+proxy_cl_error=If specifying a proxy server, host and port must be given
\ No newline at end of file
1.13 +2 -1
jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- messages_ja.properties 31 May 2002 01:34:57 -0000 1.12
+++ messages_ja.properties 5 Jun 2002 03:29:07 -0000 1.13
@@ -229,4 +229,5 @@
path_extension_choice=Path Extension (use ";" as separator)
you_must_enter_a_valid_number=You must enter a valid number
invalid_data=Invalid data
-error_occurred=Error Occurred
\ No newline at end of file
+error_occurred=Error Occurred
+proxy_cl_error=If specifying a proxy server, host and port must be given
\ No newline at end of file
1.13 +2 -1
jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_no.properties
Index: messages_no.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_no.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- messages_no.properties 31 May 2002 01:34:57 -0000 1.12
+++ messages_no.properties 5 Jun 2002 03:29:07 -0000 1.13
@@ -228,4 +228,5 @@
path_extension_choice=Path Extension (use ";" as separator)
you_must_enter_a_valid_number=You must enter a valid number
invalid_data=Invalid data
-error_occurred=Error Occurred
\ No newline at end of file
+error_occurred=Error Occurred
+proxy_cl_error=If specifying a proxy server, host and port must be given
\ No newline at end of file
1.10 +7 -6
jakarta-jmeter/src_1/org/apache/jmeter/samplers/SampleResult.java
Index: SampleResult.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/samplers/SampleResult.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SampleResult.java 17 May 2002 01:29:35 -0000 1.9
+++ SampleResult.java 5 Jun 2002 03:29:07 -0000 1.10
@@ -67,8 +67,8 @@
* sample of an entry.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/05/17 01:29:35 $
- *@version $Revision: 1.9 $
+ *@created $Date: 2002/06/05 03:29:07 $
+ *@version $Revision: 1.10 $
*/
public class SampleResult implements Serializable
{
@@ -89,6 +89,7 @@
private String dataType;
private boolean success;
private boolean mark = false;
+ private Set files = new HashSet();
Map map;
@@ -134,14 +135,14 @@
time = 0;
}
- public void setMarked()
+ public void setMarked(String filename)
{
- mark = true;
+ files.add(filename);
}
- public boolean isMarked()
+ public boolean isMarked(String filename)
{
- return mark;
+ return files.contains(filename);
}
public String getResponseCode()
1.5 +3 -0 jakarta-jmeter/src_1/org/apache/jmeter/save/SaveService.java
Index: SaveService.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/SaveService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveService.java 16 May 2002 16:41:30 -0000 1.4
+++ SaveService.java 5 Jun 2002 03:29:07 -0000 1.5
@@ -32,6 +32,7 @@
private static final String FAILURE_MESSAGE = "failureMessage";
private static final String ERROR = "error";
private static final String FAILURE = "failure";
+ private static final String SUCCESSFUL = "success";
public SaveService()
{
@@ -66,6 +67,7 @@
result.setResponseMessage(config.getAttribute(RESPONSE_MESSAGE,""));
result.setTime(config.getAttributeAsLong(TIME,0L));
result.setTimeStamp(config.getAttributeAsLong(TIME_STAMP,0L));
+ result.setSuccessful(config.getAttributeAsBoolean(SUCCESSFUL,false));
result.setSampleLabel(config.getAttribute(LABEL,""));
result.setResponseData(getBinaryData(config.getChild(BINARY)));
Configuration[] subResults =
config.getChildren(SAMPLE_RESULT_TAG_NAME);
@@ -150,6 +152,7 @@
config.setAttribute(THREAD_NAME,result.getThreadName());
config.setAttribute(DATA_TYPE,result.getDataType());
config.setAttribute(TIME_STAMP,""+result.getTimeStamp());
+
config.setAttribute(SUCCESSFUL,Boolean.toString(result.isSuccessful()));
config.addChild(getConfigForTestElement(null,result.getSamplerData()));
SampleResult[] subResults = result.getSubResults();
for(int i = 0;i < subResults.length;i++)
1.2 +3 -2
jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/AbstractConfigElementHandler.java
Index: AbstractConfigElementHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/AbstractConfigElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractConfigElementHandler.java 1 Jun 2002 13:21:27 -0000 1.1
+++ AbstractConfigElementHandler.java 5 Jun 2002 03:29:07 -0000 1.2
@@ -81,7 +81,7 @@
public class AbstractConfigElementHandler extends TagHandler
{
- protected ConfigTestElement config;
+ protected TestElement config;
protected String currentProperty;
@@ -107,9 +107,10 @@
public void setAtts(Attributes atts) throws Exception
{
- config = new
ConfigTestElement();//(AbstractConfigElement)Class.forName(className).newInstance();
+ config =
(TestElement)Class.forName(JMeterHandler.getComponentConversion(atts.getValue("type"))).newInstance();
config.setProperty(TestElement.TEST_CLASS,atts.getValue("type"));
config.setProperty(TestElement.GUI_CLASS,JMeterHandler.getGuiClass(atts.getValue("type")));
+ config.setProperty(TestElement.NAME,atts.getValue("name"));
}
1.2 +4 -2
jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/AuthManagerHandler.java
Index: AuthManagerHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/AuthManagerHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AuthManagerHandler.java 1 Jun 2002 13:21:27 -0000 1.1
+++ AuthManagerHandler.java 5 Jun 2002 03:29:07 -0000 1.2
@@ -78,6 +78,8 @@
{
private AuthManager authMan;
+ private String currentProperty;
+ private Authorization auth;
public AuthManagerHandler()
{
@@ -98,7 +100,7 @@
Iterator iter = auths.iterator();
while (iter.hasNext())
{
-
authMan.addAuth((Authorization)((TagHandler)iter.next()).getModel());
+
authMan.addTestElement((TestElement)((TagHandler)iter.next()).getModel());
}
}
@@ -106,7 +108,7 @@
{
authMan = new AuthManager();
authMan.setName(atts.getValue("name"));
-
authMan.setProperty(TestElement.GUI_CLASS,JMeterHandler.getGuiClass(atts.getValue("type")));
+
authMan.setProperty(TestElement.GUI_CLASS,"org.apache.jmeter.protocol.http.gui.AuthPanel");
}
public String getPrimaryTagName()
{
1.2 +1 -1
jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/FilerHandler.java
Index: FilerHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/FilerHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FilerHandler.java 1 Jun 2002 13:21:27 -0000 1.1
+++ FilerHandler.java 5 Jun 2002 03:29:07 -0000 1.2
@@ -67,7 +67,7 @@
model = new ResultCollector();
model.setName(atts.getValue("name"));
model.setFilename(atts.getValue("file"));
-
model.setProperty(TestElement.GUI_CLASS,"org.apache.jmeter.visualizer.GraphVisualizer");
+
model.setProperty(TestElement.GUI_CLASS,"org.apache.jmeter.visualizers.GraphVisualizer");
}
1.2 +5 -3
jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/JMeterComponentHandler.java
Index: JMeterComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/JMeterComponentHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMeterComponentHandler.java 1 Jun 2002 13:21:27 -0000 1.1
+++ JMeterComponentHandler.java 5 Jun 2002 03:29:07 -0000 1.2
@@ -5,6 +5,7 @@
import org.apache.jmeter.gui.JMeterComponentModel;
import org.apache.jmeter.save.old.Saveable;
import org.apache.jmeter.save.old.xml.TagHandler;
+import org.apache.jmeter.testelement.TestElement;
import org.xml.sax.Attributes;
/**
@@ -18,7 +19,7 @@
public class JMeterComponentHandler extends TagHandler
{
- JMeterComponentModel model;
+ TestElement model;
public JMeterComponentHandler()
{
@@ -36,8 +37,9 @@
public void setAtts(Attributes atts) throws java.lang.Exception
{
- model =
(JMeterComponentModel)Class.forName(atts.getValue("type")).newInstance();
- model.setName(atts.getValue("name"));
+ model =
(TestElement)Class.forName(JMeterHandler.getComponentConversion(atts.getValue("type"))).newInstance();
+ model.setProperty(TestElement.NAME,atts.getValue("name"));
+
model.setProperty(TestElement.GUI_CLASS,JMeterHandler.getGuiClass(atts.getValue("type")));
}
public String getPrimaryTagName()
1.2 +40 -0
jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/JMeterHandler.java
Index: JMeterHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/JMeterHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMeterHandler.java 1 Jun 2002 13:21:27 -0000 1.1
+++ JMeterHandler.java 5 Jun 2002 03:29:07 -0000 1.2
@@ -80,6 +80,7 @@
private static String TOKENS = "&'\"<>\n\r\t\f\b\\";
private static Map guiClassMap = new HashMap();
private static Map propertyConversion = new HashMap();
+ private static Map componentMap = new HashMap();
static
{
@@ -87,6 +88,26 @@
guiClassMap.put("org.apache.jmeter.control.ModifyController","org.apache.jmeter.control.gui.LogicControllerGui");
guiClassMap.put("org.apache.jmeter.control.LogicController",
"org.apache.jmeter.control.gui.LogicControllerGui");
+ guiClassMap.put("org.apache.jmeter.timers.GaussianRandomTimer",
+ "org.apache.jmeter.timers.gui.GaussianRandomTimerGui");
+ guiClassMap.put("org.apache.jmeter.timers.ConstantTimer",
+ "org.apache.jmeter.timers.gui.ConstantTimerGui");
+ guiClassMap.put("org.apache.jmeter.timers.UniformRandomTimer",
+ "org.apache.jmeter.timers.gui.UniformRandomTimerGui");
+ guiClassMap.put("org.apache.jmeter.visualizers.GraphModel",
+ "org.apache.jmeter.visualizers.GraphVisualizer");
+ guiClassMap.put("org.apache.jmeter.reporters.AssertionReporter",
+ "org.apache.jmeter.visualizers.AssertionVisualizer");
+ guiClassMap.put("org.apache.jmeter.reporters.ResultCollector",
+
"org.apache.jmeter.visualizers.ViewResultsFullVisualizer");
+ guiClassMap.put("org.apache.jmeter.control.LoopController",
+ "org.apache.jmeter.control.gui.LoopControlPanel");
+
guiClassMap.put("org.apache.jmeter.protocol.http.modifier.AnchorModifier",
+
"org.apache.jmeter.protocol.http.modifier.gui.AnchorModifierGui");
+ guiClassMap.put("org.apache.jmeter.control.InterleaveControl",
+ "org.apache.jmeter.control.gui.InterleaveControlGui");
+ guiClassMap.put("org.apache.jmeter.control.OnceOnlyController",
+
"org.apache.jmeter.control.gui.OnceOnlyControllerGui");
propertyConversion.put("arguments",HTTPSampler.ARGUMENTS);
propertyConversion.put("port",HTTPSampler.PORT);
@@ -96,6 +117,13 @@
propertyConversion.put("path",HTTPSampler.PATH);
propertyConversion.put("name",TestElement.NAME);
+
+
componentMap.put("org.apache.jmeter.visualizers.GraphModel","org.apache.jmeter.reporters.ResultCollector");
+
componentMap.put("org.apache.jmeter.reporters.AssertionReporter","org.apache.jmeter.reporters.ResultCollector");
+
componentMap.put("org.apache.jmeter.reporters.ResultCollector","org.apache.jmeter.reporters.ResultCollector");
+
componentMap.put("org.apache.jmeter.protocol.http.config.UrlConfig","org.apache.jmeter.config.ConfigTestElement");
+
componentMap.put("org.apache.jmeter.protocol.http.config.MultipartUrlConfig","org.apache.jmeter.config.ConfigTestElement");
+
}
@@ -104,6 +132,18 @@
*/
public JMeterHandler()
{
+ }
+
+ public static String getComponentConversion(String old)
+ {
+ if(componentMap.containsKey(old))
+ {
+ return (String)componentMap.get(old);
+ }
+ else
+ {
+ return old;
+ }
}
/**
1.2 +3 -3
jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/ProxyControlHandler.java
Index: ProxyControlHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/ProxyControlHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProxyControlHandler.java 1 Jun 2002 13:21:27 -0000 1.1
+++ ProxyControlHandler.java 5 Jun 2002 03:29:07 -0000 1.2
@@ -93,9 +93,9 @@
***********************************************************/
public void setAtts(Attributes atts) throws Exception
{
- String className = atts.getValue("type");
- config = (ProxyControl)Class.forName(className).newInstance();
-
config.setProperty(TestElement.GUI_CLASS,JMeterHandler.getGuiClass(atts.getValue("type")));
+ config = new ProxyControl();
+
config.setProperty(TestElement.GUI_CLASS,"org.apache.jmeter.protocol.http.proxy.gui.ProxyControlGui");
+ config.setProperty(TestElement.NAME,atts.getValue("name"));
}
/************************************************************
1.2 +1 -4
jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/TimerHandler.java
Index: TimerHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/TimerHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TimerHandler.java 1 Jun 2002 13:21:27 -0000 1.1
+++ TimerHandler.java 5 Jun 2002 03:29:07 -0000 1.2
@@ -52,10 +52,7 @@
{
timer = (Timer)Class.forName(atts.getValue("type")).newInstance();
((TestElement)timer).setProperty(TestElement.GUI_CLASS,JMeterHandler.getGuiClass(atts.getValue("type")));
- if(timer instanceof JMeterComponentModel)
- {
- ((JMeterComponentModel)timer).setName(atts.getValue("name"));
- }
+
((TestElement)timer).setProperty(TestElement.NAME,atts.getValue("name"));
}
public void delay(String data)
1.6 +8 -7
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/StatVisualizer.java
Index: StatVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/StatVisualizer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StatVisualizer.java 1 May 2002 01:39:40 -0000 1.5
+++ StatVisualizer.java 5 Jun 2002 03:29:08 -0000 1.6
@@ -81,7 +81,7 @@
* Company: Apache Foundation
*
*@author James Boutcher
- *@created $Date: 2002/05/01 01:39:40 $
+ *@created $Date: 2002/06/05 03:29:08 $
*@version 1.0
***************************************/
@@ -231,6 +231,7 @@
{
myStatTableModel.clear();
myJTable.tableChanged(new TableModelEvent(myStatTableModel));
+ model.clear();
}
/****************************************
@@ -394,8 +395,8 @@
* support our dynamically-sizing TableModel for this visualizer.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/05/01 01:39:40 $
- *@version $Revision: 1.5 $
+ *@created $Date: 2002/06/05 03:29:08 $
+ *@version $Revision: 1.6 $
***************************************/
class SortFilterModel extends AbstractTableModel
@@ -580,8 +581,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/05/01 01:39:40 $
- *@version $Revision: 1.5 $
+ *@created $Date: 2002/06/05 03:29:08 $
+ *@version $Revision: 1.6 $
***************************************/
private class Row implements Comparable
{
@@ -630,8 +631,8 @@
* Class which implements the model for our main table in this visualizer.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/05/01 01:39:40 $
- *@version $Revision: 1.5 $
+ *@created $Date: 2002/06/05 03:29:08 $
+ *@version $Revision: 1.6 $
***************************************/
class StatTableModel extends AbstractTableModel
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
