mstover1 2002/08/30 07:43:21
Modified: src/components/org/apache/jmeter/modifiers
CounterConfig.java
src/components/org/apache/jmeter/visualizers
GraphAccumModel.java GraphAccumVisualizer.java
GraphModel.java Sample.java SplineVisualizer.java
StatVisualizer.java
src/core/org/apache/jmeter/engine
RemoteJMeterEngineImpl.java
StandardJMeterEngine.java
src/core/org/apache/jmeter/gui ListDialog.java
MainFrame.java
src/core/org/apache/jmeter/gui/action ActionRouter.java
Load.java RemoteStart.java Start.java
src/core/org/apache/jmeter/gui/tree JMeterTreeModel.java
src/core/org/apache/jmeter/gui/util JMeterColor.java
PowerTableModel.java VerticalLayout.java
src/core/org/apache/jmeter/junit JMeterTest.java
src/core/org/apache/jmeter/reporters FileReporter.java
ResultCollector.java
src/core/org/apache/jmeter/samplers
RemoteSampleListener.java
RemoteSampleListenerImpl.java SampleListener.java
src/core/org/apache/jmeter/threads ListenerNotifier.java
src/core/org/apache/jmeter/util Data.java TextFile.java
src/protocol/http/org/apache/jmeter/protocol/http/sampler
HTTPSampler.java
src/protocol/java/org/apache/jmeter/protocol/java/sampler
JavaSampler.java
src/protocol/java/org/apache/jmeter/protocol/java/test
SleepTest.java
src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler
JDBCSampler.java
Added: src/core/org/apache/jmeter/gui/action
GlobalMouseListener.java
Removed: src/core/org/apache/jmeter/reporters AssertionReporter.java
Log:
Fixing serialization and other problems with remote testing
Revision Changes Path
1.2 +1 -1
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java
Index: CounterConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CounterConfig.java 28 Aug 2002 21:29:26 -0000 1.1
+++ CounterConfig.java 30 Aug 2002 14:43:19 -0000 1.2
@@ -22,7 +22,7 @@
private final static String VAR_NAME = "CounterConfig.name";
private boolean perUser = false;
- private int globalCounter = 0;
+ private int globalCounter = -1;
private int increment = 1;
private int start = 0;
private int end = Integer.MAX_VALUE;
1.4 +2 -1
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java
Index: GraphAccumModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GraphAccumModel.java 29 Aug 2002 18:17:37 -0000 1.3
+++ GraphAccumModel.java 30 Aug 2002 14:43:19 -0000 1.4
@@ -53,6 +53,7 @@
*/
package org.apache.jmeter.visualizers;
+import java.io.Serializable;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
@@ -70,7 +71,7 @@
*@version 1.0
*/
-public class GraphAccumModel implements Clearable
+public class GraphAccumModel implements Clearable,Serializable
{
/**
* Description of the Field
1.4 +4 -4
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
Index: GraphAccumVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GraphAccumVisualizer.java 29 Aug 2002 18:17:37 -0000 1.3
+++ GraphAccumVisualizer.java 30 Aug 2002 14:43:19 -0000 1.4
@@ -88,16 +88,16 @@
/****************************************
* !ToDo (Field description)
***************************************/
- protected GraphAccumModel model;
+ protected transient GraphAccumModel model;
/****************************************
* !ToDo (Field description)
***************************************/
- protected GraphAccum graph;
+ protected transient GraphAccum graph;
/****************************************
* !ToDo (Field description)
***************************************/
- protected JPanel legendPanel;
+ transient protected JPanel legendPanel;
transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
1.2 +8 -7
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphModel.java
Index: GraphModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GraphModel.java 11 Aug 2002 19:24:41 -0000 1.1
+++ GraphModel.java 30 Aug 2002 14:43:19 -0000 1.2
@@ -55,13 +55,14 @@
package org.apache.jmeter.visualizers;
-import org.apache.jmeter.gui.*;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
-import java.util.*;
-
-
-import org.apache.jmeter.samplers.*;
-import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jmeter.samplers.Clearable;
+import org.apache.jmeter.samplers.SampleResult;
/**
* Title: Apache JMeter Description: Copyright: Copyright (c) 2000 Company:
@@ -73,7 +74,7 @@
*/
-public class GraphModel implements Clearable
+public class GraphModel implements Clearable,Serializable
{
private String name;
1.2 +7 -1
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/Sample.java
Index: Sample.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/Sample.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Sample.java 11 Aug 2002 19:24:41 -0000 1.1
+++ Sample.java 30 Aug 2002 14:43:19 -0000 1.2
@@ -54,6 +54,8 @@
*/
package org.apache.jmeter.visualizers;
+import java.io.Serializable;
+
/**
* Title: Apache JMeter
* Description:
@@ -63,7 +65,7 @@
* @version 1.0
*/
- public class Sample
+ public class Sample implements Serializable
{
/**
@@ -97,5 +99,9 @@
this.deviation = deviation;
this.throughput = throughput;
this.error = error;
+ }
+
+ public Sample()
+ {
}
}
1.2 +5 -5
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
Index: SplineVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SplineVisualizer.java 11 Aug 2002 19:24:41 -0000 1.1
+++ SplineVisualizer.java 30 Aug 2002 14:43:19 -0000 1.2
@@ -107,7 +107,7 @@
***************************************/
protected final boolean FILL_UP_WITH_ZEROS = false;
- private SplineGraph graph = null;
+ transient private SplineGraph graph = null;
private JLabel minimumLabel = null;
private JLabel maximumLabel = null;
@@ -118,7 +118,7 @@
private JLabel maximumNumberLabel = null;
private JLabel averageNumberLabel = null;
private JLabel incomingNumberLabel = null;
- private SplineModel model;
+ transient private SplineModel model;
/****************************************
* !ToDo (Constructor description)
1.3 +13 -9
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
Index: StatVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/StatVisualizer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StatVisualizer.java 24 Aug 2002 03:56:07 -0000 1.2
+++ StatVisualizer.java 30 Aug 2002 14:43:19 -0000 1.3
@@ -114,8 +114,8 @@
// private boolean data = true;
// private boolean average = true;
// private boolean deviation = true;
- private StatVisualizerModel model;
- private StatTableModel myStatTableModel;
+ transient private StatVisualizerModel model;
+ transient private StatTableModel myStatTableModel;
/****************************************
* Constructor for the Graph object
***************************************/
@@ -318,6 +318,10 @@
rows[i] = new Row();
rows[i].index = i;
}
+ }
+
+ public SortFilterModel()
+ {
}
/****************************************
* !ToDo (Method description)
1.4 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
Index: RemoteJMeterEngineImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RemoteJMeterEngineImpl.java 29 Aug 2002 18:17:38 -0000 1.3
+++ RemoteJMeterEngineImpl.java 30 Aug 2002 14:43:19 -0000 1.4
@@ -90,7 +90,7 @@
}
catch(Exception ex)
{
- log.error("",ex);
+ log.error("rmiregistry needs to be running to start JMeter in
server mode",ex);
}
}
1.13 +5 -3
jakarta-jmeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Index: StandardJMeterEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- StandardJMeterEngine.java 29 Aug 2002 18:17:38 -0000 1.12
+++ StandardJMeterEngine.java 30 Aug 2002 14:43:19 -0000 1.13
@@ -55,6 +55,7 @@
package org.apache.jmeter.engine;
import java.io.PrintWriter;
+import java.io.Serializable;
import java.io.StringWriter;
import java.util.HashMap;
import java.util.HashSet;
@@ -84,7 +85,8 @@
*@created $Date$
*@version $Revision$
***********************************************************/
-public class StandardJMeterEngine implements
JMeterEngine,JMeterThreadMonitor,Runnable
+public class StandardJMeterEngine implements JMeterEngine,JMeterThreadMonitor,
+ Runnable,Serializable
{
transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.engine");
1.2 +4 -1 jakarta-jmeter/src/core/org/apache/jmeter/gui/ListDialog.java
Index: ListDialog.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/ListDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ListDialog.java 11 Aug 2002 19:24:43 -0000 1.1
+++ ListDialog.java 30 Aug 2002 14:43:19 -0000 1.2
@@ -85,6 +85,9 @@
Vector listData;
+ public ListDialog()
+ {
+ }
/*************************
* Constructor takes a label for instructions to the user, and a list of items
1.4 +65 -22 jakarta-jmeter/src/core/org/apache/jmeter/gui/MainFrame.java
Index: MainFrame.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/MainFrame.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MainFrame.java 28 Aug 2002 02:58:53 -0000 1.3
+++ MainFrame.java 30 Aug 2002 14:43:19 -0000 1.4
@@ -53,20 +53,51 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.gui;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.tree.*;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTree;
+import javax.swing.MenuElement;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import javax.swing.tree.TreeCellRenderer;
+import javax.swing.tree.TreeModel;
+
import org.apache.jmeter.gui.action.ActionRouter;
-import org.apache.jmeter.gui.tree.*;
+import org.apache.jmeter.gui.action.GlobalMouseListener;
+import org.apache.jmeter.gui.tree.JMeterCellRenderer;
+import org.apache.jmeter.gui.tree.JMeterTreeListener;
+import org.apache.jmeter.gui.util.ComponentUtil;
import org.apache.jmeter.gui.util.JMeterMenuBar;
-import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jmeter.gui.action.Start;
-import org.apache.jmeter.gui.action.CheckDirty;
-import org.apache.jmeter.testelement.TestListener;
import org.apache.jmeter.samplers.Remoteable;
-import org.apache.jmeter.gui.util.ComponentUtil;
+import org.apache.jmeter.testelement.TestListener;
+import org.apache.jmeter.util.JMeterUtils;
/****************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
@@ -114,6 +145,11 @@
init();
this.setDefaultCloseOperation(this.DO_NOTHING_ON_CLOSE);
}
+
+ public MainFrame()
+ {
+ }
+
/****************************************
* !ToDo (Method description)
@@ -125,11 +161,11 @@
menuBar.setFileSaveEnabled(enabled);
}
- public void showStoppingMessage()
+ public void showStoppingMessage(String host)
{
stoppingMessage = new JDialog(this,
JMeterUtils.getResString("stopping_test_title"),true);
- JLabel stopLabel = new
JLabel(JMeterUtils.getResString("stopping_test"));
+ JLabel stopLabel = new
JLabel(JMeterUtils.getResString("stopping_test")+": "+host);
stopLabel.setBorder(BorderFactory.createEmptyBorder(20,20,20,20));
stoppingMessage.getContentPane().add(stopLabel);
stoppingMessage.pack();
@@ -265,6 +301,7 @@
public void testStarted(String host)
{
+ hosts.add(host);
runningIndicator.setIcon(runningIcon);
menuBar.setRunning(true,host);
}
@@ -279,6 +316,11 @@
{
testEnded("local");
menuBar.setEnabled(false);
+ if(stoppingMessage != null)
+ {
+ stoppingMessage.dispose();
+ stoppingMessage = null;
+ }
}
public void testEnded(String host)
@@ -286,14 +328,14 @@
hosts.remove(host);
if(hosts.size() == 0)
{
- runningIndicator.setIcon(stoppedIcon);
- if(stoppingMessage != null)
- {
- stoppingMessage.dispose();
- stoppingMessage = null;
- }
+ runningIndicator.setIcon(stoppedIcon);
}
menuBar.setRunning(false,host);
+ if(stoppingMessage != null)
+ {
+ stoppingMessage.dispose();
+ stoppingMessage = null;
+ }
}
private void init()
@@ -305,6 +347,7 @@
addThemAll();
addWindowListener(new WindowHappenings());
tree.setSelectionRow(1);
+ this.addMouseListener(new GlobalMouseListener());
}
private TreeCellRenderer getCellRenderer()
1.4 +1 -0
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/ActionRouter.java
Index: ActionRouter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/ActionRouter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ActionRouter.java 29 Aug 2002 18:17:38 -0000 1.3
+++ ActionRouter.java 30 Aug 2002 14:43:20 -0000 1.4
@@ -56,6 +56,7 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.MouseListener;
import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.HashSet;
1.5 +14 -3 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Load.java
Index: Load.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Load.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Load.java 29 Aug 2002 18:17:38 -0000 1.4
+++ Load.java 30 Aug 2002 14:43:20 -0000 1.5
@@ -188,6 +188,7 @@
private JMeterGUIComponent generateGUIComponent(TestElement item) throws
Exception
{
JMeterGUIComponent gui = null;
+ fixTestElement(item);
try {
gui =
(JMeterGUIComponent)Class.forName((String)item.getProperty(TestElement.GUI_CLASS)).newInstance();
} catch(Exception e) {
@@ -209,6 +210,16 @@
ListedHashTree tree = handler.getDataTree();
updateTree(tree);
insertLoadedTree(443,tree);
+ }
+
+ private void fixTestElement(TestElement item)
+ {
+ if(item.getProperty(TestElement.GUI_CLASS).equals(
+
"org.apache.jmeter.protocol.http.config.gui.UrlConfigGui"))
+ {
+ item.setProperty(TestElement.GUI_CLASS,
+
"org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui");
+ }
}
1.4 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/RemoteStart.java
Index: RemoteStart.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/RemoteStart.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RemoteStart.java 29 Aug 2002 18:17:38 -0000 1.3
+++ RemoteStart.java 30 Aug 2002 14:43:20 -0000 1.4
@@ -108,6 +108,7 @@
String action = e.getActionCommand();
if(action.equals("remote_stop"))
{
+
GuiPackage.getInstance().getMainFrame().showStoppingMessage(name);
JMeterEngine engine = (JMeterEngine)remoteEngines.get(name);
engine.stopTest();
}
1.3 +1 -1 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Start.java
Index: Start.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Start.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Start.java 24 Aug 2002 02:44:25 -0000 1.2
+++ Start.java 30 Aug 2002 14:43:20 -0000 1.3
@@ -115,7 +115,7 @@
}
else if(e.getActionCommand().equals("stop"))
{
- GuiPackage.getInstance().getMainFrame().showStoppingMessage();
+
GuiPackage.getInstance().getMainFrame().showStoppingMessage("");
engine.stopTest();
engine = null;
}
1.1
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/GlobalMouseListener.java
Index: GlobalMouseListener.java
===================================================================
package org.apache.jmeter.gui.action;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import org.apache.jmeter.util.LoggingManager;
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
/**
* @author Administrator
*
* To change this generated comment edit the template variable "typecomment":
* Window>Preferences>Java>Templates.
*/
public class GlobalMouseListener extends MouseAdapter
{
transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(LoggingManager.GUI);
public void mousePressed(MouseEvent e)
{
log.debug("global mouse event");
}
}
1.3 +2 -3
jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
Index: JMeterTreeModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JMeterTreeModel.java 21 Aug 2002 16:09:35 -0000 1.2
+++ JMeterTreeModel.java 30 Aug 2002 14:43:20 -0000 1.3
@@ -79,8 +79,7 @@
public class JMeterTreeModel extends DefaultTreeModel
{
- private static ResourceBundle rb =
ResourceBundle.getBundle("org.apache.jmeter.resources.messages");
-
+
/****************************************
* !ToDo (Constructor description)
***************************************/
1.2 +5 -0
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JMeterColor.java
Index: JMeterColor.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JMeterColor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMeterColor.java 11 Aug 2002 19:24:44 -0000 1.1
+++ JMeterColor.java 30 Aug 2002 14:43:20 -0000 1.2
@@ -72,5 +72,10 @@
{
super(r,g,b);
}
+
+ public JMeterColor()
+ {
+ super(0,0,0);
+ }
}
1.4 +4 -0
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/PowerTableModel.java
Index: PowerTableModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/PowerTableModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PowerTableModel.java 18 Aug 2002 03:12:48 -0000 1.3
+++ PowerTableModel.java 30 Aug 2002 14:43:20 -0000 1.4
@@ -21,6 +21,10 @@
model.setHeaders(headers);
columnClasses = cc;
}
+
+ public PowerTableModel()
+ {
+ }
public void setRowValues(int row, Object[] values) {
model.setCurrentPos(row);
1.2 +10 -5
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/VerticalLayout.java
Index: VerticalLayout.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/VerticalLayout.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VerticalLayout.java 11 Aug 2002 19:24:44 -0000 1.1
+++ VerticalLayout.java 30 Aug 2002 14:43:20 -0000 1.2
@@ -53,8 +53,13 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.gui.util;
-import java.awt.*;
-import java.util.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Insets;
+import java.awt.LayoutManager;
+import java.io.Serializable;
+import java.util.Hashtable;
/****************************************
* A vertical layout manager similar to java.awt.FlowLayout. Like FlowLayout
* components do not expand to fill available space except when the horizontal
@@ -71,7 +76,7 @@
*@version $Revision$
***************************************/
-public class VerticalLayout implements LayoutManager
+public class VerticalLayout implements LayoutManager, Serializable
{
/****************************************
1.2 +58 -6 jakarta-jmeter/src/core/org/apache/jmeter/junit/JMeterTest.java
Index: JMeterTest.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/junit/JMeterTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMeterTest.java 11 Aug 2002 19:24:46 -0000 1.1
+++ JMeterTest.java 30 Aug 2002 14:43:20 -0000 1.2
@@ -1,12 +1,24 @@
package org.apache.jmeter.junit;
-import java.util.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
import junit.framework.TestCase;
+
import org.apache.jmeter.gui.JMeterGUIComponent;
-import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.util.ClassFinder;
-import java.io.Serializable;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.save.SaveService;
+import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.util.ClassFinder;
+import org.apache.jmeter.util.LoggingManager;
+import org.apache.log.Hierarchy;
+import org.apache.log.Logger;
/****************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
@@ -18,6 +30,7 @@
public class JMeterTest extends TestCase
{
+ private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(LoggingManager.TEST);
/****************************************
* !ToDo (Constructor description)
@@ -65,6 +78,38 @@
el.getProperty(TestElement.NAME),
item.getName());
}
}
+
+ public void testSerializableElements() throws Exception
+ {
+ Iterator iter = getObjects(Serializable.class).iterator();
+ while(iter.hasNext())
+ {
+ Serializable serObj = (Serializable)iter.next();
+ if(serObj.getClass().getName().endsWith("_Stub"))
+ {
+ continue;
+ }
+ try
+ {
+ log.debug("serializing class:
"+serObj.getClass().getName());
+ ByteArrayOutputStream bytes = new
ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream(bytes);
+ out.writeObject(serObj);
+ out.close();
+ ObjectInputStream in = new ObjectInputStream(new
ByteArrayInputStream(bytes.toByteArray()));
+ Object readObject = in.readObject();
+ in.close();
+ assertEquals("deserializing class:
"+serObj.getClass().getName(),
+
serObj.getClass(),readObject.getClass());
+ }
+ catch (Exception e)
+ {
+ log.error("Trying to serialize object:
"+serObj.getClass().getName(),
+ e);
+ throw e;
+ }
+ }
+ }
/****************************************
* !ToDo
@@ -97,7 +142,14 @@
List objects = new LinkedList();
while(classes.hasNext())
{
-
objects.add(Class.forName((String)classes.next()).newInstance());
+ String className = (String)classes.next();
+ try
+ {
+ objects.add(Class.forName(className).newInstance());
+ }
+ catch (IllegalAccessException e)
+ {
+ }
}
return objects;
}
1.4 +1 -0
jakarta-jmeter/src/core/org/apache/jmeter/reporters/FileReporter.java
Index: FileReporter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/FileReporter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileReporter.java 29 Aug 2002 18:17:39 -0000 1.3
+++ FileReporter.java 30 Aug 2002 14:43:20 -0000 1.4
@@ -160,6 +160,7 @@
Hashtable data;
Vector keys = new Vector();
Vector colorList = new Vector();
+ public graphPanel(){}
public graphPanel(Hashtable data) {
this.data = data;
Enumeration e = data.keys();
1.5 +3 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResultCollector.java 29 Aug 2002 18:17:39 -0000 1.4
+++ ResultCollector.java 30 Aug 2002 14:43:20 -0000 1.5
@@ -107,9 +107,9 @@
*/
//protected List results = Collections.synchronizedList(new ArrayList());
private int current;
- private DefaultConfigurationSerializer serializer;
+ transient private DefaultConfigurationSerializer serializer;
private boolean inLoading = false;
- private PrintWriter out;
+ transient private PrintWriter out;
private boolean inTest = false;
private static Map files = new HashMap();
private Set hosts = new HashSet();
1.2 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java
Index: RemoteSampleListener.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemoteSampleListener.java 11 Aug 2002 19:24:47 -0000 1.1
+++ RemoteSampleListener.java 30 Aug 2002 14:43:20 -0000 1.2
@@ -63,7 +63,7 @@
* and when sampling is stopped.
*/
public interface RemoteSampleListener
- extends java.rmi.Remote, java.io.Serializable
+ extends java.rmi.Remote
{
public void testStarted() throws RemoteException;
1.2 +20 -10
jakarta-jmeter/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
Index: RemoteSampleListenerImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemoteSampleListenerImpl.java 11 Aug 2002 19:24:47 -0000 1.1
+++ RemoteSampleListenerImpl.java 30 Aug 2002 14:43:20 -0000 1.2
@@ -70,16 +70,14 @@
{
TestListener testListener;
SampleListener sampleListener;
-
- /************************************************************
- * !ToDo (Constructor description)
- *
- *@param listeners !ToDo (Parameter description)
- *@exception RemoteException !ToDo (Exception description)
- ***********************************************************/
- public RemoteSampleListenerImpl(Object listener) throws RemoteException
+
+ public RemoteSampleListenerImpl() throws RemoteException
{
super();
+ }
+
+ public void setListener(Object listener)
+ {
if(listener instanceof TestListener)
{
testListener = (TestListener)listener;
@@ -88,6 +86,18 @@
{
sampleListener = (SampleListener)listener;
}
+ }
+
+ /************************************************************
+ * !ToDo (Constructor description)
+ *
+ *@param listeners !ToDo (Parameter description)
+ *@exception RemoteException !ToDo (Exception description)
+ ***********************************************************/
+ public RemoteSampleListenerImpl(Object listener) throws RemoteException
+ {
+ super();
+ setListener(listener);
}
public void testStarted()
1.2 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleListener.java
Index: SampleListener.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SampleListener.java 11 Aug 2002 19:24:47 -0000 1.1
+++ SampleListener.java 30 Aug 2002 14:43:20 -0000 1.2
@@ -60,7 +60,7 @@
* when a specific sample is obtained,
* and when sampling is stopped.
*/
-public interface SampleListener extends java.io.Serializable {
+public interface SampleListener {
/**
* A sample has started and stopped.
**/
1.6 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/threads/ListenerNotifier.java
Index: ListenerNotifier.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/ListenerNotifier.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ListenerNotifier.java 27 Aug 2002 18:19:26 -0000 1.5
+++ ListenerNotifier.java 30 Aug 2002 14:43:20 -0000 1.6
@@ -15,7 +15,7 @@
*/
public class ListenerNotifier extends LinkedList implements Runnable
{
- Logger log =
+ private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(LoggingManager.ENGINE);
/**
* @see java.lang.Runnable#run()
1.3 +2 -1 jakarta-jmeter/src/core/org/apache/jmeter/util/Data.java
Index: Data.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/Data.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Data.java 18 Aug 2002 03:12:49 -0000 1.2
+++ Data.java 30 Aug 2002 14:43:20 -0000 1.3
@@ -54,6 +54,7 @@
*/
package org.apache.jmeter.util;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -70,7 +71,7 @@
@author Michael Stover
@version 1.0 10/14/1998
******************************************************************/
-public class Data
+public class Data implements Serializable
{
Map data;
Map iterators = new HashMap();
1.4 +7 -2 jakarta-jmeter/src/core/org/apache/jmeter/util/TextFile.java
Index: TextFile.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/TextFile.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TextFile.java 29 Aug 2002 18:17:40 -0000 1.3
+++ TextFile.java 30 Aug 2002 14:43:20 -0000 1.4
@@ -30,6 +30,11 @@
public TextFile(File filename)
{
super(filename.toString());
+ }
+
+ public TextFile()
+ {
+ super("");
}
/************************************************************
1.13 +3 -3
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Index: HTTPSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HTTPSampler.java 29 Aug 2002 18:17:42 -0000 1.12
+++ HTTPSampler.java 30 Aug 2002 14:43:20 -0000 1.13
@@ -117,7 +117,7 @@
public final static String MULTIPART_FORM = "multipart_form";
protected static String encoding = "iso-8859-1";
private static final PostWriter postWriter = new PostWriter();
- protected HttpURLConnection conn;
+ transient protected HttpURLConnection conn;
private int connectionTries = 0;
public void setFileField(String value)
{
1.4 +1 -1
jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
Index: JavaSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaSampler.java 29 Aug 2002 18:17:42 -0000 1.3
+++ JavaSampler.java 30 Aug 2002 14:43:20 -0000 1.4
@@ -81,7 +81,7 @@
public final static String ARGUMENTS = "arguments";
- private JavaSamplerClient javaClient = null;
+ transient private JavaSamplerClient javaClient = null;
/** Logging */
transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.java");
1.4 +2 -1
jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java
Index: SleepTest.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SleepTest.java 29 Aug 2002 18:17:42 -0000 1.3
+++ SleepTest.java 30 Aug 2002 14:43:21 -0000 1.4
@@ -55,6 +55,7 @@
package org.apache.jmeter.protocol.java.test;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map.Entry;
@@ -70,7 +71,7 @@
* <code>JavaSamplerClient</code> interface.
*/
-public class SleepTest implements JavaSamplerClient {
+public class SleepTest implements JavaSamplerClient,Serializable {
/** Define category for logging */
transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.java");
/** */
1.4 +3 -3
jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
Index: JDBCSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JDBCSampler.java 29 Aug 2002 18:17:42 -0000 1.3
+++ JDBCSampler.java 30 Aug 2002 14:43:21 -0000 1.4
@@ -90,7 +90,7 @@
public static String CONNECTIONS = "JDBCSampler.connections";
public static String MAXUSE = "JDBCSampler.maxuse";
//database connection pool manager
- DBConnectionManager manager = DBConnectionManager.getManager();
+ transient DBConnectionManager manager = DBConnectionManager.getManager();
// end method
public final static String QUERY = "JDBCSampler.query";
private static Map keyMap = new HashMap();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
