mstover1 2005/02/10 06:31:12
Modified: src/core/org/apache/jmeter/resources messages.properties
src/core/org/apache/jmeter/util JMeterVersion.java
src/core/org/apache/jmeter/gui/action AddParent.java
Added: xdocs/extending jmeter_tutorial_mike.pdf
src/protocol .cvsignore
Log:
Applying patch to AddParent.java provided by
Hans J�rg Hessmann
Revision Changes Path
1.1 jakarta-jmeter/xdocs/extending/jmeter_tutorial_mike.pdf
<<Binary file>>
1.134 +19 -142
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.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- messages.properties 10 Dec 2004 21:32:53 -0000 1.133
+++ messages.properties 10 Feb 2005 14:31:12 -0000 1.134
@@ -8,14 +8,6 @@
add_value=Add Value
aggregate_report=Aggregate Report
aggregate_report_total_label=TOTAL
-aggregate_report_count=# Samples
-aggregate_report_median=Median
-aggregate_report_90%_line=90% Line
-aggregate_report_min=Min
-aggregate_report_max=Max
-aggregate_report_error%=Error %
-aggregate_report_rate=Throughput
-aggregate_report_bandwidth=KB/sec
als_message=Note\: The Access Log Parser is generic in design and allows you
to plugin
als_message2=your own parser. To do so, implement the LogParser, add the jar
to the
als_message3=/lib directory and enter the class in the sampler.
@@ -37,7 +29,6 @@
assertion_title=Response Assertion
assertion_url_samp=URL Sampled
assertion_visualizer_title=Assertion Results
-average=Average
auth_base_url=Base URL
auth_manager_title=HTTP Authorization Manager
auths_stored=Authorizations Stored in the Authorization Manager
@@ -67,7 +58,6 @@
column_delete_disallowed=Deleting this column is not permitted
column_number=Column number of CSV file | next | *alias
config_element=Config Element
-config_save_settings=Configure
configure_wsdl=Configure
constant_throughput_timer_memo=Add a delay between sampling to attain
constant throughput
constant_timer_delay=Thread Delay (in milliseconds)\:
@@ -82,8 +72,17 @@
csvread_file_file_name=CSV file to get values from | *alias
cut=Cut
cut_paste_function=Copy and paste function string
+database_conn_pool_max_usage=Max Usage For Each Connection\:
+database_conn_pool_props=Database Connection Pool
+database_conn_pool_size=Number of Connections in Pool\:
+database_conn_pool_title=JDBC Database Connection Pool Defaults
+database_driver_class=Driver Class\:
+database_login_title=JDBC Database Login Defaults
database_sql_query_string=SQL Query String\:
database_sql_query_title=JDBC SQL Query Defaults
+database_testing_title=JDBC Request
+database_url=JDBC URL\:
+database_url_jdbc_props=Database URL and JDBC Driver
de=German
default_parameters=Default Parameters
default_value_field=Default Value\:
@@ -93,11 +92,8 @@
delete_test=Delete Test
delete_user=Delete User
disable=Disable
-distribution_graph_title=Distribution Graph (alpha)
-distribution_note1=The graph will update every 10 samples
dn=DN
domain=Domain
-done=Done
duration=Duration (seconds)
duration_assertion_duration_test=Duration to Assert
duration_assertion_failure=The operation lasted too long\: It took {0}
milliseconds, but should not have lasted longer than {1} milliseconds.
@@ -185,7 +181,6 @@
header_manager_title=HTTP Header Manager
headers_stored=Headers Stored in the Header Manager
help=Help
-html_assertion_title=HTML Assertion
html_parameter_mask=HTML Parameter Mask
http_response_code=HTTP response code
http_url_rewriting_modifier_title=HTTP URL Re-writing Modifier
@@ -205,60 +200,11 @@
intsum_param_1=First int to add.
intsum_param_2=Second int to add - further ints can be summed by adding
further arguments.
invalid_data=Invalid data
-invalid_mail=Error occurred sending the e-mail
-invalid_mail_address=One or more invalid e-mail addresses detected
-invalid_mail_server=Problem contacting the e-mail server (see JMeter log
file)
+invalid_mail_server=The mail-server is unknown.
iteration_counter_arg_1=TRUE, for each user to have own counter, FALSE for a
global counter
iterator_num=Loop Count\:
java_request=Java Request
java_request_defaults=Java Request Defaults
-jms_authentication=Authentication
-jms_auth_not_required=Not Required
-jms_auth_required=Required
-jms_client_type=Client
-jms_client_caption=Receive client uses TopicSubscriber.receive() to listen
for message.
-jms_client_caption2=MessageListener uses onMessage(Message) interface to
listen for new messages.
-jms_config=Configuration
-jms_concrete_connection_factory=Concrete Connection Factory
-jms_connection_factory=Connection Factory
-jms_error_msg=Object message should read from an external file. Text input
is currently selected, please remember to change it.
-jms_file=File
-jms_initial_context_factory=JNDI Initial Context Factory
-jms_itertions=Number of samples to aggregate
-jms_message_type=Message Type
-jms_object_message=Object Message
-jms_provider_url=Provider URL
-jms_publisher=JMS Publisher
-jms_pwd=Password
-jms_queue=Queue
-jms_random_file=Random File
-jms_read_response=Read Response
-jms_subscriber_title=JMS Subscriber
-jms_subscriber_receive=Use TopicSubscriber.receive()
-jms_subscriber_on_message=Use MessageListener.onMessage()
-jms_text_message=Text Message
-jms_topic=Topic
-jms_use_file=From file
-jms_use_random_file=Random File
-jms_use_text=Textarea
-jms_use_properties_file=Use jndi.properties file
-jms_user=User
-jms_config_title=JMS Configuration
-jms_sample_title= JMS Default Request
-jms_testing_title= Messaging Request
-jms_msg_content=Content of the message
-jms_communication_style=Communication style
-jms_request=Request Only
-jms_requestreply=Request Response
-jms_props=JMS Properties
-jms_send_queue=Send queue
-jms_receive_queue=Receive queue
-jms_queue_connection_factory=QueueConnection Factory
-jms_timeout=Timeout
-jms_queueing=JMS Resources
-jms_jndi_props=JNDI Properties
-jms_jndi_defaults_title=JNDI Default Configuration
-jms_message_title=Message
jndi_config_title=JNDI Configuration
jndi_lookup_name=Remote Interface
jndi_lookup_title=JNDI Lookup Configuration
@@ -291,18 +237,6 @@
loop_controller_title=Loop Controller
looping_control=Looping Control
lower_bound=Lower Bound
-mail_reader_title=Mail Reader Sampler
-mail_reader_pop3=POP3
-mail_reader_imap=IMAP
-mail_reader_server_type=Server Type:
-mail_reader_server=Server:
-mail_reader_account=Username:
-mail_reader_password=Password:
-mail_reader_delete=Delete messages from the server
-mail_reader_folder=Folder:
-mail_reader_num_messages=Number of messages to retrieve:
-mail_reader_all_messages=All
-mail_sent=Mail sent successfully
mailer_attributes_panel=Mailing attributes
mailer_error=Couldn't send mail. Please correct any misentries.
mailer_visualizer_title=Mailer Visualizer
@@ -355,7 +289,7 @@
monitor_label_right_dead=Dead
monitor_legend_health=Health
monitor_legend_load=Load
-monitor_legend_memory_per=Memory % (free/total)
+monitor_legend_memory_per=Memory % (used/total)
monitor_legend_thread_per=Thread % (busy/max)
monitor_load_factor_mem=50
monitor_load_factor_thread=50
@@ -450,26 +384,6 @@
save?=Save?
save_all_as=Save Test Plan as
save_as=Save As...
-save_as_image=Save As Image
-save_asxml=Save As XML
-save_assertions=Save Assertion Results
-save_code=Save Response Code
-save_datatype=Save Data Type
-save_encoding=Save Encoding
-save_fieldnames=Save Field Names
-save_label=Save Label
-save_latency=Save Latency
-save_message=Save Respone Message
-save_requestheaders=Save Request Headers
-save_responsedata=Save Response Data
-save_responseheaders=Save Response Headers
-save_samplerdata=Save Sampler Data
-save_subresults=Save Sub Results
-save_success=Save Success
-save_threadname=Save Thread Name
-save_time=Save Time
-save_timestamp=Save Time Stamp
-save_graphics=Save Graph
scheduler=Scheduler
scheduler_configuration=Scheduler Configuration
search_base=Search base
@@ -485,7 +399,6 @@
server=Server Name or IP\:
servername=Servername \:
session_argument_name=Session Argument Name
-should_save=You should save your test plan before running it. \nIf you are
using supporting data files (ie, for CSV Data Set or _StringFromFile), \nthen
it is particularly important to first save your test script.
shutdown=Shutdown
simple_config_element=Simple Config Element
simple_data_writer_title=Simple Data Writer
@@ -535,25 +448,21 @@
string_from_file_seq_start=Start file sequence number
success?=Success?
summariser_title=Generate Summary Results
-table_visualizer_sample_num=Sample #
-table_visualizer_sample_time=Sample Time(ms)
-table_visualizer_bytes=Bytes
tcp_config_title=TCP Sampler Config
tcp_nodelay=Set NoDelay
tcp_port=Port Number\:
tcp_request_data=Text to send
tcp_sample_title=TCP Sampler
tcp_timeout=Timeout (milliseconds)\:
+corba_config_title=CORBA Sampler Config
+corba_name_server=Name Server\:
+corba_port=Port Number\:
+corba_request_data=Input Data
+corba_sample_title=CORBA Sampler
+corba_methods=Choose method to invoke\:
+corba_input_data_file=Input Data File\:
template_field=Template\:
test=Test
-test_action_title=Test Action
-test_action_target=Target
-test_action_target_thread=Current Thread
-test_action_target_test=All Threads
-test_action_action=Action
-test_action_pause=Pause
-test_action_stop=Stop
-test_action_duration=Duration
test_configuration=Test Configuration
test_plan=Test Plan
testplan.serialized=Run each Thread Group separately (i.e. run one group
before starting the next)
@@ -602,7 +511,6 @@
view_results_tab_request=Request
view_results_tab_response=Response data
view_results_tree_title=View Results Tree
-warning=Warning!
web_request=HTTP Request
web_server=Web Server
web_server_domain=Server Name or IP\:
@@ -614,7 +522,7 @@
webservice_proxy_note2=will look at command line options. If no proxy host
or port are provided by
webservice_proxy_note3=either, it will fail silently.
webservice_proxy_port=Proxy Port
-webservice_sampler_title=WebService(SOAP) Request
+webservice_sampler_title=WebService(SOAP) Request (Beta Code)
webservice_soap_action=SOAPAction
webservice_use_proxy=Use HTTP Proxy
while_controller_label=Condition (blank/LAST or true)
@@ -625,34 +533,3 @@
wsdl_url_error=The WSDL was emtpy.
xml_assertion_title=XML Assertion
you_must_enter_a_valid_number=You must enter a valid number
-ldapext_sample_title=LDAP Extended Request Defaults
-addtest=Add test
-modtest=Modification test
-deltest=deletion test
-searchtest=Search test
-ddn=DN
-searchfilter=Search Filter
-searchbase=Search base
-entrydn=Entry DN
-testConfiguration=Test Configuration
-testt=Test
-bind=Thread Bind
-sbind=Single bind/unbind
-unbind=Thread Unbind
-compare=Compare
-comparefilt=Compare filter
-userpw=Password
-userdn=Username
-rename=Rename entry
-newdn=New distinghuised name
-modddn=Old entry name
-attribute=Attribute
-opcode=opCode
-scope=Scope
-countlim=Size limit
-timelim=Time limit
-attrs=Attributes
-retobj=Return object
-deref=Dereference aliases
-ldapext_testing_title= LDAP Extended Request
-ldap_argument_list=LDAPArgument List
1.33 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterVersion.java
Index: JMeterVersion.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterVersion.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- JMeterVersion.java 8 Feb 2005 15:09:37 -0000 1.32
+++ JMeterVersion.java 10 Feb 2005 14:31:12 -0000 1.33
@@ -39,7 +39,7 @@
* pattern: VERSION = <quote>.*<quote>
*
*/
- static final String VERSION = "2.1.20050208";
+ static final String VERSION = "2.1.20050210";
static final String COPYRIGHT = "Copyright (c) 1998-2005 The Apache
Software Foundation";
1.1 jakarta-jmeter/src/protocol/.cvsignore
Index: .cvsignore
===================================================================
corba
1.9 +25 -24
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AddParent.java 13 Feb 2004 02:21:36 -0000 1.8
+++ AddParent.java 10 Feb 2005 14:31:12 -0000 1.9
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
-*/
+ */
package org.apache.jmeter.gui.action;
+
import java.awt.Component;
import java.awt.event.ActionEvent;
import java.util.HashSet;
@@ -29,12 +30,13 @@
import org.apache.log.Logger;
/**
- * @author Michael Stover
- * @version $Revision$
+ * @author Michael Stover
+ * @version $Revision$
*/
public class AddParent implements Command
{
transient private static Logger log = LoggingManager.getLoggerForClass();
+
private static Set commands = new HashSet();
static
{
@@ -42,19 +44,17 @@
}
public AddParent()
- {
- }
+ {}
public void doAction(ActionEvent e)
{
- String name = ((Component) e.getSource()).getName();
+ String name = ((Component)e.getSource()).getName();
try
{
- TestElement controller =
- (TestElement)
GuiPackage.getInstance().createTestElement(name);
+ TestElement controller =
(TestElement)GuiPackage.getInstance().createTestElement(name);
addParentToTree(controller);
}
- catch (Exception err)
+ catch(Exception err)
{
log.error("", err);
}
@@ -69,20 +69,21 @@
protected void addParentToTree(TestElement newParent)
{
GuiPackage guiPackage = GuiPackage.getInstance();
- JMeterTreeNode newNode =
- new JMeterTreeNode(newParent, guiPackage.getTreeModel());
- JMeterTreeNode currentNode =
- guiPackage.getTreeListener().getCurrentNode();
- JMeterTreeNode parentNode = (JMeterTreeNode) currentNode.getParent();
+ JMeterTreeNode newNode = new JMeterTreeNode(newParent,
guiPackage.getTreeModel());
+ JMeterTreeNode currentNode =
guiPackage.getTreeListener().getCurrentNode();
+ JMeterTreeNode parentNode = (JMeterTreeNode)currentNode.getParent();
int index = parentNode.getIndex(currentNode);
- guiPackage.getTreeModel().removeNodeFromParent(currentNode);
- guiPackage.getTreeModel().insertNodeInto(
- newNode,
- (JMeterTreeNode) parentNode,
- index);
- guiPackage.getTreeModel().insertNodeInto(
- currentNode,
- newNode,
- newNode.getChildCount());
+ guiPackage.getTreeModel().insertNodeInto(newNode, parentNode, index);
+ JMeterTreeNode[] nodes =
guiPackage.getTreeListener().getSelectedNodes();
+ for(int i = 0; i < nodes.length; i++)
+ {
+ moveNode(guiPackage, nodes[i], newNode);
+ }
+ }
+
+ private void moveNode(GuiPackage guiPackage, JMeterTreeNode node,
JMeterTreeNode newParentNode)
+ {
+ guiPackage.getTreeModel().removeNodeFromParent(node);
+ guiPackage.getTreeModel().insertNodeInto(node, newParentNode,
newParentNode.getChildCount());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
