You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by ms...@apache.org on 2002/03/05 00:08:55 UTC
cvs commit: jakarta-jmeter/src/org/apache/jmeter/visualizers GraphAccumModel.java GraphModel.java SplineModel.java
mstover1 02/03/04 15:08:55
Modified: src/org/apache/jmeter/control InterleaveControl.java
LogicController.java LoopController.java
ModifyController.java OnceOnlyController.java
TestPlan.java
src/org/apache/jmeter/gui JMeterMenuBar.java
MenuFactory.java
src/org/apache/jmeter/protocol/http/proxy Daemon.java
Proxy.java
src/org/apache/jmeter/protocol/http/proxy/gui
ProxyControlGui.java
src/org/apache/jmeter/reporters AssertionReporter.java
FileReporter.java Filer.java
MailerResultCollector.java ResultCollector.java
ResultCollectorFull.java
ResultCollectorIndGraph.java
src/org/apache/jmeter/resources messages.properties
messages_ja.properties
messages_ja_JP.eucJP.properties
src/org/apache/jmeter/save/handlers ThreadGroupHandler.java
src/org/apache/jmeter/threads ThreadGroup.java
src/org/apache/jmeter/timers ConstantTimer.java
GaussianRandomTimer.java UniformRandomTimer.java
src/org/apache/jmeter/util JMeterUtils.java
src/org/apache/jmeter/visualizers GraphAccumModel.java
GraphModel.java SplineModel.java
Added: src/org/apache/jmeter/gui/action Analyze.java
Log:
Fixing proxy stop bug
adding japanese/internationalization
data analyzer works again
Revision Changes Path
1.8 +2 -1 jakarta-jmeter/src/org/apache/jmeter/control/InterleaveControl.java
Index: InterleaveControl.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/control/InterleaveControl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InterleaveControl.java 9 Nov 2001 18:53:42 -0000 1.7
+++ InterleaveControl.java 4 Mar 2002 23:08:54 -0000 1.8
@@ -59,6 +59,7 @@
import org.apache.jmeter.config.ConfigElement;
import org.apache.jmeter.samplers.*;
+import org.apache.jmeter.util.JMeterUtils;
/************************************************************
* Title: Description: Copyright: Copyright (c) 2001 Company:
@@ -94,7 +95,7 @@
***********************************************************/
public String getClassLabel()
{
- return "Interleave Controller";
+ return JMeterUtils.getResString("interleave_control_title");
}
/************************************************************
1.4 +3 -1 jakarta-jmeter/src/org/apache/jmeter/control/LogicController.java
Index: LogicController.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/control/LogicController.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LogicController.java 28 Sep 2001 04:39:13 -0000 1.3
+++ LogicController.java 4 Mar 2002 23:08:54 -0000 1.4
@@ -57,6 +57,8 @@
import java.io.*;
+import org.apache.jmeter.util.JMeterUtils;
+
/**
* Title: Jakarta-JMeter
* Description:
@@ -70,7 +72,7 @@
{
public String getClassLabel()
{
- return "Simple Controller";
+ return JMeterUtils.getResString("logic_controller_title");
}
/************************************************************
1.9 +3 -2 jakarta-jmeter/src/org/apache/jmeter/control/LoopController.java
Index: LoopController.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/control/LoopController.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LoopController.java 16 Feb 2002 03:21:40 -0000 1.8
+++ LoopController.java 4 Mar 2002 23:08:54 -0000 1.9
@@ -56,12 +56,13 @@
import org.apache.jmeter.samplers.Entry;
import org.apache.jmeter.samplers.CycleEntry;
+import org.apache.jmeter.util.JMeterUtils;
import java.io.Serializable;
/************************************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/02/16 03:21:40 $
+ *@created $Date: 2002/03/04 23:08:54 $
*@version 1.0
***********************************************************/
@@ -107,7 +108,7 @@
***********************************************************/
public String getClassLabel()
{
- return "Loop Controller";
+ return JMeterUtils.getResString("loop_controller_title");
}
/************************************************************
1.8 +5 -4 jakarta-jmeter/src/org/apache/jmeter/control/ModifyController.java
Index: ModifyController.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/control/ModifyController.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ModifyController.java 28 Sep 2001 04:08:46 -0000 1.7
+++ ModifyController.java 4 Mar 2002 23:08:54 -0000 1.8
@@ -60,6 +60,7 @@
import org.apache.jmeter.samplers.*;
import org.apache.jmeter.util.ClassFinder;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.gui.MenuFactory;
import org.apache.jmeter.config.Modifier;
import org.apache.jmeter.config.ResponseBasedModifier;
@@ -69,9 +70,9 @@
/************************************************************
* !ToDo (Class description)
*
- *@author $Author: khammond $
- *@created $Date: 2001/09/28 04:08:46 $
- *@version $Revision: 1.7 $
+ *@author $Author: mstover1 $
+ *@created $Date: 2002/03/04 23:08:54 $
+ *@version $Revision: 1.8 $
***********************************************************/
public class ModifyController extends LogicController implements SampleListener,
@@ -98,7 +99,7 @@
***********************************************************/
public String getClassLabel()
{
- return "Modification Manager";
+ return JMeterUtils.getResString("modification_controller_title");
}
/************************************************************
1.10 +2 -1 jakarta-jmeter/src/org/apache/jmeter/control/OnceOnlyController.java
Index: OnceOnlyController.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/control/OnceOnlyController.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- OnceOnlyController.java 9 Nov 2001 18:55:27 -0000 1.9
+++ OnceOnlyController.java 4 Mar 2002 23:08:54 -0000 1.10
@@ -59,6 +59,7 @@
import org.apache.jmeter.config.ConfigElement;
import org.apache.jmeter.samplers.*;
+import org.apache.jmeter.util.JMeterUtils;
/************************************************************
* Title: Apache JMeter Description: Copyright: Copyright (c) 2000 Company:
@@ -86,7 +87,7 @@
***********************************************************/
public String getClassLabel()
{
- return "Once Only Controller";
+ return JMeterUtils.getResString("once_only_controller_title");
}
/************************************************************
1.11 +1 -1 jakarta-jmeter/src/org/apache/jmeter/control/TestPlan.java
Index: TestPlan.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/control/TestPlan.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TestPlan.java 23 Feb 2002 01:21:06 -0000 1.10
+++ TestPlan.java 4 Mar 2002 23:08:54 -0000 1.11
@@ -86,7 +86,7 @@
// WARNING! This String value must be identical to the String value returned
// in org.apache.jmeter.threads.ThreadGroup.getClassLabel() method.
// If it's not you will not be able to add a Thread Group element to a Test Plan.
- itemsCanAdd.add("Thread Group");
+ itemsCanAdd.add(JMeterUtils.getResString("threadgroup"));
}
private TestPlan()
1.17 +1 -1 jakarta-jmeter/src/org/apache/jmeter/gui/JMeterMenuBar.java
Index: JMeterMenuBar.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/JMeterMenuBar.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JMeterMenuBar.java 24 Oct 2001 15:46:55 -0000 1.16
+++ JMeterMenuBar.java 4 Mar 2002 23:08:54 -0000 1.17
@@ -294,7 +294,7 @@
analyze.setMnemonic('A');
analyze.addActionListener(ActionRouter.getInstance());
analyze.setActionCommand("Analyze File");
- analyze.setEnabled(false);
+ analyze.setEnabled(true);
reportMenu.add(analyze);
// OPTIONS MENU
1.15 +19 -9 jakarta-jmeter/src/org/apache/jmeter/gui/MenuFactory.java
Index: MenuFactory.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/MenuFactory.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MenuFactory.java 30 Aug 2001 17:19:01 -0000 1.14
+++ MenuFactory.java 4 Mar 2002 23:08:54 -0000 1.15
@@ -67,7 +67,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2001/08/30 17:19:01 $
+ *@created $Date: 2002/03/04 23:08:54 $
*@version 1.0
***********************************************************/
@@ -113,7 +113,7 @@
if (timerMenu == null)
{
timerMenu = createMenu(
- new Class[]{org.apache.jmeter.timers.Timer.class},"Timer",null);
+ new Class[]{org.apache.jmeter.timers.Timer.class},JMeterUtils.getResString("menu_timer"),null);
setEnabled(timerMenu);
}
return timerMenu;
@@ -124,7 +124,9 @@
if (ModifierMenu == null)
{
ModifierMenu = createMenu(
- new Class[]{org.apache.jmeter.config.Modifier.class},"Modifiers",null);
+ new Class[]{org.apache.jmeter.config.Modifier.class},
+ JMeterUtils.getResString("menu_modifiers"),
+ null);
setEnabled(ModifierMenu);
}
return ModifierMenu;
@@ -135,7 +137,9 @@
if (ResponseBasedModifierMenu == null)
{
ResponseBasedModifierMenu = createMenu(
- new Class[]{org.apache.jmeter.config.ResponseBasedModifier.class},"Response Based Modifiers",null);
+ new Class[]{org.apache.jmeter.config.ResponseBasedModifier.class},
+ JMeterUtils.getResString("menu_response_based_modifiers"),
+ null);
setEnabled(ResponseBasedModifierMenu);
}
return ResponseBasedModifierMenu;
@@ -146,7 +150,9 @@
if (assertionMenu == null)
{
assertionMenu = createMenu(
- new Class[]{org.apache.jmeter.assertions.Assertion.class},"Assertions",null);
+ new Class[]{org.apache.jmeter.assertions.Assertion.class},
+ JMeterUtils.getResString("menu_assertions"),
+ null);
setEnabled(assertionMenu);
}
return assertionMenu;
@@ -170,7 +176,8 @@
Set skip = new HashSet();
skip.add("org.apache.jmeter.threads.ThreadGroup");
listenerMenu = createMenu(
- new Class[]{org.apache.jmeter.samplers.SampleListener.class},"Listener",
+ new Class[]{org.apache.jmeter.samplers.SampleListener.class},
+ JMeterUtils.getResString("menu_listener"),
skip);
setEnabled(listenerMenu);
}
@@ -188,7 +195,8 @@
{
Set skip = new HashSet();
controllerMenu = createMenu(
- new Class[]{org.apache.jmeter.control.LogicController.class},"Logic Controller",
+ new Class[]{org.apache.jmeter.control.LogicController.class},
+ JMeterUtils.getResString("menu_logic_controller"),
null);
setEnabled(controllerMenu);
}
@@ -206,7 +214,8 @@
{
Set skip = new HashSet();
generativeControllerMenu = createMenu(
- new Class[]{org.apache.jmeter.control.AbstractGenerativeController.class},"Generative Controller",
+ new Class[]{org.apache.jmeter.control.AbstractGenerativeController.class},
+ JMeterUtils.getResString("menu_generative_controller"),
null);
setEnabled(generativeControllerMenu);
}
@@ -224,7 +233,8 @@
{
Set skip = new HashSet();
configMenu = createMenu(new Class[]{org.apache.jmeter.config.ConfigElement.class},
- "Config Element",null);
+ JMeterUtils.getResString("menu_config_element"),
+ null);
setEnabled(configMenu);
}
return configMenu;
1.1 jakarta-jmeter/src/org/apache/jmeter/gui/action/Analyze.java
Index: Analyze.java
===================================================================
/*
* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache JMeter" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* "Apache JMeter", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.jmeter.gui.action;
import java.awt.event.ActionEvent;
import java.util.*;
import javax.swing.JFileChooser;
import java.io.*;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import org.apache.jmeter.reporters.FileReporter;
import org.apache.jmeter.gui.*;
import org.apache.jmeter.save.*;
import org.apache.jmeter.save.xml.*;
import org.apache.jmeter.util.*;
import org.apache.jmeter.protocol.http.config.UrlConfig;
import org.apache.jmeter.protocol.http.control.HttpTestSample;
import org.apache.jmeter.protocol.http.config.UrlConfigFull;
import org.apache.jmeter.control.LogicController;
import org.apache.jmeter.exceptions.IllegalUserActionException;
import junit.framework.*;
/************************************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
*@created $Date: 2002/03/04 23:08:54 $
*@version 1.0
***********************************************************/
public class Analyze implements Command
{
private static Set commands = new HashSet();
/************************************************************
* !ToDo (Constructor description)
***********************************************************/
public Analyze()
{
}
/************************************************************
* !ToDoo (Method description)
*
*@return !ToDo (Return description)
***********************************************************/
public Set getActionNames()
{
return commands;
}
/************************************************************
* !ToDo (Method description)
*
*@param e !ToDo (Parameter description)
***********************************************************/
public void doAction(ActionEvent e)
{
FileReporter analyzer = new FileReporter();
File f = FileDialoger.promptToOpenFile().getSelectedFile();
if(f != null)
{
try
{
analyzer.init(f.getPath());
}
catch(IOException err)
{
JMeterUtils.reportErrorToUser("The file you selected could not be analyzed");
}
}
}
static
{
commands.add("Analyze File");
}
}
1.5 +23 -0 jakarta-jmeter/src/org/apache/jmeter/protocol/http/proxy/Daemon.java
Index: Daemon.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/proxy/Daemon.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Daemon.java 16 Feb 2002 03:21:41 -0000 1.4
+++ Daemon.java 4 Mar 2002 23:08:54 -0000 1.5
@@ -33,6 +33,7 @@
private int daemonPort;
private boolean running;
ProxyControl target;
+ private Socket ClientSocket;
public Daemon()
{
@@ -143,9 +144,11 @@
Proxy thd = new Proxy(ClientSocket, cache, config,target,cookieManager);
thd.start();
}
+ System.out.println("Proxy Server stopped");
}
catch(Exception e)
{
+ System.out.println("Proxy Server stopped");
}
finally
{
@@ -160,6 +163,26 @@
}
public void stopServer() {
this.running = false;
+ Socket endIt = null;
+ try
+ {
+ endIt = new Socket(InetAddress.getLocalHost().getHostName(),daemonPort);
+ endIt.getOutputStream().write(5);
+ endIt.shutdownOutput();
+ }
+ catch(IOException e)
+ {
+ }
+ finally
+ {
+ try
+ {
+ endIt.close();
+ }
+ catch(Exception e)
+ {
+ }
+ }
}
}
1.11 +0 -1 jakarta-jmeter/src/org/apache/jmeter/protocol/http/proxy/Proxy.java
Index: Proxy.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/proxy/Proxy.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Proxy.java 20 Feb 2002 01:35:32 -0000 1.10
+++ Proxy.java 4 Mar 2002 23:08:54 -0000 1.11
@@ -177,7 +177,6 @@
catch (Exception e)
{
- e.printStackTrace();
try
{
if (TakenFromCache)
1.4 +11 -5 jakarta-jmeter/src/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Index: ProxyControlGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProxyControlGui.java 7 Oct 2001 16:59:40 -0000 1.3
+++ ProxyControlGui.java 4 Mar 2002 23:08:54 -0000 1.4
@@ -158,6 +158,8 @@
panel.add(start);
panel.add(stop);
+ start.setEnabled(true);
+ stop.setEnabled(false);
return panel;
}
@@ -238,10 +240,14 @@
if(command.equals(STOP))
{
model.stopProxy();
+ stop.setEnabled(false);
+ start.setEnabled(true);
}
else if(command.equals(START))
{
model.startProxy();
+ start.setEnabled(false);
+ stop.setEnabled(true);
}
else if(command.equals(this.ADD_EXCLUDE))
{
@@ -281,13 +287,13 @@
{
String fieldName = e.getComponent().getName();
- if (fieldName.equals(ProxyControl.PORT))
+ if (fieldName.equals(ProxyControl.PORT))
{
- try
+ try
{
model.setPort(Integer.parseInt(portField.getText()));
- }
- catch (NumberFormatException nfe)
+ }
+ catch (NumberFormatException nfe)
{
if (portField.getText().length() > 0)
{
@@ -295,7 +301,7 @@
"Invalid data", JOptionPane.WARNING_MESSAGE);
model.setPort(model.getDefaultPort());
- // Right now, the cleanest thing to do is simply clear the
+ // Right now, the cleanest thing to do is simply clear the
// entire text field. We do not want to set the text to
// the default because that would be confusing to the user.
// For example, the user typed "5t" instead of "56". After
1.3 +3 -2 jakarta-jmeter/src/org/apache/jmeter/reporters/AssertionReporter.java
Index: AssertionReporter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/reporters/AssertionReporter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AssertionReporter.java 28 Aug 2001 21:28:33 -0000 1.2
+++ AssertionReporter.java 4 Mar 2002 23:08:54 -0000 1.3
@@ -6,6 +6,7 @@
import org.apache.jmeter.samplers.*;
import org.apache.jmeter.assertions.*;
import org.apache.jmeter.gui.ModelSupported;
+import org.apache.jmeter.util.JMeterUtils;
/**
* Title: Jakarta-JMeter
@@ -27,7 +28,7 @@
public String getClassLabel()
{
- return "Assertion Results";
+ return JMeterUtils.getResString("assertion_visualizer_title");
}
public String getAssertionResult()
@@ -60,4 +61,4 @@
}
-}
\ No newline at end of file
+}
1.6 +1 -1 jakarta-jmeter/src/org/apache/jmeter/reporters/FileReporter.java
Index: FileReporter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/reporters/FileReporter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FileReporter.java 26 Jul 2001 00:34:49 -0000 1.5
+++ FileReporter.java 4 Mar 2002 23:08:54 -0000 1.6
@@ -88,7 +88,7 @@
while ((line = reader.readLine()) != null) {
try {
if (line.startsWith("#") || line.trim().length() == 0) continue;
- StringTokenizer st = new StringTokenizer(line, " ");
+ StringTokenizer st = new StringTokenizer(line, " ,");
String key = (String) st.nextToken();
Integer value = new Integer((String) st.nextToken());
Vector v = getData(key);
1.12 +2 -2 jakarta-jmeter/src/org/apache/jmeter/reporters/Filer.java
Index: Filer.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/reporters/Filer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Filer.java 28 Aug 2001 21:28:33 -0000 1.11
+++ Filer.java 4 Mar 2002 23:08:54 -0000 1.12
@@ -140,7 +140,7 @@
}
public String getClassLabel()
{
- return "File Reporter";
+ return JMeterUtils.getResString("file_visualizer_title");
}
public void uncompile()
@@ -250,4 +250,4 @@
this.viewSubmitData = value;
}
-}
\ No newline at end of file
+}
1.4 +2 -2 jakarta-jmeter/src/org/apache/jmeter/reporters/MailerResultCollector.java
Index: MailerResultCollector.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/reporters/MailerResultCollector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MailerResultCollector.java 28 Aug 2001 21:28:33 -0000 1.3
+++ MailerResultCollector.java 4 Mar 2002 23:08:54 -0000 1.4
@@ -71,7 +71,7 @@
*/
public String getClassLabel()
{
- return "Email Results";
+ return JMeterUtils.getResString("email_results_title");
}
public long getFailureLimit()
@@ -306,4 +306,4 @@
return addressVector;
}
-}
\ No newline at end of file
+}
1.23 +2 -1 jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollector.java
Index: ResultCollector.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollector.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ResultCollector.java 3 Mar 2002 17:11:29 -0000 1.22
+++ ResultCollector.java 4 Mar 2002 23:08:54 -0000 1.23
@@ -61,6 +61,7 @@
import org.apache.jmeter.samplers.*;
import org.apache.jmeter.visualizers.ViewResultsVisualizer;
import org.apache.jmeter.save.Saveable;
+import org.apache.jmeter.util.JMeterUtils;
/**
* Title:
@@ -121,7 +122,7 @@
public String getClassLabel()
{
- return "View Results";
+ return JMeterUtils.getResString("view_results_title");
}
public void uncompile()
1.5 +3 -1 jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollectorFull.java
Index: ResultCollectorFull.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollectorFull.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResultCollectorFull.java 13 Sep 2001 14:43:02 -0000 1.4
+++ ResultCollectorFull.java 4 Mar 2002 23:08:54 -0000 1.5
@@ -58,6 +58,7 @@
import java.util.*;
import org.apache.jmeter.samplers.*;
import org.apache.jmeter.save.Saveable;
+import org.apache.jmeter.util.JMeterUtils;
import java.io.*;
import org.apache.log4j.*;
@@ -106,7 +107,8 @@
*/
public String getClassLabel()
{
- String classLabel = "View Result Tree";
+
+ String classLabel = JMeterUtils.getResString("view_results_tree_title");
if(catClass.isDebugEnabled())
{
catClass.debug("getClassLabel1 : Returning class label - " + classLabel);
1.2 +2 -1 jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollectorIndGraph.java
Index: ResultCollectorIndGraph.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/reporters/ResultCollectorIndGraph.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResultCollectorIndGraph.java 13 Sep 2001 14:57:01 -0000 1.1
+++ ResultCollectorIndGraph.java 4 Mar 2002 23:08:54 -0000 1.2
@@ -58,6 +58,7 @@
import java.util.*;
import org.apache.jmeter.samplers.*;
import org.apache.jmeter.save.Saveable;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.log4j.*;
import junit.framework.*;
@@ -105,7 +106,7 @@
*/
public String getClassLabel()
{
- String classLabel = "View Graph Tree";
+ String classLabel = JMeterUtils.getResString("view_graph_tree_title");
if(catClass.isDebugEnabled())
{
catClass.debug("getClassLabel1 : Returning class label - " + classLabel);
1.44 +15 -0 jakarta-jmeter/src/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- messages.properties 23 Feb 2002 01:21:07 -0000 1.43
+++ messages.properties 4 Mar 2002 23:08:54 -0000 1.44
@@ -14,6 +14,14 @@
analyze=Analyze Data File...
option=Options
appearance=Look and Feel
+menu_timer=Timer
+menu_assertions=Assersions
+menu_listener=Listener
+menu_logic_controller=Logic Controller
+menu_generative_controller=Generative Controller
+menu_config_element=Config Element
+menu_response_based_modifiers=Response Based Modifiers
+menu_modifiers=Modifiers
sslManager=SSL Manager
pkcs12_desc=PKCS 12 Key (*.p12)
ssl_error_title=Key Store Problem
@@ -56,6 +64,10 @@
field_name=Field name
looping_control=Looping Control
browse=Browse
+constant_timer_memo=Add a constant delay between sampling
+gaussian_timer_memo=Adds a random delay with a gaussian distribution
+uniform_timer_memo=Adds a random delay with a uniform distribution
+modification_controller_title=Modification Manager
mimetype=Mimetype
patterns_to_include=Patterns to Include
patterns_to_exclude=Patterns to Exclude
@@ -76,6 +88,7 @@
interleave_control_title=Interleave Controller
logic_controller_title=Simple Controller
once_only_controller_title=Once Only Controller
+modification_controller_title=Modification Controller
workbench_title=WorkBench
root_title=Root
menu_edit=Edit
@@ -151,6 +164,8 @@
proxy_title=HTTP Proxy Server
view_results_title=View Results
view_results_tree_title=View Results Tree
+view_graph_tree_title=View Graph Tree
+email_results_title=Email Results
cookie_manager_title=HTTP Cookie Manager
cookies_stored=Cookies Stored in the Cookie Manager
header_manager_title=HTTP Header Manager
1.5 +20 -8 jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- messages_ja.properties 23 Feb 2002 01:21:07 -0000 1.4
+++ messages_ja.properties 4 Mar 2002 23:08:54 -0000 1.5
@@ -56,30 +56,42 @@
field_name=\u30d5\u30a3\u30fc\u30eb\u30c9\u540d
looping_control=\u30eb\u30fc\u30d7\u30b3\u30f3\u30c8\u30ed\u30fc\u30eb
browse=\u53c2\u7167
+view_graph_tree_title=\u7D50\u679C\u3092\u30B0\u30E9\u30D5\u3068\u30C4\u30EA\u30FC\u3067\u8868\u793A
+menu_assertions=\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3
+menu_config_element=\u5404\u7A2E\u8A2D\u5B9A
+menu_listener=\u30EA\u30B9\u30CA\u30FC
+menu_response_based_modifiers=\u30EC\u30B9\u30DD\u30F3\u30B9\u30D9\u30FC\u30B9\u306E\u4FEE\u98FE
+menu_timer=\u30BF\u30A4\u30DE
+menu_logic_controller=\u30ED\u30B8\u30C3\u30AF\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
+email_results_title=\u7D50\u679C\u3092\u30E1\u30FC\u30EB\u3067\u9001\u4FE1
+menu_generative_controller=\u4E3B\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
+modification_controller_title=\u4FEE\u98FE\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
+constant_timer_memo=\u30B5\u30F3\u30D7\u30EA\u30F3\u30B0\u9593\u306B\u4E00\u5B9A\u306E\u9045\u5EF6\u3092\u8FFD\u52A0
+gaussian_timer_memo=\u30AC\u30A6\u30B7\u30A2\u30F3\u306B\u3088\u308B\u30E9\u30F3\u30C0\u30E0\u306A\u9045\u5EF6\u3092\u8FFD\u52A0
mimetype=Mime\u30bf\u30a4\u30d7
patterns_to_include=\u633f\u5165\u3059\u308b\u30d1\u30bf\u30fc\u30f3
patterns_to_exclude=\u9664\u5916\u3059\u308b\u30d1\u30bf\u30fc\u30f3
add_pattern=\u30d1\u30bf\u30fc\u30f3\u8ffd\u52a0
ramp_up=Ramp-Up \u671f\u9593 (\u79d2):
-constant_timer_title=Constant Timer
+constant_timer_title=\u5B9A\u6570\u30BF\u30A4\u30DE
constant_timer_delay=\u30b9\u30ec\u30c3\u30c9\u9045\u5ef6\u6642\u9593 (\u30df\u30ea\u79d2):
-gaussian_timer_title=Gaussian Random Timer
+gaussian_timer_title=\u30AC\u30A6\u30B7\u30A2\u30F3\u4E71\u6570\u30BF\u30A4\u30DE
gaussian_timer_delay=\u9045\u5ef6\u6642\u9593\u306e\u5b9a\u6570\u30aa\u30d5\u30bb\u30c3\u30c8 (\u30df\u30ea\u79d2):
gaussian_timer_range=\u504f\u5dee (\u30df\u30ea\u79d2):
-uniform_timer_title=Uniform Random Timer
+uniform_timer_title=\u4E00\u69D8\u4E71\u6570\u30BF\u30A4\u30DE
uniform_timer_delay=\u9045\u5ef6\u6642\u9593\u306e\u5b9a\u6570\u30aa\u30d5\u30bb\u30c3\u30c8 (\u30df\u30ea\u79d2):
uniform_timer_range=\u6700\u5927\u9045\u5ef6\u6642\u9593 (\u30df\u30ea\u79d2):
thread_delay_properties=\u30b9\u30ec\u30c3\u30c9\u9045\u5ef6\u6642\u9593\u30d7\u30ed\u30d1\u30c6\u30a3
thread_group_title=\u30b9\u30ec\u30c3\u30c9\u30b0\u30eb\u30fc\u30d7
loop_controller_title=\u30eb\u30fc\u30d7\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9
modification_manager_title=\u4fee\u6b63\u30de\u30cd\u30fc\u30b8\u30e3
-interleave_control_title=Interleave Controller
-logic_controller_title=Simple Controller
-once_only_controller_title=Once Only Controller
+interleave_control_title=\u30A4\u30F3\u30BF\u30EA\u30FC\u30D6\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
+logic_controller_title=\u30B7\u30F3\u30D7\u30EB\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
+once_only_controller_title=\u4E00\u5EA6\u3060\u3051\u5B9F\u884C\u3055\u308C\u308B\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
workbench_title=\u30ef\u30fc\u30af\u30d9\u30f3\u30c1
root_title=\u30eb\u30fc\u30c8
menu_edit=\u7de8\u96c6
-graph_full_results_title=GraphFull Results
+graph_full_results_title=\u7D50\u679C\u3092\u30B0\u30E9\u30D5\u8868\u793A(\u8A73\u7D30)
graph_results_title=\u30b0\u30e9\u30d5\u8868\u793a
graph_results_data=\u30c7\u30fc\u30bf
graph_results_average=\u5e73\u5747
@@ -172,4 +184,4 @@
-
+uniform_timer_memo=\u4E00\u69D8\u306B\u30E9\u30F3\u30C0\u30E0\u306A\u9045\u5EF6\u3092\u8FFD\u52A0
1.4 +26 -39 jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja_JP.eucJP.properties
<<Binary file>>
1.15 +3 -2 jakarta-jmeter/src/org/apache/jmeter/save/handlers/ThreadGroupHandler.java
Index: ThreadGroupHandler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/save/handlers/ThreadGroupHandler.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ThreadGroupHandler.java 16 Feb 2002 03:21:42 -0000 1.14
+++ ThreadGroupHandler.java 4 Mar 2002 23:08:55 -0000 1.15
@@ -58,6 +58,7 @@
import java.util.*;
import org.apache.jmeter.threads.ThreadGroup;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.save.Saveable;
import java.io.Writer;
import org.apache.jmeter.save.xml.*;
@@ -68,7 +69,7 @@
* Title: Description: Copyright: Copyright (c) 2001 Company:
*
*@author Michael Stover
- *@created $Date: 2002/02/16 03:21:42 $
+ *@created $Date: 2002/03/04 23:08:55 $
*@version 1.0
***********************************************************/
@@ -113,7 +114,7 @@
***********************************************************/
public String getPrimaryTagName()
{
- return "ThreadGroup";
+ return JMeterUtils.getResString("threadgroup");
}
/************************************************************
1.19 +3 -2 jakarta-jmeter/src/org/apache/jmeter/threads/ThreadGroup.java
Index: ThreadGroup.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/threads/ThreadGroup.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ThreadGroup.java 9 Nov 2001 19:21:02 -0000 1.18
+++ ThreadGroup.java 4 Mar 2002 23:08:55 -0000 1.19
@@ -66,6 +66,7 @@
import org.apache.jmeter.gui.*;
import org.apache.jmeter.config.ConfigElement;
import org.apache.jmeter.save.Saveable;
+import org.apache.jmeter.util.JMeterUtils;
/************************************************************
@@ -73,7 +74,7 @@
* Apache Foundation
*
*@author Michael Stover
- *@created $Date: 2001/11/09 19:21:02 $
+ *@created $Date: 2002/03/04 23:08:55 $
*@version 1.0
***********************************************************/
@@ -423,7 +424,7 @@
// WARNING! This String value must be identical to the String value in
// org.apache.jmeter.control.TestPlan static initializer. If it's not
// you will not be able to add a Thread Group element to a Test Plan.
- return "Thread Group";
+ return JMeterUtils.getResString("threadgroup");
}
/**
1.18 +5 -4 jakarta-jmeter/src/org/apache/jmeter/timers/ConstantTimer.java
Index: ConstantTimer.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/timers/ConstantTimer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ConstantTimer.java 27 Sep 2001 05:17:07 -0000 1.17
+++ ConstantTimer.java 4 Mar 2002 23:08:55 -0000 1.18
@@ -61,14 +61,15 @@
import org.apache.jmeter.gui.popup.*;
import org.apache.jmeter.gui.JMeterComponentModel;
import org.apache.jmeter.save.Saveable;
+import org.apache.jmeter.util.JMeterUtils;
/************************************************************
* This class implements a constant timer with its own panel and fields for
* value update and user interaction.
*
*@author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- *@created $Date: 2001/09/27 05:17:07 $
- *@version $Revision: 1.17 $ $Date: 2001/09/27 05:17:07 $
+ *@created $Date: 2002/03/04 23:08:55 $
+ *@version $Revision: 1.18 $ $Date: 2002/03/04 23:08:55 $
***********************************************************/
public class ConstantTimer implements Timer, JMeterComponentModel, Saveable,
@@ -206,7 +207,7 @@
***********************************************************/
public String getClassLabel()
{
- return "Constant Timer";
+ return JMeterUtils.getResString("constant_timer_title");
}
/************************************************************
@@ -233,6 +234,6 @@
***********************************************************/
public String toString()
{
- return "Add a constant delay between sampling";
+ return JMeterUtils.getResString("constant_timer_memo");
}
}
1.13 +4 -3 jakarta-jmeter/src/org/apache/jmeter/timers/GaussianRandomTimer.java
Index: GaussianRandomTimer.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/timers/GaussianRandomTimer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- GaussianRandomTimer.java 30 Aug 2001 17:19:03 -0000 1.12
+++ GaussianRandomTimer.java 4 Mar 2002 23:08:55 -0000 1.13
@@ -59,6 +59,7 @@
import java.io.*;
import org.apache.jmeter.gui.JMeterComponentModel;
+import org.apache.jmeter.util.JMeterUtils;
/**
* This class implements those methods needed by RandomTimer
@@ -66,7 +67,7 @@
* an average value and a gaussian distributed variation.
*
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version $Revision: 1.12 $ $Date: 2001/08/30 17:19:03 $
+ * @version $Revision: 1.13 $ $Date: 2002/03/04 23:08:55 $
*/
public class GaussianRandomTimer extends RandomTimer implements JMeterComponentModel,
Serializable
@@ -77,12 +78,12 @@
}
public String toString() {
- return "Adds a random delay with a gaussian distribution";
+ return JMeterUtils.getResString("gaussian_timer_memo");
}
public String getClassLabel()
{
- return "Gaussian Random Timer";
+ return JMeterUtils.getResString("gaussian_timer_title");
}
public void uncompile()
1.14 +4 -3 jakarta-jmeter/src/org/apache/jmeter/timers/UniformRandomTimer.java
Index: UniformRandomTimer.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/timers/UniformRandomTimer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- UniformRandomTimer.java 27 Sep 2001 05:36:13 -0000 1.13
+++ UniformRandomTimer.java 4 Mar 2002 23:08:55 -0000 1.14
@@ -59,6 +59,7 @@
import java.io.*;
import org.apache.jmeter.gui.JMeterComponentModel;
+import org.apache.jmeter.util.JMeterUtils;
/**
* This class implements those methods needed by RandomTimer
@@ -66,7 +67,7 @@
* an average value and a uniformly distributed variation.
*
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version $Revision: 1.13 $ $Date: 2001/09/27 05:36:13 $
+ * @version $Revision: 1.14 $ $Date: 2002/03/04 23:08:55 $
*/
public class UniformRandomTimer extends RandomTimer implements JMeterComponentModel,
Serializable
@@ -78,7 +79,7 @@
public String toString()
{
- return "Adds a random delay with a uniform distribution";
+ return JMeterUtils.getResString("uniform_timer_memo");
}
public void uncompile()
@@ -87,7 +88,7 @@
public String getClassLabel()
{
- return "Uniform Random Timer";
+ return JMeterUtils.getResString("uniform_timer_title");
}
public Class getGuiClass()
1.25 +2 -2 jakarta-jmeter/src/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- JMeterUtils.java 2 Mar 2002 19:53:45 -0000 1.24
+++ JMeterUtils.java 4 Mar 2002 23:08:55 -0000 1.25
@@ -76,7 +76,7 @@
*
*@author <a href="mailto://stefano@apache.org">Stefano Mazzocchi</a>
*@created June 28, 2001
- *@version $Revision: 1.24 $ $Date: 2002/03/02 19:53:45 $
+ *@version $Revision: 1.25 $ $Date: 2002/03/04 23:08:55 $
*/
public class JMeterUtils
@@ -944,6 +944,6 @@
*/
public static String getJMeterVersion()
{
- return "@VERSION@";
+ return "1.7Beta3";
}
}
1.3 +2 -2 jakarta-jmeter/src/org/apache/jmeter/visualizers/GraphAccumModel.java
Index: GraphAccumModel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/visualizers/GraphAccumModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphAccumModel.java 23 Dec 2001 04:27:57 -0000 1.2
+++ GraphAccumModel.java 4 Mar 2002 23:08:55 -0000 1.3
@@ -59,7 +59,7 @@
import org.apache.jmeter.samplers.*;
import org.apache.jmeter.save.Saveable;
-
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFull;
import org.apache.log4j.*;
@@ -248,7 +248,7 @@
*/
public String getClassLabel()
{
- return "GraphFull Results";
+ return JMeterUtils.getResString("graph_full_results_title");
}
/**
1.9 +2 -2 jakarta-jmeter/src/org/apache/jmeter/visualizers/GraphModel.java
Index: GraphModel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/visualizers/GraphModel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- GraphModel.java 5 Aug 2001 13:22:08 -0000 1.8
+++ GraphModel.java 4 Mar 2002 23:08:55 -0000 1.9
@@ -118,7 +118,7 @@
import org.apache.jmeter.samplers.*;
import org.apache.jmeter.save.Saveable;
-
+import org.apache.jmeter.util.JMeterUtils;
/**
@@ -431,7 +431,7 @@
{
- return "Graph Results";
+ return JMeterUtils.getResString("graph_results_title");
}
1.13 +3 -3 jakarta-jmeter/src/org/apache/jmeter/visualizers/SplineModel.java
Index: SplineModel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/visualizers/SplineModel.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SplineModel.java 31 Aug 2001 00:46:45 -0000 1.12
+++ SplineModel.java 4 Mar 2002 23:08:55 -0000 1.13
@@ -62,13 +62,13 @@
import org.apache.jmeter.gui.*;
import org.apache.jmeter.save.Saveable;
-
+import org.apache.jmeter.util.JMeterUtils;
/************************************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2001/08/31 00:46:45 $
+ *@created $Date: 2002/03/04 23:08:55 $
*@version 1.0
***********************************************************/
@@ -217,7 +217,7 @@
public String getClassLabel()
{
- return "Spline Visualizer";
+ return JMeterUtils.getResString("spline_visualizer_title");
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>