mstover1 2003/06/11 07:08:14
Modified: docs/images/screenshots aggregate_report.png
docs/usermanual component_reference.html
src/core/org/apache/jmeter/resources messages.properties
messages_de.properties messages_ja.properties
messages_no.properties
src/core/org/apache/jmeter/threads/gui ThreadGroupGui.java
src/core/org/apache/jmeter/util JMeterUtils.java
src/protocol/http/org/apache/jmeter/protocol/http/control/gui
WebServiceSamplerGui.java
src/protocol/java/org/apache/jmeter/protocol/java/test
JavaTest.java
xdocs/usermanual component_reference.xml
Added: docs/images/screenshots graph_results.png java_defaults.png
ldap_defaults.png login-config.png
simple_config_element.png spline_visualizer.png
table_results.png
src/core/org/apache/jmeter/gui/util JDateField.java
Removed: docs/images/screenshots graph_results.gif
spline_visualizer.gif table_results.gif
Log:
applying patch to fix var names in JavaTest
applying patch to fix jdk1.3 compatability
updating docs
Revision Changes Path
1.4 +16 -30 jakarta-jmeter/docs/images/screenshots/aggregate_report.png
<<Binary file>>
1.1 jakarta-jmeter/docs/images/screenshots/graph_results.png
<<Binary file>>
1.1 jakarta-jmeter/docs/images/screenshots/java_defaults.png
<<Binary file>>
1.1 jakarta-jmeter/docs/images/screenshots/ldap_defaults.png
<<Binary file>>
1.1 jakarta-jmeter/docs/images/screenshots/login-config.png
<<Binary file>>
1.1 jakarta-jmeter/docs/images/screenshots/simple_config_element.png
<<Binary file>>
1.1 jakarta-jmeter/docs/images/screenshots/spline_visualizer.png
<<Binary file>>
1.1 jakarta-jmeter/docs/images/screenshots/table_results.png
<<Binary file>>
1.42 +148 -5 jakarta-jmeter/docs/usermanual/component_reference.html
Index: component_reference.html
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/usermanual/component_reference.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- component_reference.html 10 Jun 2003 16:27:19 -0000 1.41
+++ component_reference.html 11 Jun 2003 14:08:13 -0000 1.42
@@ -92,7 +92,7 @@
<li><a href="#Java_Request">Java
Request</a></li>
<li><a
href="#SOAP/XML-RPC_Request">SOAP/XML-RPC Request</a></li>
<li><a href="#LDAP_Request">LDAP
Request</a></li>
- <li><a href="#Webservice_Request">Webservice
Request</a></li>
+ <li><a
href="#Webservice(SOAP)_Request">Webservice(SOAP) Request</a></li>
</ul>
<li><a href="#logic_controllers">13.2 Logic
Controllers</a></li>
<ul>
@@ -128,6 +128,10 @@
<li><a
href="#JDBC_Database_Login_Defaults">JDBC Database Login Defaults</a></li>
<li><a href="#JDBC_SQL_Query_Defaults">JDBC
SQL Query Defaults</a></li>
<li><a href="#HTTP_Header_Manager">HTTP Header
Manager</a></li>
+ <li><a href="#Login_Config_Element">Login
Config Element</a></li>
+ <li><a href="#Simple_Config_Element">Simple
Config Element</a></li>
+ <li><a href="#LDAP_Request_Defaults">LDAP
Request Defaults</a></li>
+ <li><a href="#Java_Request_Defaults">Java
Request Defaults</a></li>
</ul>
<li><a href="#assertions">13.5 Assertions</a></li>
<ul>
@@ -858,7 +862,7 @@
<table
border="0" cellspacing="0" cellpadding="2">
<tr><td>
<font face="arial,helvetica,sanserif">
- <a name="Webservice_Request"><h3>13.1.7 Webservice
Request</h3></a>
+ <a name="Webservice(SOAP)_Request"><h3>13.1.7
Webservice(SOAP) Request</h3></a>
</font>
</td></tr>
<tr><td>
@@ -1844,7 +1848,7 @@
number.
</p>
<p><b>Control Panel</b></p>
- <div align="center"><img
src="../images/screenshots/graph_results.gif"></div>
+ <div align="center"><img
src="../images/screenshots/graph_results.png"></div>
</td></tr>
<tr><td><br/></td></tr>
</table>
@@ -1863,7 +1867,7 @@
logic to show a single continuous line.
</p>
<p><b>Control Panel</b></p>
- <div align="center"><img
src="../images/screenshots/spline_visualizer.gif"></div>
+ <div align="center"><img
src="../images/screenshots/spline_visualizer.png"></div>
</td></tr>
<tr><td><br/></td></tr>
</table>
@@ -1953,7 +1957,7 @@
,
this visualizer uses a lot of memory.
<p><b>Control Panel</b></p>
- <div align="center"><img
src="../images/screenshots/table_results.gif"></div>
+ <div align="center"><img
src="../images/screenshots/table_results.png"></div>
</td></tr>
<tr><td><br/></td></tr>
</table>
@@ -2652,6 +2656,145 @@
</td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <hr>
+
<table
border="0" cellspacing="0" cellpadding="2">
+ <tr><td>
+ <font face="arial,helvetica,sanserif">
+ <a name="Login_Config_Element"><h3>13.4.10 Login Config
Element</h3></a>
+ </font>
+ </td></tr>
+ <tr><td>
+
<p
>
+ The Login Config
Element lets you add or override username and password settings in samplers that use
username and password as part of their setup.
+ </p>
+
+
+
<p><b>Control Panel</b></p>
+ <div align="center"><img
src="../images/screenshots/login-config.png"></div>
+
<p>
+ <b>Parameters</b>
+ <table border="1" cellspacing="0" cellpadding="2">
+ <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
+ <tr>
+ <td>Name</td>
+ <td> Descriptive
name for this element that is shown in the tree.
+ </td>
+ <td>
+
No
+ </td>
+ </tr>
+ <tr>
+ <td>Username</td>
+ <td> The default
username to use.
+ </td>
+ <td>
+
No
+ </td>
+ </tr>
+ <tr>
+ <td>Password</td>
+ <td> The default
password to use.
+ </td>
+ <td>
+
No
+ </td>
+ </tr>
+ </table>
+ </p>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <hr>
+
<table
border="0" cellspacing="0" cellpadding="2">
+ <tr><td>
+ <font face="arial,helvetica,sanserif">
+ <a name="Simple_Config_Element"><h3>13.4.11 Simple Config
Element</h3></a>
+ </font>
+ </td></tr>
+ <tr><td>
+
<p
>
+ The Simple Config
Element lets you add or override arbitrary values in samplers. You can choose the
name of the value
+and the value itself. Although some adventurous users might find a use for this
element, it's here primarily for developers as a basic
+GUI that they can use while developing new JMeter components.
+ </p>
+
+
+
<p><b>Control Panel</b></p>
+ <div align="center"><img
src="../images/screenshots/simple_config_element.png"></div>
+
<p>
+ <b>Parameters</b>
+ <table border="1" cellspacing="0" cellpadding="2">
+ <tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
+ <tr>
+ <td>Name</td>
+ <td> Descriptive
name for this element that is shown in the tree.
+ </td>
+ <td>
+
No
+ </td>
+ </tr>
+ <tr>
+ <td>Parameter Name</td>
+ <td> The name of
each parameter. These values are internal to JMeter's workings and
+ are not generally documented. Only those familiar with the code will know these
values.
+ </td>
+ <td>
+
Yes
+ </td>
+ </tr>
+ <tr>
+ <td>Parameter Value</td>
+ <td> The value to
apply to that parameter.
+ </td>
+ <td>
+
Yes
+ </td>
+ </tr>
+ </table>
+ </p>
+ </td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <hr>
+
<table
border="0" cellspacing="0" cellpadding="2">
+ <tr><td>
+ <font face="arial,helvetica,sanserif">
+ <a name="LDAP_Request_Defaults"><h3>13.4.12 LDAP Request
Defaults</h3></a>
+ </font>
+ </td></tr>
+ <tr><td>
+
<p
>
+ The LDAP Request
Defaults component lets you set default values for LDAP testing. See the
+
<a href="../usermanual/component_reference.html#LDAP_Request">LDAP Request</a>
+ .
+ </p>
+
+
+
<p><b>Control Panel</b></p>
+ <div align="center"><img
src="../images/screenshots/ldap_defaults.png"></div>
+
</td></tr>
+ <tr><td><br/></td></tr>
+ </table>
+ <hr>
+
<table
border="0" cellspacing="0" cellpadding="2">
+ <tr><td>
+ <font face="arial,helvetica,sanserif">
+ <a name="Java_Request_Defaults"><h3>13.4.13 Java Request
Defaults</h3></a>
+ </font>
+ </td></tr>
+ <tr><td>
+
<p
>
+ The Java Request
Defaults component lets you set default values for Java testing. See the
+
<a href="../usermanual/component_reference.html#Java_Request">Java Request</a>
+ .
+ </p>
+
+
+
<p><b>Control Panel</b></p>
+ <div align="center"><img
src="../images/screenshots/java_defaults.png"></div>
+
</td></tr>
<tr><td><br/></td></tr>
</table>
<hr>
1.1
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JDateField.java
Index: JDateField.java
===================================================================
/*
* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002,2003 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 [EMAIL PROTECTED]
*
* 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.util;
import javax.swing.JTextField;
import java.util.Date;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.Date;
import java.awt.event.KeyAdapter;
import java.awt.event.FocusListener;
import java.awt.event.FocusEvent;
import java.awt.event.KeyEvent;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
/****************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
[EMAIL PROTECTED] T.Elanjchezhiyan
[EMAIL PROTECTED] $Date: 2003/06/11 14:08:13 $
[EMAIL PROTECTED] 1.0
***************************************/
/***********************************************
* This is Date mask control. Using this control we can pop up
*our date in the text field. And this control is Devloped basically
*for JDK1.3 and lower version support. This control is similer to
*JSpinner control this is availble in JDk1.4 and above only.
*This will set the date "MM/d/yyyy HH:mm:ss"
*in this format only
***********************************************/
public class JDateField extends JTextField {
private final static DateFormat dateFormat = new SimpleDateFormat( "MM/d/yyyy
HH:mm:ss" );
/***************************
*This is single argumet constractor
*This will set the Date to the TextField
*/
public JDateField(Date date) {
super(20);
this.addKeyListener(new KeyFocus());
this.addFocusListener(new FocusClass());
String myString = dateFormat.format(date);
setText(myString);
}
/**************************************************
* Set the date to the Date mask control
*
[EMAIL PROTECTED] java.util.Date
****************************************************/
public void setDate(Date date){
setText(dateFormat.format(date));
}
/**************************************************
* get the date from the Date mask control
*
[EMAIL PROTECTED] java.util.Date
****************************************************/
public Date getDate(){
try {
return dateFormat.parse(getText());
}catch(Exception e){
return new Date();
}
}
/****************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
[EMAIL PROTECTED] T.Elanjchezhiyan
[EMAIL PROTECTED] $Date: 2003/06/11 14:08:13 $
[EMAIL PROTECTED] 1.0
***************************************/
class KeyFocus extends KeyAdapter {
int mon = 0;
int day = 0;
int year = 0;
int hour = 0;
int minute = 0;
int second = 0;
KeyFocus(){
}
/*************************************
*This method will increment year
*by each "KEY UP" operation
************************************/
public void incrementYear(){
year = year + 1;
}
/*************************************
*This method will increment month
*by each "KEY UP" operation
************************************/
public void incrementMonth(){
if (mon < 12){
mon =mon+1;
} else {
mon=1;
incrementYear();
}
}
/*************************************
*This method will increment day
*by each "KEY UP" operation
************************************/
public void incrementDay(){
Calendar calendar=new GregorianCalendar();
calendar.set(year,mon-1,day);
int noofdays = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
if (day < noofdays) {
day = day + 1;
} else {
day = 1;
incrementMonth();
}
}
/*************************************
*This method will increment Hour
*by each "KEY UP" operation
************************************/
public void incrementHour(){
if (hour < 23) {
hour = hour + 1 ;
}else {
hour = 0;
incrementDay();
}
}
/*************************************
*This method will increment Minute
*by each "KEY UP" operation
************************************/
public void incrementMinute(){
if (minute < 59) {
minute = minute + 1;
} else {
minute = 0;
incrementHour();
}
}
/*************************************
*This method will increment Second
*by each "KEY UP" operation
************************************/
public void incrementSecond(){
if (second < 59) {
second = second + 1;
} else {
second = 0;
incrementMinute();
}
}
/*************************************
*Datetime string will be splited and stored
*into mon,year,day like
************************************/
public void parseDate(String datetime) {
mon = Integer.parseInt(datetime.substring(0,2));
day = Integer.parseInt(datetime.substring(3,5));
year = Integer.parseInt(datetime.substring(6,10));
hour = Integer.parseInt(datetime.substring(11,13));
minute = Integer.parseInt(datetime.substring(14,16));
second = Integer.parseInt(datetime.substring(17,19));
}
public void keyPressed(KeyEvent e){
if (e.getKeyCode() == KeyEvent.VK_UP){
String datetime = getText();
parseDate(datetime);
int pos = getCaretPosition();
if (pos <3){ //first three character will increment the month
incrementMonth();
}else if (pos <6){//3-6 character will increment the day
incrementDay();
}else if (pos <11){ //7-11 character will increment the year
incrementYear();
}else if (pos <14){ //12-14 character will increment the hour
incrementHour();
}else if (pos <17){ //15-17 character will increment the minute
incrementMinute();
}else if (pos <20){ //18-20 character will increment the second
incrementSecond();
}
setText( concate(mon) +"/"+ concate(day) +"/"+ concate(year) + " "+
concate(hour) +":"+ concate(minute) +":"+ concate(second));
setCaretPosition(pos);
}
else if (e.getKeyCode() ==KeyEvent.VK_DOWN){
String datetime = getText();
parseDate(datetime);
int pos = getCaretPosition();
if (pos < 3) { //first 3 character will decrease the month
decrementMonth();
}else if (pos < 6) { //3-6 character will decrease the day
decrementDay();
}else if (pos < 11) {//7-11 character will decrease the year
decrementYear();
}else if (pos < 14) { //12-14 character will decrease the hour
decrementHour();
}else if (pos < 17){ //15-17 character will decrease the minute
decrementMinute();
}else if (pos < 20){ //18-20 character will decrease the second
decrementSecond();
}
setText( concate(mon) +"/"+ concate(day) +"/"+ concate(year) + " "+
concate(hour) +":"+ concate(minute) +":"+ concate(second));
setCaretPosition(pos);
}
}
/*************************************
*This method will decrease year
*by each "KEY DOWN" operation
************************************/
public void decrementYear(){
year=year - 1;
}
/*************************************
*This method will decrease month
*by each "KEY DOWN" operation
************************************/
public void decrementMonth(){
if (mon > 1){
mon =mon-1;
} else {
mon=12;
decrementYear();
}
}
/*************************************
*This method will decrease day
*by each "KEY DOWN" operation
************************************/
public void decrementDay(){
Calendar calendar=new GregorianCalendar();
if (day > 1) {
day = day - 1;
} else {
if (mon == 1){
calendar.set(year,11,day);
}
else{
calendar.set(year,mon-2,day);
}
int noofdays = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
day = noofdays;
decrementMonth();
}
}
/*************************************
*This method will decrease hour
*by each "KEY DOWN" operation
************************************/
public void decrementHour(){
if (hour > 0) {
hour = hour - 1 ;
}else {
hour = 23;
decrementDay();
}
}
/*************************************
*This method will decrease minute
*by each "KEY DOWN" operation
************************************/
public void decrementMinute(){
if (minute > 0) {
minute = minute - 1;
} else {
minute = 59;
decrementHour();
}
}
/*************************************
*This method will decrease second
*by each "KEY DOWN" operation
************************************/
public void decrementSecond(){
if (second > 0) {
second = second - 1;
} else {
second = 59;
decrementMinute();
}
}
/**************************************************
* Before the Single digit number it will Appends
* '0'
* example 1=> '01'
****************************************************/
public String concate(int number){
String value;
if (String.valueOf(number).length()==1){
value = "0"+number;
}else {
value = String.valueOf(number);
}
return value;
}
}
/****************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
[EMAIL PROTECTED] T.Elanjchezhiyan
[EMAIL PROTECTED] $Date: 2003/06/11 14:08:13 $
[EMAIL PROTECTED] 1.0
***************************************/
class FocusClass implements FocusListener{
FocusClass(){
}
public void focusGained(FocusEvent e){
}
public void focusLost(FocusEvent e){
try {
if (new Date(getText()) instanceof Date) { //this will check the
date formate
}
}
catch(Exception ex)
{
requestFocus();
}
}
}
}
1.46 +6 -2
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- messages.properties 10 Jun 2003 16:27:20 -0000 1.45
+++ messages.properties 11 Jun 2003 14:08:14 -0000 1.46
@@ -367,8 +367,12 @@
test_configuration=Test Configuration
test =Test
ldap_testing_title= LDAP Request
-webservice_sampler_title=WebService (SOAP) Request
+webservice_sampler_title=WebService Request - Alpha Code
soap_action=Soap Action
get_xml_from_file=File with SOAP XML Data (overrides above text)
xml_assertion_title=XML Assertion
-module_controller_title=Module Controller
\ No newline at end of file
+module_controller_title=Module Controller
+starttime=StartTime
+endtime=EndTime
+scheduler=Scheduler
+scheduler_configuration=Scheduler Configuration
\ No newline at end of file
1.38 +6 -2
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties
Index: messages_de.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- messages_de.properties 10 Jun 2003 16:27:20 -0000 1.37
+++ messages_de.properties 11 Jun 2003 14:08:14 -0000 1.38
@@ -356,8 +356,12 @@
ldap_testing_title= LDAP Request
minimum_param=The minimum value allowed for a range of values
maximum_param=The maximum value allowed for a range of values
-webservice_sampler_title=WebService (SOAP) Request
+webservice_sampler_title=WebService Request - Alpha Code
soap_action=Soap Action
get_xml_from_file=File with SOAP XML Data (overrides above text)
xml_assertion_title=XML Assertion
-module_controller_title=Module Controller
\ No newline at end of file
+module_controller_title=Module Controller
+starttime=StartTime
+endtime=EndTime
+scheduler=Scheduler
+scheduler_configuration=Scheduler Configuration
\ No newline at end of file
1.34 +6 -2
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- messages_ja.properties 10 Jun 2003 16:27:21 -0000 1.33
+++ messages_ja.properties 11 Jun 2003 14:08:14 -0000 1.34
@@ -351,8 +351,12 @@
ldap_testing_title= LDAP Request
minimum_param=The minimum value allowed for a range of values
maximum_param=The maximum value allowed for a range of values
-webservice_sampler_title=WebService (SOAP) Request
+webservice_sampler_title=WebService Request - Alpha Code
soap_action=Soap Action
get_xml_from_file=File with SOAP XML Data (overrides above text)
xml_assertion_title=XML Assertion
-module_controller_title=Module Controller
\ No newline at end of file
+module_controller_title=Module Controller
+starttime=StartTime
+endtime=EndTime
+scheduler=Scheduler
+scheduler_configuration=Scheduler Configuration
\ No newline at end of file
1.34 +6 -2
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties
Index: messages_no.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- messages_no.properties 10 Jun 2003 16:27:21 -0000 1.33
+++ messages_no.properties 11 Jun 2003 14:08:14 -0000 1.34
@@ -343,8 +343,12 @@
ldap_testing_title= LDAP Request
minimum_param=The minimum value allowed for a range of values
maximum_param=The maximum value allowed for a range of values
-webservice_sampler_title=WebService (SOAP) Request
+webservice_sampler_title=WebService Request - Alpha Code
soap_action=Soap Action
get_xml_from_file=File with SOAP XML Data (overrides above text)
xml_assertion_title=XML Assertion
-module_controller_title=Module Controller
\ No newline at end of file
+module_controller_title=Module Controller
+starttime=StartTime
+endtime=EndTime
+scheduler=Scheduler
+scheduler_configuration=Scheduler Configuration
\ No newline at end of file
1.16 +19 -41
jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
Index: ThreadGroupGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ThreadGroupGui.java 6 Jun 2003 14:44:01 -0000 1.15
+++ ThreadGroupGui.java 11 Jun 2003 14:08:14 -0000 1.16
@@ -55,35 +55,30 @@
package org.apache.jmeter.threads.gui;
import java.awt.BorderLayout;
import java.awt.Dimension;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
import java.util.Collection;
+import java.util.Date;
import javax.swing.BorderFactory;
+import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JTextField;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-
-import java.util.Calendar;
-import java.util.Date;
-import javax.swing.JCheckBox;
-import javax.swing.JSpinner.DateEditor;
-import javax.swing.JSpinner;
-import javax.swing.SpinnerDateModel;
-
import org.apache.jmeter.control.LoopController;
import org.apache.jmeter.control.gui.LoopControlPanel;
import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.gui.util.FocusRequester;
+import org.apache.jmeter.gui.util.JDateField;
import org.apache.jmeter.gui.util.MenuFactory;
import org.apache.jmeter.gui.util.VerticalPanel;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.threads.ThreadGroup;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.testelement.property.LongProperty;
+import org.apache.jmeter.threads.ThreadGroup;
import org.apache.jmeter.util.JMeterUtils;
/****************************************
@@ -110,10 +105,8 @@
private final static String START_TIME= "start_time";
private final static String END_TIME= "end_time";
- private DateEditor starttime;
- private DateEditor endtime;
- private JSpinner start;
- private JSpinner end;
+ private JDateField start;
+ private JDateField end;
private JCheckBox scheduler;
/****************************************
@@ -160,8 +153,8 @@
}
tg.setProperty(ThreadGroup.NUM_THREADS, threadInput.getText());
tg.setProperty(ThreadGroup.RAMP_TIME, rampInput.getText());
- tg.setProperty(new
LongProperty(ThreadGroup.START_TIME,((Date)start.getValue()).getTime()));
- tg.setProperty(new
LongProperty(ThreadGroup.END_TIME,((Date)end.getValue()).getTime()));
+ tg.setProperty(new
LongProperty(ThreadGroup.START_TIME,((Date)start.getDate()).getTime()));
+ tg.setProperty(new
LongProperty(ThreadGroup.END_TIME,((Date)end.getDate()).getTime()));
tg.setProperty(new
BooleanProperty(ThreadGroup.SCHEDULER,scheduler.isSelected()));
}
@@ -182,8 +175,8 @@
}else {
mainPanel.setVisible(false);
}
- start.setValue(new Date(tg.getPropertyAsLong(ThreadGroup.START_TIME)));
- end.setValue(new Date(tg.getPropertyAsLong(ThreadGroup.END_TIME)));
+ start.setDate(new Date(tg.getPropertyAsLong(ThreadGroup.START_TIME)));
+ end.setDate(new Date(tg.getPropertyAsLong(ThreadGroup.END_TIME)));
}
public void itemStateChanged(ItemEvent ie){
@@ -239,17 +232,10 @@
private JPanel createStartTimePanel()
{
JPanel panel = new JPanel(new BorderLayout(5, 0));
- JLabel label = new JLabel("starttime");
//JMeterUtils.getResString("starttime"));
- label.setLabelFor(starttime);
+ JLabel label = new JLabel(JMeterUtils.getResString("starttime"));
panel.add(label, BorderLayout.WEST);
-
Date today = new Date();
- // Start the spinner today, but don't set a min or max date
- // The increment should be a month
- start = new JSpinner(new SpinnerDateModel(today,
- null, null, Calendar.MONTH));
- starttime = new DateEditor(start, "dd/MM/yy HH:mm:ss");
- start.setEditor(starttime);
+ start = new JDateField(today);
panel.add(start, BorderLayout.CENTER);
return panel;
}
@@ -262,18 +248,10 @@
private JPanel createEndTimePanel()
{
JPanel panel = new JPanel(new BorderLayout(5, 0));
- JLabel label = new JLabel("endtime");//JMeterUtils.getResString("endtime"));
- label.setLabelFor(endtime);
+ JLabel label = new JLabel(JMeterUtils.getResString("endtime"));
panel.add(label, BorderLayout.WEST);
-
Date today = new Date();
- // Start the spinner today, but don't set a min or max date
- // The increment should be a month
- end = new JSpinner(new SpinnerDateModel(today,
- null, null, Calendar.MONTH));
- endtime = new DateEditor(end, "dd/MM/yy HH:mm:ss");
- end.setEditor(endtime);
-
+ end = new JDateField(today);
panel.add(end, BorderLayout.CENTER);
return panel;
}
@@ -336,13 +314,13 @@
// mainPanel.add(threadPropsPanel, BorderLayout.NORTH);
//add(mainPanel, BorderLayout.CENTER);
- scheduler = new JCheckBox("Scheduler");
+ scheduler = new JCheckBox( JMeterUtils.getResString("scheduler"));
scheduler.addItemListener(this);
threadPropsPanel.add(scheduler);
mainPanel = new VerticalPanel();
mainPanel.setBorder(
BorderFactory.createTitledBorder(
- BorderFactory.createEtchedBorder(),"Scheduler Cofiguration"));
+ BorderFactory.createEtchedBorder(),
JMeterUtils.getResString("scheduler_cofiguration")));
mainPanel.add(createStartTimePanel());
mainPanel.add(createEndTimePanel());
mainPanel.setVisible(false);
1.29 +3 -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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- JMeterUtils.java 10 Jun 2003 16:27:21 -0000 1.28
+++ JMeterUtils.java 11 Jun 2003 14:08:14 -0000 1.29
@@ -97,7 +97,7 @@
*/
public class JMeterUtils implements UnitTestManager
{
- private static final String VERSION="1.9.RC20030610";
+ private static final String VERSION="1.9.RC20030611";
private static PatternCacheLRU patternCache = new PatternCacheLRU(1000,new
Perl5Compiler());
transient private static Logger log =
@@ -977,6 +977,7 @@
return VERSION;
}
}
+
1.2 +0 -1
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java
Index: WebServiceSamplerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebServiceSamplerGui.java 5 Jun 2003 17:33:38 -0000 1.1
+++ WebServiceSamplerGui.java 11 Jun 2003 14:08:14 -0000 1.2
@@ -19,7 +19,6 @@
import org.apache.jorphan.gui.JLabeledTextArea;
import org.apache.jorphan.gui.JLabeledTextField;
import org.apache.jorphan.gui.layout.VerticalLayout;
-import org.apache.jorphan.io.TextFile;
/**
* @author peter lin
1.3 +5 -5
jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
Index: JavaTest.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaTest.java 8 Jun 2003 11:03:26 -0000 1.2
+++ JavaTest.java 11 Jun 2003 14:08:14 -0000 1.3
@@ -101,7 +101,7 @@
public static final long DEFAULT_SLEEP_TIME = 100;
/** The name used to store the SleepTime parameter. */
- private static final String SLEEP_NAME="SleepTime";
+ private static final String SLEEP_NAME="Sleep_Time";
/**
@@ -118,7 +118,7 @@
"0x" + (Long.toHexString(DEFAULT_SLEEP_MASK)).toUpperCase();
/** The name used to store the SleepMask parameter. */
- private static final String MASK_NAME="SleepMask";
+ private static final String MASK_NAME="Sleep_Mask";
/** The label to store in the sample result. */
@@ -208,8 +208,8 @@
getLogger().debug(whoAmI() + "\tsetupTest()");
listParameters(context);
- sleepTime = context.getLongParameter("SleepTime", DEFAULT_SLEEP_TIME);
- sleepMask = context.getLongParameter("SleepMask", DEFAULT_SLEEP_MASK);
+ sleepTime = context.getLongParameter(MASK_NAME, DEFAULT_SLEEP_TIME);
+ sleepMask = context.getLongParameter(SLEEP_NAME, DEFAULT_SLEEP_MASK);
responseMessage = context.getParameter(
RESPONSE_MESSAGE_NAME,
1.40 +43 -4 jakarta-jmeter/xdocs/usermanual/component_reference.xml
Index: component_reference.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/component_reference.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- component_reference.xml 10 Jun 2003 16:27:22 -0000 1.39
+++ component_reference.xml 11 Jun 2003 14:08:14 -0000 1.40
@@ -239,7 +239,7 @@
should be available in the LDAP Server. The execution time is
calculated.</p></li></ol></ol>
</component>
-<component name="Webservice Request" index="13.1.7"
screenshot="../images/screenshots/webservice_sampler.png">
+<component name="Webservice(SOAP) Request" index="13.1.7"
screenshot="../images/screenshots/webservice_sampler.png">
<description><p>This sampler has been tested with IIS Webservice running .NET 1.0.
It hasn't been tested with SUN or IBM webservices providers, but it should work. The
sampler uses Apache SOAP driver, to serialize the message and set the header with the
correct SOAPAction. Right now the sampler doesn't support automatic WSDL handling,
since Apache SOAP currently doesn't provide support for it. Both IBM and SUN provide
WSDL drivers.</p>
</description>
@@ -597,7 +597,7 @@
<description>No Description</description>
</component>
-<component index="13.3.3" name="Graph Results"
screenshot="../images/screenshots/graph_results.gif">
+<component index="13.3.3" name="Graph Results"
screenshot="../images/screenshots/graph_results.png">
<description><p>The Graph Results listener generates a simple graph that plots all
sample times. Along
the bottom of the graph, the current sample (black), the current average of all
samples(blue), the
current standard deviation (red), and the current throughput rate (green) are
displayed in milliseconds.</p>
@@ -610,7 +610,7 @@
number.</p></description>
</component>
-<component index="13.3.4" name="Spline Visualizer"
screenshot="../images/screenshots/spline_visualizer.gif">
+<component index="13.3.4" name="Spline Visualizer"
screenshot="../images/screenshots/spline_visualizer.png">
<description><p>The Spline Visualizer provides a view of all sample times from the
start
of the test till the end, regardless of how many samples have been taken. The
spline
has 10 points, each representing 10% of the samples, and connected using spline
@@ -647,7 +647,7 @@
idealized throughput calculation.</description>
</component>
-<component index="13.3.8" name="View Results in Table"
screenshot="../images/screenshots/table_results.gif">
+<component index="13.3.8" name="View Results in Table"
screenshot="../images/screenshots/table_results.png">
<description>This visualizer creates a row for every sample result. Each sample
result's URL,
time in milliseconds, success/failure is displayed. Like the <complink name="View
Results Tree"/>,
this visualizer uses a lot of memory.</description>
@@ -882,6 +882,45 @@
<figure
image="../images/screenshots/http-config/header-manager-example1a.gif">Figure 9 - Test
Plan</figure>
<figure
image="../images/screenshots/http-config/header-manager-example1b.gif">Figure 10 -
Header Manager Control Panel</figure>
</example>
+
+</component>
+
+<component index="13.4.10" name="Login Config Element"
screenshot="../images/screenshots/login-config.png">
+<description><p>The Login Config Element lets you add or override username and
password settings in samplers that use username and password as part of their
setup.</p>
+</description>
+
+<properties>
+ <property name="Name" required="No">Descriptive name for this element that
is shown in the tree. </property>
+ <property name="Username" required="No">The default username to use.</property>
+ <property name="Password" required="No">The default password to use.</property>
+</properties>
+
+</component>
+
+<component index="13.4.11" name="Simple Config Element"
screenshot="../images/screenshots/simple_config_element.png">
+<description><p>The Simple Config Element lets you add or override arbitrary values
in samplers. You can choose the name of the value
+and the value itself. Although some adventurous users might find a use for this
element, it's here primarily for developers as a basic
+GUI that they can use while developing new JMeter components.</p>
+</description>
+
+<properties>
+ <property name="Name" required="No">Descriptive name for this element that
is shown in the tree. </property>
+ <property name="Parameter Name" required="Yes">The name of each parameter. These
values are internal to JMeter's workings and
+ are not generally documented. Only those familiar with the code will know these
values.</property>
+ <property name="Parameter Value" required="Yes">The value to apply to that
parameter.</property>
+</properties>
+
+</component>
+
+<component index="13.4.12" name="LDAP Request Defaults"
screenshot="../images/screenshots/ldap_defaults.png">
+<description><p>The LDAP Request Defaults component lets you set default values for
LDAP testing. See the <complink name="LDAP Request"/>.</p>
+</description>
+
+</component>
+
+<component index="13.4.13" name="Java Request Defaults"
screenshot="../images/screenshots/java_defaults.png">
+<description><p>The Java Request Defaults component lets you set default values for
Java testing. See the <complink name="Java Request"/>.</p>
+</description>
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
