mstover1 2002/08/29 11:17:43
Modified: src/components/org/apache/jmeter/assertions/gui
DurationAssertionGui.java
src/components/org/apache/jmeter/modifiers
UserParameters.java
src/components/org/apache/jmeter/reporters
MailerResultCollector.java
src/components/org/apache/jmeter/visualizers GraphAccum.java
GraphAccumModel.java GraphAccumVisualizer.java
MailerModel.java MailerVisualizer.java Spline3.java
TableDataModel.java TreeVisualizer.java
ViewResultsFullVisualizer.java
src/core/org/apache/jmeter JMeter.java
src/core/org/apache/jmeter/engine ClientJMeterEngine.java
ConvertListeners.java PreCompiler.java
RemoteJMeterEngineImpl.java
StandardJMeterEngine.java
src/core/org/apache/jmeter/functions CompoundFunction.java
ValueReplacer.java
src/core/org/apache/jmeter/gui/action ActionRouter.java
AddParent.java AddToTree.java Clear.java Help.java
Load.java RemoteStart.java Save.java
src/core/org/apache/jmeter/gui/tree JMeterTreeListener.java
src/core/org/apache/jmeter/gui/util FocusRequester.java
JMeterMenuBar.java MenuFactory.java
src/core/org/apache/jmeter/junit AllTests.java
src/core/org/apache/jmeter/reporters FileReporter.java
ResultCollector.java
src/core/org/apache/jmeter/resources messages.properties
src/core/org/apache/jmeter/samplers Entry.java
RemoteListenerWrapper.java
RemoteSampleListenerWrapper.java
RemoteTestListenerWrapper.java SampleResult.java
src/core/org/apache/jmeter/save SaveService.java
src/core/org/apache/jmeter/save/old
JMeterNameSpaceHandler.java
src/core/org/apache/jmeter/save/old/handlers
AssertionHandler.java JMeterHandler.java
JdbcTestSampleHandler.java
src/core/org/apache/jmeter/save/old/xml TagHandler.java
XmlHandler.java
src/core/org/apache/jmeter/testelement
AbstractTestElement.java VariablesCollection.java
src/core/org/apache/jmeter/threads JMeterThread.java
TestCompiler.java ThreadGroup.java
src/core/org/apache/jmeter/util ClassFinder.java
JMeterUtils.java JsseSSLManager.java
SSLManager.java TextFile.java
src/core/org/apache/jmeter/visualizers/gui
AbstractVisualizer.java
src/functions/org/apache/jmeter/functions
IterationCounter.java RegexFunction.java
ThreadNumber.java
src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler
FtpClient.java
src/protocol/http/org/apache/jmeter/protocol/http/control
Cookie.java CookieManager.java
src/protocol/http/org/apache/jmeter/protocol/http/gui
AuthPanel.java CookiePanel.java HeaderPanel.java
src/protocol/http/org/apache/jmeter/protocol/http/modifier
AnchorModifier.java URLRewritingModifier.java
UserParameterModifier.java
UserParameterXMLErrorHandler.java UserSequence.java
src/protocol/http/org/apache/jmeter/protocol/http/parser
HtmlParser.java
src/protocol/http/org/apache/jmeter/protocol/http/proxy
Admin.java Cache.java Config.java Daemon.java
Proxy.java ProxyControl.java
src/protocol/http/org/apache/jmeter/protocol/http/sampler
HTTPSampler.java HTTPSamplerFull.java
src/protocol/java/org/apache/jmeter/protocol/java/config
JavaConfig.java
src/protocol/java/org/apache/jmeter/protocol/java/config/gui
JavaConfigGui.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
src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/util
ConnectionObject.java DBConnectionManager.java
src/protocol/jndi/config/gui MethodConfigGui.java
src/protocol/jndi/sampler JNDISampler.java
Log:
Updating docs for help system
Making class members transient as appropriate
Revision Changes Path
1.4 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
Index: DurationAssertionGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DurationAssertionGui.java 23 Aug 2002 22:51:43 -0000 1.3
+++ DurationAssertionGui.java 29 Aug 2002 18:17:37 -0000 1.4
@@ -86,7 +86,7 @@
public class DurationAssertionGui extends AbstractAssertionGui implements
FocusListener
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.elements");
private JTextField duration;
1.2 +1 -1
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java
Index: UserParameters.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserParameters.java 18 Aug 2002 03:12:48 -0000 1.1
+++ UserParameters.java 29 Aug 2002 18:17:37 -0000 1.2
@@ -26,7 +26,7 @@
VariablesCollection vars = new VariablesCollection();
int counter = 0;
- Iterator threadValues;
+ transient Iterator threadValues;
/**
* @see org.apache.jmeter.config.Modifier#modifyEntry(Sampler)
*/
1.3 +1 -1
jakarta-jmeter/src/components/org/apache/jmeter/reporters/MailerResultCollector.java
Index: MailerResultCollector.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/reporters/MailerResultCollector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MailerResultCollector.java 23 Aug 2002 22:51:43 -0000 1.2
+++ MailerResultCollector.java 29 Aug 2002 18:17:37 -0000 1.3
@@ -30,7 +30,7 @@
public class MailerResultCollector extends ResultCollector implements Serializable
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.elements");
String address;
String from;
1.3 +1 -1
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccum.java
Index: GraphAccum.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccum.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphAccum.java 23 Aug 2002 21:02:11 -0000 1.2
+++ GraphAccum.java 29 Aug 2002 18:17:37 -0000 1.3
@@ -121,7 +121,7 @@
* Description of the Field
*/
protected final static int PLOT_X_WIDTH = 10;
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
// Ensure that previousPts is allocated
1.3 +1 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphAccumModel.java 23 Aug 2002 21:02:11 -0000 1.2
+++ GraphAccumModel.java 29 Aug 2002 18:17:37 -0000 1.3
@@ -112,7 +112,7 @@
* Description of the Field
*/
protected SampleResult current;
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
/**
1.3 +2 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphAccumVisualizer.java 23 Aug 2002 21:02:11 -0000 1.2
+++ GraphAccumVisualizer.java 29 Aug 2002 18:17:37 -0000 1.3
@@ -98,7 +98,7 @@
* !ToDo (Field description)
***************************************/
protected JPanel legendPanel;
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
/****************************************
1.3 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerModel.java
Index: MailerModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MailerModel.java 23 Aug 2002 21:02:12 -0000 1.2
+++ MailerModel.java 29 Aug 2002 18:17:37 -0000 1.3
@@ -108,7 +108,7 @@
private static final String FAILURE_LIMIT_KEY = "MailerModel.failureLimit";
private static final String SUCCESS_LIMIT_KEY = "MailerModel.successLimit";
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
/** The listener for changes. */
ModelListener changeListener;
1.5 +3 -3
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
Index: MailerVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MailerVisualizer.java 23 Aug 2002 21:02:12 -0000 1.4
+++ MailerVisualizer.java 29 Aug 2002 18:17:37 -0000 1.5
@@ -120,7 +120,7 @@
private MailerModel model;
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
/**
* Constructs the MailerVisualizer and initializes its GUI.
1.3 +1 -1
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/Spline3.java
Index: Spline3.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/Spline3.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Spline3.java 23 Aug 2002 22:51:43 -0000 1.2
+++ Spline3.java 29 Aug 2002 18:17:37 -0000 1.3
@@ -132,7 +132,7 @@
* @version 1.0 - 199903202000
*/
public class Spline3 {
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.gui");
protected float[][] _coefficients;
1.4 +1 -1
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/TableDataModel.java
Index: TableDataModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/TableDataModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TableDataModel.java 23 Aug 2002 22:51:43 -0000 1.3
+++ TableDataModel.java 29 Aug 2002 18:17:37 -0000 1.4
@@ -76,7 +76,7 @@
*/
public class TableDataModel extends GraphModel implements TableModel
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.gui");
List urlList = new ArrayList();
1.3 +1 -1
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/TreeVisualizer.java
Index: TreeVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/TreeVisualizer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TreeVisualizer.java 23 Aug 2002 21:02:12 -0000 1.2
+++ TreeVisualizer.java 29 Aug 2002 18:17:37 -0000 1.3
@@ -128,7 +128,7 @@
ResultCollector model;
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
//----- TreeSelectionListener interface : end -----
1.6 +2 -2
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ViewResultsFullVisualizer.java 29 Aug 2002 17:02:17 -0000 1.5
+++ ViewResultsFullVisualizer.java 29 Aug 2002 18:17:37 -0000 1.6
@@ -110,7 +110,7 @@
protected JTree jTree;
protected int childIndex;
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
/****************************************
* !ToDo (Constructor description)
1.3 +1 -1 jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
Index: JMeter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JMeter.java 23 Aug 2002 22:51:44 -0000 1.2
+++ JMeter.java 29 Aug 2002 18:17:38 -0000 1.3
@@ -88,7 +88,7 @@
* Window>Preferences>Java>Templates.
*/
public class JMeter {
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter");
private final static int PROPFILE_OPT = 'p';
1.3 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
Index: ClientJMeterEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClientJMeterEngine.java 23 Aug 2002 22:51:44 -0000 1.2
+++ ClientJMeterEngine.java 29 Aug 2002 18:17:38 -0000 1.3
@@ -74,7 +74,7 @@
***********************************************************/
public class ClientJMeterEngine implements JMeterEngine
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.engine");
RemoteJMeterEngine remote;
ListedHashTree test;
1.3 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/engine/ConvertListeners.java
Index: ConvertListeners.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/ConvertListeners.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConvertListeners.java 23 Aug 2002 22:51:44 -0000 1.2
+++ ConvertListeners.java 29 Aug 2002 18:17:38 -0000 1.3
@@ -25,7 +25,7 @@
*/
public class ConvertListeners implements ListedHashTreeVisitor {
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.engine");
/**
* @see ListedHashTreeVisitor#addNode(Object, ListedHashTree)
1.5 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/engine/PreCompiler.java
Index: PreCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/PreCompiler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PreCompiler.java 28 Aug 2002 02:58:53 -0000 1.4
+++ PreCompiler.java 29 Aug 2002 18:17:38 -0000 1.5
@@ -18,7 +18,7 @@
*/
public class PreCompiler implements ListedHashTreeVisitor
{
- private static Logger log =
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(LoggingManager.ENGINE);
private Map userDefinedVariables;
private boolean testValid = true;
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RemoteJMeterEngineImpl.java 23 Aug 2002 22:51:44 -0000 1.2
+++ RemoteJMeterEngineImpl.java 29 Aug 2002 18:17:38 -0000 1.3
@@ -72,7 +72,7 @@
extends java.rmi.server.UnicastRemoteObject
implements RemoteJMeterEngine
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.engine");
JMeterEngine backingEngine;
1.12 +3 -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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StandardJMeterEngine.java 29 Aug 2002 00:30:16 -0000 1.11
+++ StandardJMeterEngine.java 29 Aug 2002 18:17:38 -0000 1.12
@@ -86,7 +86,7 @@
***********************************************************/
public class StandardJMeterEngine implements
JMeterEngine,JMeterThreadMonitor,Runnable
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.engine");
private static long WAIT_TO_DIE = 5 * 1000; //5 seconds
Map allThreads;
1.4 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/functions/CompoundFunction.java
Index: CompoundFunction.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/functions/CompoundFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CompoundFunction.java 23 Aug 2002 22:51:44 -0000 1.3
+++ CompoundFunction.java 29 Aug 2002 18:17:38 -0000 1.4
@@ -27,7 +27,7 @@
*/
public class CompoundFunction implements Function
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.elements");
private JMeterVariables threadVars;
1.3 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/functions/ValueReplacer.java
Index: ValueReplacer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/functions/ValueReplacer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ValueReplacer.java 28 Aug 2002 15:52:59 -0000 1.2
+++ ValueReplacer.java 29 Aug 2002 18:17:38 -0000 1.3
@@ -24,7 +24,7 @@
*/
public class ValueReplacer
{
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(LoggingManager.ELEMENTS);
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(LoggingManager.ELEMENTS);
CompoundFunction masterFunction = new CompoundFunction();
Map variables = new HashMap();
1.3 +1 -1
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ActionRouter.java 23 Aug 2002 22:51:44 -0000 1.2
+++ ActionRouter.java 29 Aug 2002 18:17:38 -0000 1.3
@@ -82,7 +82,7 @@
private Map commands = new HashMap();
private static ActionRouter router;
private static AddToTree add = new AddToTree();
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.gui");
1.3 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AddParent.java
Index: AddParent.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AddParent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AddParent.java 23 Aug 2002 22:51:44 -0000 1.2
+++ AddParent.java 29 Aug 2002 18:17:38 -0000 1.3
@@ -20,7 +20,7 @@
public class AddParent implements Command
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.gui");
private static Set commands = new HashSet();
static
1.4 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AddToTree.java
Index: AddToTree.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AddToTree.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AddToTree.java 23 Aug 2002 22:51:44 -0000 1.3
+++ AddToTree.java 29 Aug 2002 18:17:38 -0000 1.4
@@ -78,7 +78,7 @@
*/
public class AddToTree implements Command
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.gui");
private Map allJMeterComponentCommands;
1.3 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Clear.java
Index: Clear.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Clear.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Clear.java 23 Aug 2002 22:51:44 -0000 1.2
+++ Clear.java 29 Aug 2002 18:17:38 -0000 1.3
@@ -76,7 +76,7 @@
public class Clear implements Command
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.gui");
public final static String CLEAR = "action.clear";
public final static String CLEAR_ALL = "action.clear_all";
1.2 +1 -1 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Help.java
Index: Help.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Help.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Help.java 29 Aug 2002 17:02:17 -0000 1.1
+++ Help.java 29 Aug 2002 18:17:38 -0000 1.2
@@ -23,7 +23,7 @@
*/
public class Help implements Command
{
- private static Logger log =
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(LoggingManager.GUI);
private static Set commands = new HashSet();
public final static String HELP = "help";
1.4 +4 -4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Load.java 25 Aug 2002 19:42:20 -0000 1.3
+++ Load.java 29 Aug 2002 18:17:38 -0000 1.4
@@ -94,7 +94,7 @@
***************************************/
public class Load implements Command
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.gui");
private static Set commands = new HashSet();
1.3 +2 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RemoteStart.java 23 Aug 2002 22:51:44 -0000 1.2
+++ RemoteStart.java 29 Aug 2002 18:17:38 -0000 1.3
@@ -81,7 +81,7 @@
public class RemoteStart extends AbstractAction
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.gui");
private Map remoteEngines = new HashMap();
1.3 +1 -1 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Save.java
Index: Save.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Save.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Save.java 23 Aug 2002 22:51:44 -0000 1.2
+++ Save.java 29 Aug 2002 18:17:38 -0000 1.3
@@ -82,7 +82,7 @@
public class Save implements Command
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.gui");
private final static String SAVE_ALL = "save_all";
private final static String SAVE = "save";
1.4 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
Index: JMeterTreeListener.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMeterTreeListener.java 25 Aug 2002 19:42:20 -0000 1.3
+++ JMeterTreeListener.java 29 Aug 2002 18:17:38 -0000 1.4
@@ -89,7 +89,7 @@
public class JMeterTreeListener implements TreeSelectionListener, MouseListener,
KeyListener,MouseMotionListener
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.gui");
Container endWindow;
JPopupMenu pop;
1.3 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/FocusRequester.java
Index: FocusRequester.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/FocusRequester.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FocusRequester.java 23 Aug 2002 22:51:44 -0000 1.2
+++ FocusRequester.java 29 Aug 2002 18:17:39 -0000 1.3
@@ -18,7 +18,7 @@
public class FocusRequester implements Runnable
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.gui");
private Component comp;
1.5 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
Index: JMeterMenuBar.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JMeterMenuBar.java 29 Aug 2002 17:02:17 -0000 1.4
+++ JMeterMenuBar.java 29 Aug 2002 18:17:39 -0000 1.5
@@ -82,7 +82,7 @@
***************************************/
public class JMeterMenuBar extends JMenuBar
{
- private static Logger log =
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
JMenu fileMenu;
JMenuItem file_save_all;
1.7 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Index: MenuFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MenuFactory.java 29 Aug 2002 17:02:17 -0000 1.6
+++ MenuFactory.java 29 Aug 2002 18:17:39 -0000 1.7
@@ -86,7 +86,7 @@
public class MenuFactory
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.gui");
/****************************************
* !ToDo (Field description)
1.4 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/junit/AllTests.java
Index: AllTests.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/junit/AllTests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AllTests.java 23 Aug 2002 22:51:44 -0000 1.3
+++ AllTests.java 29 Aug 2002 18:17:39 -0000 1.4
@@ -79,7 +79,7 @@
***********************************************************/
public class AllTests
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.test");
/************************************************************
* Constructor for the AllTests object
1.3 +1 -1
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileReporter.java 23 Aug 2002 22:51:44 -0000 1.2
+++ FileReporter.java 29 Aug 2002 18:17:39 -0000 1.3
@@ -86,7 +86,7 @@
* @author Tom Schneider
*/
public class FileReporter extends JPanel {
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.elements");
Hashtable data = new Hashtable();
/** initalize a file reporter from a file */
1.4 +2 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResultCollector.java 24 Aug 2002 03:56:07 -0000 1.3
+++ ResultCollector.java 29 Aug 2002 18:17:39 -0000 1.4
@@ -96,7 +96,7 @@
public class ResultCollector extends AbstractListenerElement implements
SampleListener, Clearable,
Serializable,TestListener,Remoteable
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.elements");
private final static String COLLECTED = "collected";
public final static String FILENAME = "filename";
1.12 +4 -4
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- messages.properties 29 Aug 2002 17:02:17 -0000 1.11
+++ messages.properties 29 Aug 2002 18:17:39 -0000 1.12
@@ -97,7 +97,7 @@
workbench_title=WorkBench
root_title=Root
menu_edit=Edit
-graph_full_results_title=GraphFull Results
+graph_full_results_title=Graph Full Results
graph_results_title=Graph Results
graph_results_data=Data
graph_results_average=Average
@@ -187,7 +187,7 @@
auth_manager_title=HTTP Authorization Manager
auth_base_url=Base URL
auths_stored=Authorizations Stored in the Authorization Manager
-anchor_modifier_title=HTTP HTML Link Parser
+anchor_modifier_title=HTML Link Parser
jndi_config_title=JNDI Configuration
jndi_url_jndi_props=JNDI Properties
jndi_lookup_title=JNDI Lookup Configuration
@@ -242,7 +242,7 @@
second=second
graph_results_throughput=Throughput
minute=minute
-http_url_rewriting_modifier_title=HTTP URL-Rewriting Modifier
+http_url_rewriting_modifier_title=HTTP URL Re-writing Modifier
session_argument_name=Session Argument Name
path_extension_choice=Path Extension (use ";" as separator)
you_must_enter_a_valid_number=You must enter a valid number
@@ -253,7 +253,7 @@
functional_mode_explanation=Select functional test mode only if you need \nto
record to file the data received from the server for each request. \n\nSelecting this
option impacts performance considerably.
stopping_test_title=Stopping Test
stopping_test=Shutting down all test threads. Please be patient.
-soap_sampler_title=Soap/XML-RPC Sampler (Alpha code)
+soap_sampler_title=SOAP/XML-RPC Request
soap_data_title=Soap/XML-RPC Data
user_defined_variables=User Defined Variables
regexfunc_param_1=Regular expression used to search results from previous request
1.3 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/samplers/Entry.java
Index: Entry.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/Entry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Entry.java 23 Aug 2002 22:51:44 -0000 1.2
+++ Entry.java 29 Aug 2002 18:17:39 -0000 1.3
@@ -77,7 +77,7 @@
public class Entry
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.elements");
Map configSet;
Set clonedSet;
1.3 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java
Index: RemoteListenerWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RemoteListenerWrapper.java 23 Aug 2002 22:51:44 -0000 1.2
+++ RemoteListenerWrapper.java 29 Aug 2002 18:17:39 -0000 1.3
@@ -20,7 +20,7 @@
public class RemoteListenerWrapper extends AbstractTestElement implements
SampleListener,TestListener,Serializable
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.elements");
RemoteSampleListener listener;
1.3 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/samplers/RemoteSampleListenerWrapper.java
Index: RemoteSampleListenerWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/RemoteSampleListenerWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RemoteSampleListenerWrapper.java 23 Aug 2002 22:51:44 -0000 1.2
+++ RemoteSampleListenerWrapper.java 29 Aug 2002 18:17:39 -0000 1.3
@@ -19,7 +19,7 @@
public class RemoteSampleListenerWrapper extends AbstractTestElement implements
SampleListener,Serializable
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.elements");
RemoteSampleListener listener;
1.3 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java
Index: RemoteTestListenerWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RemoteTestListenerWrapper.java 23 Aug 2002 22:51:44 -0000 1.2
+++ RemoteTestListenerWrapper.java 29 Aug 2002 18:17:39 -0000 1.3
@@ -19,7 +19,7 @@
public class RemoteTestListenerWrapper extends AbstractTestElement implements
TestListener,Serializable
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.elements");
RemoteSampleListener listener;
1.3 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleResult.java
Index: SampleResult.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleResult.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SampleResult.java 23 Aug 2002 21:02:12 -0000 1.2
+++ SampleResult.java 29 Aug 2002 18:17:39 -0000 1.3
@@ -127,7 +127,7 @@
*/
private final static String TOTAL_TIME = "totalTime";
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.engine");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.engine");
/**
1.4 +1 -1 jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java
Index: SaveService.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveService.java 23 Aug 2002 22:51:45 -0000 1.3
+++ SaveService.java 29 Aug 2002 18:17:39 -0000 1.4
@@ -36,7 +36,7 @@
public class SaveService
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.util");
private static final String ASSERTION_RESULT_TAG_NAME = "assertionResult";
private static final String SAMPLE_RESULT_TAG_NAME = "sampleResult";
1.3 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/save/old/JMeterNameSpaceHandler.java
Index: JMeterNameSpaceHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/old/JMeterNameSpaceHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JMeterNameSpaceHandler.java 23 Aug 2002 22:51:45 -0000 1.2
+++ JMeterNameSpaceHandler.java 29 Aug 2002 18:17:39 -0000 1.3
@@ -76,7 +76,7 @@
*/
public class JMeterNameSpaceHandler implements NameSpaceHandler {
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.util");
private static Map saveHandlers = new HashMap();
static {
1.3 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/save/old/handlers/AssertionHandler.java
Index: AssertionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/old/handlers/AssertionHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AssertionHandler.java 23 Aug 2002 22:51:45 -0000 1.2
+++ AssertionHandler.java 29 Aug 2002 18:17:39 -0000 1.3
@@ -23,7 +23,7 @@
public class AssertionHandler extends TagHandler implements SaveHandler
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.util");
ResponseAssertion model;
1.3 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/save/old/handlers/JMeterHandler.java
Index: JMeterHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/old/handlers/JMeterHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JMeterHandler.java 23 Aug 2002 22:51:45 -0000 1.2
+++ JMeterHandler.java 29 Aug 2002 18:17:39 -0000 1.3
@@ -80,7 +80,7 @@
public class JMeterHandler
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.util");
private static String TOKENS = "&'\"<>\n\r\t\f\b\\";
private static Map guiClassMap = new HashMap();
1.3 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/save/old/handlers/JdbcTestSampleHandler.java
Index: JdbcTestSampleHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/old/handlers/JdbcTestSampleHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JdbcTestSampleHandler.java 23 Aug 2002 22:51:45 -0000 1.2
+++ JdbcTestSampleHandler.java 29 Aug 2002 18:17:39 -0000 1.3
@@ -76,7 +76,7 @@
public class JdbcTestSampleHandler extends TagHandler
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.jdbc");
JDBCSampler sampler;
1.3 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/save/old/xml/TagHandler.java
Index: TagHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/old/xml/TagHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TagHandler.java 23 Aug 2002 22:51:45 -0000 1.2
+++ TagHandler.java 29 Aug 2002 18:17:40 -0000 1.3
@@ -77,7 +77,7 @@
public abstract class TagHandler implements SaveHandler
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.util");
private LinkedList tagsIn = new LinkedList();
private boolean done = false;
1.3 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/save/old/xml/XmlHandler.java
Index: XmlHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/old/xml/XmlHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XmlHandler.java 23 Aug 2002 22:51:45 -0000 1.2
+++ XmlHandler.java 29 Aug 2002 18:17:40 -0000 1.3
@@ -76,7 +76,7 @@
public class XmlHandler extends DefaultHandler
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.util");
protected LinkedList objectStack;
1.3 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
Index: AbstractTestElement.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractTestElement.java 23 Aug 2002 22:51:45 -0000 1.2
+++ AbstractTestElement.java 29 Aug 2002 18:17:40 -0000 1.3
@@ -19,7 +19,7 @@
public abstract class AbstractTestElement implements TestElement,Serializable
{
private Map testInfo = new HashMap();
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.elements");
/****************************************
1.2 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/testelement/VariablesCollection.java
Index: VariablesCollection.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/VariablesCollection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VariablesCollection.java 18 Aug 2002 03:12:49 -0000 1.1
+++ VariablesCollection.java 29 Aug 2002 18:17:40 -0000 1.2
@@ -1,5 +1,6 @@
package org.apache.jmeter.testelement;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
@@ -11,7 +12,7 @@
* To change this generated comment edit the template variable "typecomment":
* Window>Preferences>Java>Templates.
*/
-public class VariablesCollection {
+public class VariablesCollection implements Serializable {
private Map varMap = new HashMap();
public void addJMeterVariables(JMeterVariables jmVars)
1.9 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterThread.java
Index: JMeterThread.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterThread.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JMeterThread.java 28 Aug 2002 21:29:27 -0000 1.8
+++ JMeterThread.java 29 Aug 2002 18:17:40 -0000 1.9
@@ -82,7 +82,7 @@
*@version $Revision$
***************************************/
public class JMeterThread implements Runnable, java.io.Serializable {
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.engine");
static Map samplers = new HashMap();
int initialDelay = 0;
1.8 +6 -6
jakarta-jmeter/src/core/org/apache/jmeter/threads/TestCompiler.java
Index: TestCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/TestCompiler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestCompiler.java 26 Aug 2002 15:49:37 -0000 1.7
+++ TestCompiler.java 29 Aug 2002 18:17:40 -0000 1.8
@@ -48,7 +48,7 @@
public class TestCompiler implements ListedHashTreeVisitor, SampleListener
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.engine");
LinkedList stack = new LinkedList();
Map samplerConfigMap = new HashMap();
1.3 +4 -4
jakarta-jmeter/src/core/org/apache/jmeter/threads/ThreadGroup.java
Index: ThreadGroup.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/ThreadGroup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ThreadGroup.java 23 Aug 2002 22:51:45 -0000 1.2
+++ ThreadGroup.java 29 Aug 2002 18:17:40 -0000 1.3
@@ -83,7 +83,7 @@
public class ThreadGroup extends AbstractTestElement implements SampleListener,
Serializable,Controller,PerThreadClonable
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.elements");
/****************************************
* !ToDo (Field description)
1.4 +3 -3 jakarta-jmeter/src/core/org/apache/jmeter/util/ClassFinder.java
Index: ClassFinder.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/ClassFinder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClassFinder.java 23 Aug 2002 21:02:12 -0000 1.3
+++ ClassFinder.java 29 Aug 2002 18:17:40 -0000 1.4
@@ -91,7 +91,7 @@
***********************************************************/
public class ClassFinder {
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.util.classfinder");
private ClassFinder() {}
// static only
1.7 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JMeterUtils.java 27 Aug 2002 15:03:36 -0000 1.6
+++ JMeterUtils.java 29 Aug 2002 18:17:40 -0000 1.7
@@ -98,7 +98,7 @@
public class JMeterUtils
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.util");
private static LoggingManager logManager;
private static String LOG_FILE = "log_file";
1.3 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/util/JsseSSLManager.java
Index: JsseSSLManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JsseSSLManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JsseSSLManager.java 23 Aug 2002 22:51:45 -0000 1.2
+++ JsseSSLManager.java 29 Aug 2002 18:17:40 -0000 1.3
@@ -88,7 +88,7 @@
*/
public class JsseSSLManager extends SSLManager
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.util");
/**
* Cache the SecureRandom instance because it takes a long time to create
1.3 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/util/SSLManager.java
Index: SSLManager.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/SSLManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SSLManager.java 23 Aug 2002 22:51:45 -0000 1.2
+++ SSLManager.java 29 Aug 2002 18:17:40 -0000 1.3
@@ -80,7 +80,7 @@
* @version CVS $Revision$ $Date$
*/
public abstract class SSLManager {
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.util");
/** Singleton instance of the manager */
private static SSLManager manager;
1.3 +3 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TextFile.java 23 Aug 2002 22:51:45 -0000 1.2
+++ TextFile.java 29 Aug 2002 18:17:40 -0000 1.3
@@ -20,7 +20,7 @@
public class TextFile extends File
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.util");
/************************************************************
* !ToDo (Constructor description)
1.3 +2 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractVisualizer.java 23 Aug 2002 22:51:45 -0000 1.2
+++ AbstractVisualizer.java 29 Aug 2002 18:17:41 -0000 1.3
@@ -30,7 +30,7 @@
public abstract class AbstractVisualizer extends AbstractJMeterGuiComponent
implements Visualizer, ChangeListener {
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.gui");
private FilePanel filePanel;
1.4 +2 -3
jakarta-jmeter/src/functions/org/apache/jmeter/functions/IterationCounter.java
Index: IterationCounter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/IterationCounter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IterationCounter.java 28 Aug 2002 21:29:27 -0000 1.3
+++ IterationCounter.java 29 Aug 2002 18:17:41 -0000 1.4
@@ -1,10 +1,9 @@
package org.apache.jmeter.functions;
+import java.io.Serializable;
import java.util.Collection;
-import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
@@ -19,7 +18,7 @@
* To enable and disable the creation of type comments go to
* Window>Preferences>Java>Code Generation.
*/
-public class IterationCounter extends AbstractFunction
+public class IterationCounter extends AbstractFunction implements Serializable
{
private static int counter;
private static final List desc = new LinkedList();
1.6 +4 -3
jakarta-jmeter/src/functions/org/apache/jmeter/functions/RegexFunction.java
Index: RegexFunction.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/RegexFunction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RegexFunction.java 24 Aug 2002 02:44:25 -0000 1.5
+++ RegexFunction.java 29 Aug 2002 18:17:41 -0000 1.6
@@ -1,5 +1,6 @@
package org.apache.jmeter.functions;
+import java.io.Serializable;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.ArrayList;
@@ -32,8 +33,8 @@
* To change this generated comment edit the template variable "typecomment":
* Window>Preferences>Java>Templates.
*/
-public class RegexFunction extends AbstractFunction {
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+public class RegexFunction extends AbstractFunction implements Serializable {
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.elements");
public static final String ALL = "ALL";
public static final String RAND = "RAND";
@@ -44,7 +45,7 @@
Pattern searchPattern;
Object[] template;
String valueIndex,defaultValue,between;
- PatternCompiler compiler = new Perl5Compiler();
+ transient PatternCompiler compiler = new Perl5Compiler();
Pattern templatePattern;
private String name;
1.3 +3 -2
jakarta-jmeter/src/functions/org/apache/jmeter/functions/ThreadNumber.java
Index: ThreadNumber.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/ThreadNumber.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ThreadNumber.java 16 Aug 2002 21:10:21 -0000 1.2
+++ ThreadNumber.java 29 Aug 2002 18:17:41 -0000 1.3
@@ -1,5 +1,6 @@
package org.apache.jmeter.functions;
+import java.io.Serializable;
import java.util.LinkedList;
import java.util.List;
@@ -15,9 +16,9 @@
* To enable and disable the creation of type comments go to
* Window>Preferences>Java>Code Generation.
*/
-public class ThreadNumber implements Function {
+public class ThreadNumber implements Function,Serializable {
- private JMeterVariables vars;
+ transient private JMeterVariables vars;
private static final String KEY = "__threadNum";
/**
1.3 +1 -1
jakarta-jmeter/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FtpClient.java
Index: FtpClient.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FtpClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FtpClient.java 23 Aug 2002 22:51:46 -0000 1.2
+++ FtpClient.java 29 Aug 2002 18:17:41 -0000 1.3
@@ -82,7 +82,7 @@
*/
public class FtpClient
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.ftp");
File f = new File("e:\\");
BufferedWriter out;
1.3 +1 -1
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java
Index: Cookie.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Cookie.java 23 Aug 2002 22:51:46 -0000 1.2
+++ Cookie.java 29 Aug 2002 18:17:41 -0000 1.3
@@ -69,7 +69,7 @@
*/
public class Cookie extends AbstractTestElement implements Serializable
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.http");
private static String NAME = "Cookie.name";
private static String VALUE = "Cookie.value";
1.4 +2 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Index: CookieManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CookieManager.java 23 Aug 2002 22:51:46 -0000 1.3
+++ CookieManager.java 29 Aug 2002 18:17:41 -0000 1.4
@@ -92,7 +92,7 @@
public class CookieManager extends ConfigTestElement implements
Serializable,PerThreadClonable
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.http");
public static final String COOKIES = "CookieManager.cookies";
1.3 +7 -7
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
Index: AuthPanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AuthPanel.java 23 Aug 2002 22:51:46 -0000 1.2
+++ AuthPanel.java 29 Aug 2002 18:17:41 -0000 1.3
@@ -101,7 +101,7 @@
***************************************/
public class AuthPanel extends AbstractConfigGui implements ActionListener
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.http");
InnerTableModel tableModel;
1.3 +3 -3
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
Index: CookiePanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CookiePanel.java 23 Aug 2002 22:51:46 -0000 1.2
+++ CookiePanel.java 29 Aug 2002 18:17:41 -0000 1.3
@@ -99,7 +99,7 @@
***************************************/
public class CookiePanel extends AbstractConfigGui implements ActionListener
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.http");
private final static int columnCount = 6;
private final static String[] columnNames = {
1.4 +7 -7
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
Index: HeaderPanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HeaderPanel.java 23 Aug 2002 22:51:46 -0000 1.3
+++ HeaderPanel.java 29 Aug 2002 18:17:41 -0000 1.4
@@ -101,7 +101,7 @@
***************************************/
public class HeaderPanel extends AbstractConfigGui implements
ActionListener,FocusListener
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.http");
InnerTableModel tableModel;
1.3 +2 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
Index: AnchorModifier.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AnchorModifier.java 23 Aug 2002 22:51:46 -0000 1.2
+++ AnchorModifier.java 29 Aug 2002 18:17:41 -0000 1.3
@@ -92,7 +92,7 @@
public class AnchorModifier extends AbstractTestElement implements
ResponseBasedModifier,
Serializable
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.http");
private static Random rand = new Random();
1.3 +2 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
Index: URLRewritingModifier.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- URLRewritingModifier.java 23 Aug 2002 22:51:46 -0000 1.2
+++ URLRewritingModifier.java 29 Aug 2002 18:17:41 -0000 1.3
@@ -26,10 +26,10 @@
extends AbstractTestElement
implements Serializable, ResponseBasedModifier
{
- private static Logger log =
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.http");
private Pattern case1, case2, case3;
- Perl5Compiler compiler = new Perl5Compiler();
+ transient Perl5Compiler compiler = new Perl5Compiler();
private final static String ARGUMENT_NAME = "argument_name";
private final static String PATH_EXTENSION = "path_extension";
/**
1.3 +2 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterModifier.java
Index: UserParameterModifier.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterModifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserParameterModifier.java 23 Aug 2002 22:51:46 -0000 1.2
+++ UserParameterModifier.java 29 Aug 2002 18:17:41 -0000 1.3
@@ -83,7 +83,7 @@
extends ConfigTestElement
implements Modifier, Serializable, TestListener
{
- private static Logger log =
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.http");
private static final String XMLURI = "UserParameterModifier.xmluri";
//-------------------------------------------
1.3 +2 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLErrorHandler.java
Index: UserParameterXMLErrorHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLErrorHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserParameterXMLErrorHandler.java 23 Aug 2002 22:51:46 -0000 1.2
+++ UserParameterXMLErrorHandler.java 29 Aug 2002 18:17:41 -0000 1.3
@@ -68,7 +68,7 @@
***********************************************************/
public class UserParameterXMLErrorHandler implements ErrorHandler
{
- private static Logger log =
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.http");
//-------------------------------------------
// Constants and Data Members
1.3 +2 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserSequence.java
Index: UserSequence.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/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 23 Aug 2002 22:51:46 -0000 1.2
+++ UserSequence.java 29 Aug 2002 18:17:41 -0000 1.3
@@ -75,7 +75,7 @@
***********************************************************/
public class UserSequence implements Serializable {
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.http");
//-------------------------------------------
1.4 +4 -4
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParser.java
Index: HtmlParser.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HtmlParser.java 23 Aug 2002 22:51:46 -0000 1.3
+++ HtmlParser.java 29 Aug 2002 18:17:41 -0000 1.4
@@ -93,7 +93,7 @@
/****************************************
* !ToDo (Field description)
***************************************/
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.http");
/****************************************
@@ -511,7 +511,7 @@
***************************************/
public static class Test extends TestCase
{
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.test");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.test");
/****************************************
* !ToDo (Constructor description)
1.3 +1 -1
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Admin.java
Index: Admin.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Admin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Admin.java 23 Aug 2002 22:51:46 -0000 1.2
+++ Admin.java 29 Aug 2002 18:17:42 -0000 1.3
@@ -24,7 +24,7 @@
public class Admin extends Thread
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.http");
//
// Member variables
1.3 +1 -1
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Cache.java
Index: Cache.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Cache.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Cache.java 23 Aug 2002 22:51:46 -0000 1.2
+++ Cache.java 29 Aug 2002 18:17:42 -0000 1.3
@@ -23,7 +23,7 @@
public class Cache
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.http");
//
// Members variables
1.3 +1 -1
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Config.java
Index: Config.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Config.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Config.java 23 Aug 2002 22:51:46 -0000 1.2
+++ Config.java 29 Aug 2002 18:17:42 -0000 1.3
@@ -27,7 +27,7 @@
***********************************************************/
class Config
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.http");
//
1.3 +1 -1
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java
Index: Daemon.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Daemon.java 23 Aug 2002 22:51:46 -0000 1.2
+++ Daemon.java 29 Aug 2002 18:17:42 -0000 1.3
@@ -24,7 +24,7 @@
***********************************************************/
public class Daemon extends Thread
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.http");
//
// Member variables
1.3 +1 -1
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
Index: Proxy.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Proxy.java 23 Aug 2002 22:51:46 -0000 1.2
+++ Proxy.java 29 Aug 2002 18:17:42 -0000 1.3
@@ -87,7 +87,7 @@
*@created June 8, 2001
*/
public class Proxy extends Thread {
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.http");
//
// Member variables
1.6 +2 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Index: ProxyControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProxyControl.java 28 Aug 2002 15:53:00 -0000 1.5
+++ ProxyControl.java 29 Aug 2002 18:17:42 -0000 1.6
@@ -95,7 +95,7 @@
***********************************************************/
public class ProxyControl extends ConfigTestElement implements Serializable
{
- private static Logger log =
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.http");
Daemon server;
private final int DEFAULT_PORT = 8080;
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HTTPSampler.java 28 Aug 2002 02:58:54 -0000 1.11
+++ HTTPSampler.java 29 Aug 2002 18:17:42 -0000 1.12
@@ -341,7 +341,7 @@
***************************************/
protected final static String NON_HTTP_RESPONSE_MESSAGE =
"Non HTTP response message";
- private static Logger log =
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.http");
/****************************************
* Holds a list of URLs sampled - so we're not flooding stdout with debug
1.6 +3 -3
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFull.java
Index: HTTPSamplerFull.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFull.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HTTPSamplerFull.java 27 Aug 2002 15:03:36 -0000 1.5
+++ HTTPSamplerFull.java 29 Aug 2002 18:17:42 -0000 1.6
@@ -124,7 +124,7 @@
public class HTTPSamplerFull extends HTTPSampler
{
/** Used to store the Logger (used for debug and error messages). */
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.http");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.http");
/**
* Used to store the UTF encoding name (which is version dependent).
@@ -583,7 +583,7 @@
{
private HTTPSamplerFull hsf;
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.test");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.test");
public Test(String name)
{
1.4 +3 -3
jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/config/JavaConfig.java
Index: JavaConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/config/JavaConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaConfig.java 23 Aug 2002 21:02:12 -0000 1.3
+++ JavaConfig.java 29 Aug 2002 18:17:42 -0000 1.4
@@ -78,7 +78,7 @@
{
/** Logging */
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.java");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.java");
private transient JavaSamplerClient javaClient = null;
1.3 +2 -2
jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
Index: JavaConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaConfigGui.java 23 Aug 2002 21:02:12 -0000 1.2
+++ JavaConfigGui.java 29 Aug 2002 18:17:42 -0000 1.3
@@ -87,7 +87,7 @@
public class JavaConfigGui extends AbstractConfigGui
{
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.java");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.java");
private static String CLASSNAMECOMBO = "classnamecombo";
private JComboBox classnameCombo;
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaSampler.java 23 Aug 2002 21:02:12 -0000 1.2
+++ JavaSampler.java 29 Aug 2002 18:17:42 -0000 1.3
@@ -84,7 +84,7 @@
private JavaSamplerClient javaClient = null;
/** Logging */
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.java");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.java");
public JavaSampler() {
setArguments(new Arguments());
1.3 +1 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SleepTest.java 23 Aug 2002 21:02:12 -0000 1.2
+++ SleepTest.java 29 Aug 2002 18:17:42 -0000 1.3
@@ -72,7 +72,7 @@
public class SleepTest implements JavaSamplerClient {
/** Define category for logging */
- private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.java");
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.java");
/** */
private long sleepTime = 1000;
/** */
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JDBCSampler.java 23 Aug 2002 22:51:47 -0000 1.2
+++ JDBCSampler.java 29 Aug 2002 18:17:42 -0000 1.3
@@ -83,7 +83,7 @@
***********************************************************/
public class JDBCSampler extends AbstractSampler implements TestListener
{
- private static Logger log =
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.jdbc");
public final static String URL = "JDBCSampler.url";
public final static String DRIVER = "JDBCSampler.driver";
1.3 +1 -1
jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/util/ConnectionObject.java
Index: ConnectionObject.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/util/ConnectionObject.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConnectionObject.java 23 Aug 2002 22:51:47 -0000 1.2
+++ ConnectionObject.java 29 Aug 2002 18:17:43 -0000 1.3
@@ -72,7 +72,7 @@
*****************************************************************/
public class ConnectionObject implements Runnable
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.jdbc");
Connection con;
DBKey key;
1.3 +1 -1
jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/util/DBConnectionManager.java
Index: DBConnectionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/util/DBConnectionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DBConnectionManager.java 23 Aug 2002 22:51:47 -0000 1.2
+++ DBConnectionManager.java 29 Aug 2002 18:17:43 -0000 1.3
@@ -77,7 +77,7 @@
*****************************************************************/
public class DBConnectionManager
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.jdbc");
int absoluteMaxConnections=100;
long accessInterval=1800000;
1.3 +1 -1 jakarta-jmeter/src/protocol/jndi/config/gui/MethodConfigGui.java
Index: MethodConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/jndi/config/gui/MethodConfigGui.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MethodConfigGui.java 23 Aug 2002 22:51:47 -0000 1.2
+++ MethodConfigGui.java 29 Aug 2002 18:17:43 -0000 1.3
@@ -99,7 +99,7 @@
extends JPanel
implements ModelSupported, ActionListener, TreeSelectionListener
{
- private static Logger log =
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.protocol.jndi");
protected static final String REFLECT = "MethodConfigGui.reflect";
protected static final String INVOKE = "MethodConfigGui.invoke";
1.3 +1 -1 jakarta-jmeter/src/protocol/jndi/sampler/JNDISampler.java
Index: JNDISampler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/jndi/sampler/JNDISampler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JNDISampler.java 23 Aug 2002 22:51:47 -0000 1.2
+++ JNDISampler.java 29 Aug 2002 18:17:43 -0000 1.3
@@ -79,7 +79,7 @@
*/
public class JNDISampler implements Sampler
{
- private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor(
+ transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(
"jmeter.protocol.jndi");
public static final String QUERY = "JNDISampler.query";
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
