mstover1 2002/08/30 08:51:21
Modified: bin jmeter.properties
src/components/org/apache/jmeter/visualizers
ViewResultsFullVisualizer.java
src/core/org/apache/jmeter/gui/util FilePanel.java
src/core/org/apache/jmeter/reporters ResultCollector.java
src/core/org/apache/jmeter/resources messages.properties
messages_de.properties messages_ja.properties
messages_no.properties
src/core/org/apache/jmeter/visualizers/gui
AbstractVisualizer.java
Log:
Enabling View Results Tree visualizer to record only error samples.
Revision Changes Path
1.45 +3 -3 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- jmeter.properties 24 Aug 2002 02:44:25 -0000 1.44
+++ jmeter.properties 30 Aug 2002 15:51:20 -0000 1.45
@@ -58,15 +58,15 @@
config.tree.icon=leafnode.gif
# Remote Hosts - comma delimited
-#remote_hosts=127.0.0.1
+remote_hosts=127.0.0.1
#Components to not display in JMeter GUI
not_in_menu=Remote Method Configuration,JNDI Configuration,JNDI Lookup
Configuration,JNDI Request,Default
Controller,org.apache.jmeter.control.DynamicController,
org.apache.jmeter.protocol.http.control.Cookie,org.apache.jmeter.protocol.http.control.Authorization,org.apache.jmeter.config.LoginConfig,Header,org.apache.jmeter.protocol.http.config.MultipartUrlConfig
#Logging levels for the logging categories in JMeter. Correct values are
FATAL_ERROR, ERROR, WARN, INFO, and DEBUG
log_level.jmeter=WARN
-log_level.jmeter.engine=INFO
-log_level.jmeter.gui=WARN
+log_level.jmeter.engine=DEBUG
+log_level.jmeter.gui=DEBUG
log_level.jmeter.elements=WARN
log_level.jmeter.util=WARN
log_level.jmeter.util.classfinder=WARN
1.7 +2 -3
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Index: ViewResultsFullVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ViewResultsFullVisualizer.java 29 Aug 2002 18:17:37 -0000 1.6
+++ ViewResultsFullVisualizer.java 30 Aug 2002 15:51:21 -0000 1.7
@@ -329,7 +329,6 @@
protected void init()
{
this.setLayout(new BorderLayout());
- log.debug("Start : init1");
SampleResult rootSampleResult = new SampleResult();
rootSampleResult.setSampleLabel("Root");
rootSampleResult.setSuccessful(true);
@@ -347,9 +346,9 @@
resultPane = new JScrollPane(resultPanel);
treeSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT,
treePane, resultPane);
+ getFilePanel().add(getErrorLoggingCheckbox());
add(getFilePanel(),BorderLayout.NORTH);
add(treeSplitPane,BorderLayout.CENTER);
- log.debug("End : init1");
}
private class ResultsNodeRenderer extends DefaultTreeCellRenderer
1.2 +27 -5
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/FilePanel.java
Index: FilePanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/FilePanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FilePanel.java 11 Aug 2002 19:24:44 -0000 1.1
+++ FilePanel.java 30 Aug 2002 15:51:21 -0000 1.2
@@ -52,11 +52,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/package org.apache.jmeter.gui.util;
-import javax.swing.*;
+import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.*;
-import javax.swing.event.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
import org.apache.jmeter.util.JMeterUtils;
/**
@@ -71,24 +82,33 @@
public class FilePanel extends JPanel implements ActionListener
{
- JTextField filename = new JTextField(30);
+ JTextField filename = new JTextField(20);
JLabel label = new
JLabel(JMeterUtils.getResString("file_visualizer_filename"));
JButton browse = new JButton(JMeterUtils.getResString("browse"));
List listeners = new LinkedList();
+ String title;
/**
* Constructor for the FilePanel object
*/
public FilePanel()
{
+ title = "";
+ init();
+ }
+
+ public FilePanel(String title)
+ {
+ this.title = title;
init();
}
/**
* Constructor for the FilePanel object
*/
- public FilePanel(ChangeListener l)
+ public FilePanel(ChangeListener l,String title)
{
+ this.title = title;
init();
listeners.add(l);
}
@@ -103,6 +123,8 @@
*/
private void init()
{
+ this.setLayout(new FlowLayout(FlowLayout.LEFT));
+ setBorder(BorderFactory.createTitledBorder(title));
add(label);
add(filename);
filename.addActionListener(this);
1.6 +29 -9
jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java
Index: ResultCollector.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResultCollector.java 30 Aug 2002 14:43:20 -0000 1.5
+++ ResultCollector.java 30 Aug 2002 15:51:21 -0000 1.6
@@ -101,6 +101,7 @@
private final static String COLLECTED = "collected";
public final static String FILENAME = "filename";
private static boolean functionalMode = false;
+ public static final String ERROR_LOGGING = "ResultCollector.error_logging";
/**
* !ToDo (Field description)
@@ -122,6 +123,7 @@
{
current = -1;
serializer = new DefaultConfigurationSerializer();
+ setErrorLogging(false);
}
private void setFilenameProperty(String f)
@@ -133,6 +135,16 @@
{
return getPropertyAsString(FILENAME);
}
+
+ public boolean isErrorLogging()
+ {
+ return getPropertyAsBoolean(ERROR_LOGGING);
+ }
+
+ public void setErrorLogging(boolean errorLogging)
+ {
+ setProperty(ERROR_LOGGING,new Boolean(errorLogging));
+ }
/**
* Sets the filename attribute of the ResultCollector object
@@ -268,6 +280,11 @@
{
functionalMode = mode;
}
+
+ public boolean getFunctionalMode()
+ {
+ return functionalMode || isErrorLogging();
+ }
/**
* Gets the serializedSampleResult attribute of the ResultCollector object
@@ -279,7 +296,7 @@
IOException,ConfigurationException
{
ByteArrayOutputStream tempOut = new ByteArrayOutputStream();
- serializer.serialize(tempOut,
SaveService.getConfiguration(result,functionalMode));
+ serializer.serialize(tempOut,
SaveService.getConfiguration(result,getFunctionalMode()));
String serVer = tempOut.toString();
return
serVer.substring(serVer.indexOf(System.getProperty("line.separator")));
}
@@ -357,14 +374,17 @@
*/
public void sampleOccurred(SampleEvent e)
{
- sendToVisualizer(e.getResult());
- try
+ if(!isErrorLogging() || !e.getResult().isSuccessful())
{
- recordResult(e.getResult());
- }
- catch(Exception err)
- {
- log.error("",err); //should throw exception back to caller
+ sendToVisualizer(e.getResult());
+ try
+ {
+ recordResult(e.getResult());
+ }
+ catch(Exception err)
+ {
+ log.error("",err); //should throw exception back to
caller
+ }
}
}
1.13 +3 -2
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- messages.properties 29 Aug 2002 18:17:39 -0000 1.12
+++ messages.properties 30 Aug 2002 15:51:21 -0000 1.13
@@ -154,7 +154,7 @@
file_visualizer_open=Open
file_visualizer_flush=Flush
file_visualizer_close=Close
-file_visualizer_filename=Enter a new filename, or browse to an existing file.
+file_visualizer_filename=Filename
file_visualizer_file_options=File Options
file_visualizer_missing_filename=No output filename specified.
url_config_post=POST
@@ -299,4 +299,5 @@
var_name=Reference Name
counter_per_user=Track counter independently for each user
max=Maximum
-error_loading_help=Error loading help page
\ No newline at end of file
+error_loading_help=Error loading help page
+log_errors_only=Log Errors Only
\ No newline at end of file
1.14 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties
Index: messages_de.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- messages_de.properties 29 Aug 2002 17:02:17 -0000 1.13
+++ messages_de.properties 30 Aug 2002 15:51:21 -0000 1.14
@@ -299,4 +299,5 @@
var_name=Reference Name
counter_per_user=Track counter independently for each user
max=Maximum
-error_loading_help=Error loading help page
\ No newline at end of file
+error_loading_help=Error loading help page
+log_errors_only=Log Errors Only
\ No newline at end of file
1.12 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- messages_ja.properties 29 Aug 2002 17:02:17 -0000 1.11
+++ messages_ja.properties 30 Aug 2002 15:51:21 -0000 1.12
@@ -294,4 +294,5 @@
var_name=Reference Name
counter_per_user=Track counter independently for each user
max=Maximum
-error_loading_help=Error loading help page
\ No newline at end of file
+error_loading_help=Error loading help page
+log_errors_only=Log Errors Only
\ No newline at end of file
1.12 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties
Index: messages_no.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- messages_no.properties 29 Aug 2002 17:02:17 -0000 1.11
+++ messages_no.properties 30 Aug 2002 15:51:21 -0000 1.12
@@ -286,4 +286,5 @@
var_name=Reference Name
counter_per_user=Track counter independently for each user
max=Maximum
-error_loading_help=Error loading help page
\ No newline at end of file
+error_loading_help=Error loading help page
+log_errors_only=Log Errors Only
\ No newline at end of file
1.4 +14 -2
jakarta-jmeter/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
Index: AbstractVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractVisualizer.java 29 Aug 2002 18:17:41 -0000 1.3
+++ AbstractVisualizer.java 30 Aug 2002 15:51:21 -0000 1.4
@@ -3,6 +3,7 @@
import java.util.Arrays;
import java.util.Collection;
+import javax.swing.JCheckBox;
import javax.swing.JPopupMenu;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -34,6 +35,7 @@
"jmeter.gui");
private FilePanel filePanel;
+ private JCheckBox errorLogging;
ResultCollector collector;
/****************************************
@@ -41,7 +43,14 @@
***************************************/
public AbstractVisualizer() {
super();
- filePanel = new FilePanel(this);
+ filePanel = new FilePanel(this,
+
JMeterUtils.getResString("file_visualizer_output_file"));
+ errorLogging = new
JCheckBox(JMeterUtils.getResString("log_errors_only"));
+ }
+
+ protected JCheckBox getErrorLoggingCheckbox()
+ {
+ return errorLogging;
}
@@ -89,6 +98,7 @@
collector = new ResultCollector();
}
configureTestElement(collector);
+ collector.setErrorLogging(errorLogging.isSelected());
try {
if (!getFile().equals("")) {
try {
@@ -110,6 +120,8 @@
{
super.configure(el);
setFile(el.getPropertyAsString(ResultCollector.FILENAME));
+ ResultCollector rc = (ResultCollector)el;
+ errorLogging.setSelected(rc.isErrorLogging());
}
/****************************************
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
