svn commit: r1339078 - /jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
Author: sebb
Date: Wed May 16 09:18:22 2012
New Revision: 1339078
URL: http://svn.apache.org/viewvc?rev=1339078view=rev
Log:
Tidy; add usage comments
Modified:
jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1339078r1=1339077r2=1339078view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Wed May 16
09:18:22 2012
@@ -692,16 +692,17 @@ public class JMeterUtils implements Unit
*
* @return The XMLParser value
*/
+// TODO only called by UserParameterXMLParser.getXMLParameters which is a
deprecated class
public static XMLReader getXMLParser() {
XMLReader reader = null;
+final String parserName = getPropDefault(xml.parser, // $NON-NLS-1$
+org.apache.xerces.parsers.SAXParser); // $NON-NLS-1$
try {
-reader = (XMLReader) instantiate(getPropDefault(xml.parser, //
$NON-NLS-1$
-org.apache.xerces.parsers.SAXParser), // $NON-NLS-1$
+reader = (XMLReader) instantiate(parserName,
org.xml.sax.XMLReader); // $NON-NLS-1$
// reader = xmlFactory.newSAXParser().getXMLReader();
} catch (Exception e) {
-reader = (XMLReader) instantiate(getPropDefault(xml.parser, //
$NON-NLS-1$
-org.apache.xerces.parsers.SAXParser), // $NON-NLS-1$
+reader = (XMLReader) instantiate(parserName, // $NON-NLS-1$
org.xml.sax.XMLReader); // $NON-NLS-1$
}
return reader;
@@ -896,9 +897,10 @@ public class JMeterUtils implements Unit
* @param className
*The name of the class to instantiate.
* @param impls
- *The name of the class it subclases.
- * @return Description of the Returned Value
+ *The name of the class it must be an instance of
+ * @return an instance of the class, or null if instantiation failed or
the class did not implement/extend as required
*/
+// TODO probably not needed
public static Object instantiate(String className, String impls) {
if (className != null) {
className = className.trim();
svn commit: r1339184 - /jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
Author: milamber
Date: Wed May 16 14:24:53 2012
New Revision: 1339184
URL: http://svn.apache.org/viewvc?rev=1339184view=rev
Log:
Bug 52782 - Add a detail button on parameters table to show detail of a Row
Improves the box size, name box and changes title box
Modified:
jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java?rev=1339184r1=1339183r2=1339184view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java Wed
May 16 14:24:53 2012
@@ -100,7 +100,7 @@ public class RowDetailDialog extends JDi
};
public RowDetailDialog(ObjectTableModel tableModel, int selectedRow) {
-super((JFrame) null, JMeterUtils.getResString(search_tree_title),
true); //$NON-NLS-1$
+super((JFrame) null, JMeterUtils.getResString(detail), true);
//$NON-NLS-1$
this.tableModel = tableModel;
this.selectedRow = selectedRow;
init();
@@ -111,8 +111,7 @@ public class RowDetailDialog extends JDi
nameTF = new JLabeledTextField(JMeterUtils.getResString(name), 20);
//$NON-NLS-1$
valueTA = new JLabeledTextArea(JMeterUtils.getResString(value));
//$NON-NLS-1$
-valueTA.setPreferredSize(new Dimension(150, 300));
-nameTF.setPreferredSize(new Dimension((int)Math.round(getWidth()*0.8),
40));
+valueTA.setPreferredSize(new Dimension(450, 300));
setValues(selectedRow);
JPanel detailPanel = new JPanel();
detailPanel.setLayout(new BorderLayout());
svn commit: r1339289 - in /jmeter/trunk: docs/images/screenshots/changes/2.6/ docs/images/screenshots/changes/2.7/ xdocs/ xdocs/images/screenshots/changes/ xdocs/images/screenshots/changes/2.6/ xdocs/
Author: milamber Date: Wed May 16 18:02:57 2012 New Revision: 1339289 URL: http://svn.apache.org/viewvc?rev=1339289view=rev Log: Prepare New and Noteworthy section in changes.xml for next release Added: jmeter/trunk/docs/images/screenshots/changes/2.6/ jmeter/trunk/docs/images/screenshots/changes/2.6/01_toolbar.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/02_ignore_pause_timers.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/03_look_and_feel.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/04_duplicate_context_menu.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/05_search_tree.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/06_post_data.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/07_multiple_selection_params.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/08_file_protocol.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/09_file_protocol_embedded.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/10_child_sampler.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/11_jks_keystore.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/12_aggregate_graph_settings.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/13_aggregate_graph_bar.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/14_reset_counter.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/15_random_string.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/16_udv_comments.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/17_vrt_max_size_display.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/18_change_ctl_type.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/19_jdbc_pre_post_proc.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/20_jdbc_trans_isolation.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/21_poisson_timer.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/22_drag_and_drop.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/23_confirm_remove.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/24_diskstore.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/25_selector.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/26_ignore_child_failed.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/27_succes_with_child_failed.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/28_loggerpanel.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.6/28_loggerpanel_option.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.7/ jmeter/trunk/docs/images/screenshots/changes/2.7/01_os_process_sampler.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.7/02_os_process_example_results.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.7/03_aggregate_graph_with_new_cols.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.7/04_aggregate_graph_parameters.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.7/05_jmeter_ant_task_report_success.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.7/06_jmeter_ant_task_report_errors.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.7/07_test_action_next_iter.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.7/08_param_button_detail.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.7/09_detail_box.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.7/10_mailer_visualizer_gui.png (with props) jmeter/trunk/xdocs/images/screenshots/changes/2.6/ jmeter/trunk/xdocs/images/screenshots/changes/2.6/01_toolbar.png (props changed) - copied unchanged from r1338380, jmeter/trunk/xdocs/images/screenshots/changes/01_toolbar.png jmeter/trunk/xdocs/images/screenshots/changes/2.6/02_ignore_pause_timers.png (props changed) - copied unchanged from r1338380, jmeter/trunk/xdocs/images/screenshots/changes/02_ignore_pause_timers.png jmeter/trunk/xdocs/images/screenshots/changes/2.6/03_look_and_feel.png (props changed) - copied unchanged from r1338380, jmeter/trunk/xdocs/images/screenshots/changes/03_look_and_feel.png jmeter/trunk/xdocs/images/screenshots/changes/2.6/04_duplicate_context_menu.png (props changed) - copied unchanged from r1338380, jmeter/trunk/xdocs/images/screenshots/changes/04_duplicate_context_menu.png jmeter/trunk/xdocs/images/screenshots/changes/2.6/05_search_tree.png (props changed) - copied
svn commit: r1339294 - in /jmeter/trunk: docs/images/screenshots/ src/components/org/apache/jmeter/visualizers/ src/core/org/apache/jmeter/resources/ xdocs/ xdocs/images/screenshots/ xdocs/usermanual/
Author: milamber
Date: Wed May 16 18:10:54 2012
New Revision: 1339294
URL: http://svn.apache.org/viewvc?rev=1339294view=rev
Log:
Bug 53246 - Mailer Visualizer: improve GUI design and I18N
French translation added
Modified:
jmeter/trunk/docs/images/screenshots/mailervisualizer.png
jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/mailervisualizer.png
jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jmeter/trunk/docs/images/screenshots/mailervisualizer.png
URL:
http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/mailervisualizer.png?rev=1339294r1=1339293r2=1339294view=diff
==
Binary files - no diff available.
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java?rev=1339294r1=1339293r2=1339294view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
Wed May 16 18:10:54 2012
@@ -19,15 +19,15 @@
package org.apache.jmeter.visualizers;
import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
+import java.awt.Dimension;
+import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.mail.MessagingException;
import javax.mail.internet.AddressException;
import javax.swing.BorderFactory;
+import javax.swing.Box;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JLabel;
@@ -93,10 +93,6 @@ public class MailerVisualizer extends Ab
private JComboBox authTypeCombo;
-
-// private JPanel mainPanel;
-// private JLabel panelTitleLabel;
-
/**
* Constructs the MailerVisualizer and initializes its GUI.
*/
@@ -137,7 +133,7 @@ public class MailerVisualizer extends Ab
@Override
public String toString() {
-return E-Mail Notification;
+return JMeterUtils.getResString(mailer_string); // $NON-NLS-1$
}
/**
@@ -148,147 +144,155 @@ public class MailerVisualizer extends Ab
// MAIN PANEL
JPanel mainPanel = new VerticalPanel();
-Border margin = new EmptyBorder(10, 10, 5, 10);
-
+Border margin = new EmptyBorder(5, 10, 5, 10);
this.setBorder(margin);
-// NAME
mainPanel.add(makeTitlePanel());
+
+JPanel attributePane = new VerticalPanel();
+
attributePane.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
+JMeterUtils.getResString(mailer_title_settings))); //
$NON-NLS-1$
+
+// Settings panes
+attributePane.add(createMailingSettings());
+attributePane.add(createSmtpSettings());
+
+// Test mail button
+JPanel testerPanel = new JPanel(new BorderLayout());
+testerButton = new
JButton(JMeterUtils.getResString(mailer_test_mail)); // $NON-NLS-1$
+testerButton.addActionListener(this);
+testerButton.setEnabled(true);
+testerPanel.add(testerButton, BorderLayout.EAST);
+attributePane.add(testerPanel);
+mainPanel.add(attributePane);
+mainPanel.add(Box.createRigidArea(new Dimension(0,5)));
+
+// Failures count
+JPanel mailerPanel = new JPanel(new BorderLayout());
+mailerPanel.add(new
JLabel(JMeterUtils.getResString(mailer_failures)), BorderLayout.WEST); //
$NON-NLS-1$
+failureField = new JTextField(6);
+failureField.setEditable(false);
+mailerPanel.add(failureField, BorderLayout.CENTER);
+mainPanel.add(mailerPanel);
-// mailer panel
-JPanel mailerPanel = new JPanel();
-
-mailerPanel.setBorder(BorderFactory
-.createTitledBorder(BorderFactory.createEtchedBorder(),
getAttributesTitle()));
-GridBagLayout g = new GridBagLayout();
-
-mailerPanel.setLayout(g);
-GridBagConstraints c = new GridBagConstraints();
-
-c.anchor = GridBagConstraints.NORTHWEST;
-c.insets = new Insets(0, 0, 0, 0);
-c.gridwidth = 1;
-mailerPanel.add(new JLabel(From:));
-
+this.add(mainPanel, BorderLayout.CENTER);
+}
+
+private JPanel createMailingSettings() {
+JPanel settingsPane = new JPanel(new BorderLayout());
+
svn commit: r1339301 - /jmeter/trunk/docs/images/screenshots/changes/
Author: milamber Date: Wed May 16 18:20:44 2012 New Revision: 1339301 URL: http://svn.apache.org/viewvc?rev=1339301view=rev Log: Prepare New and Noteworthy section in changes.xml for next release Remove old 2.6 screenshots (moved to 2.6 folder) Removed: jmeter/trunk/docs/images/screenshots/changes/01_toolbar.png jmeter/trunk/docs/images/screenshots/changes/02_ignore_pause_timers.png jmeter/trunk/docs/images/screenshots/changes/03_look_and_feel.png jmeter/trunk/docs/images/screenshots/changes/04_duplicate_context_menu.png jmeter/trunk/docs/images/screenshots/changes/05_search_tree.png jmeter/trunk/docs/images/screenshots/changes/06_post_data.png jmeter/trunk/docs/images/screenshots/changes/07_multiple_selection_params.png jmeter/trunk/docs/images/screenshots/changes/08_file_protocol.png jmeter/trunk/docs/images/screenshots/changes/09_file_protocol_embedded.png jmeter/trunk/docs/images/screenshots/changes/10_child_sampler.png jmeter/trunk/docs/images/screenshots/changes/11_jks_keystore.png jmeter/trunk/docs/images/screenshots/changes/12_aggregate_graph_settings.png jmeter/trunk/docs/images/screenshots/changes/13_aggregate_graph_bar.png jmeter/trunk/docs/images/screenshots/changes/14_reset_counter.png jmeter/trunk/docs/images/screenshots/changes/15_random_string.png jmeter/trunk/docs/images/screenshots/changes/16_udv_comments.png jmeter/trunk/docs/images/screenshots/changes/17_vrt_max_size_display.png jmeter/trunk/docs/images/screenshots/changes/18_change_ctl_type.png jmeter/trunk/docs/images/screenshots/changes/19_jdbc_pre_post_proc.png jmeter/trunk/docs/images/screenshots/changes/20_jdbc_trans_isolation.png jmeter/trunk/docs/images/screenshots/changes/21_poisson_timer.png jmeter/trunk/docs/images/screenshots/changes/22_drag_and_drop.png jmeter/trunk/docs/images/screenshots/changes/23_confirm_remove.png jmeter/trunk/docs/images/screenshots/changes/24_diskstore.png jmeter/trunk/docs/images/screenshots/changes/25_selector.png jmeter/trunk/docs/images/screenshots/changes/26_ignore_child_failed.png jmeter/trunk/docs/images/screenshots/changes/27_succes_with_child_failed.png jmeter/trunk/docs/images/screenshots/changes/28_loggerpanel.png jmeter/trunk/docs/images/screenshots/changes/28_loggerpanel_option.png
svn commit: r1339350 - in /jmeter/trunk: docs/images/screenshots/changes/2.7/ xdocs/ xdocs/images/screenshots/changes/2.7/
Author: pmouawad Date: Wed May 16 20:39:16 2012 New Revision: 1339350 URL: http://svn.apache.org/viewvc?rev=1339350view=rev Log: Added Changes and Noteworthy Grouped changes by Samplers, Listener, reports Added: jmeter/trunk/docs/images/screenshots/changes/2.7/11_jms_non_persistent_delivery_mode.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.7/12_jms_sending_objects.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.7/13_jms_properties.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.7/14_ws_document_cache.png (with props) jmeter/trunk/docs/images/screenshots/changes/2.7/15_ws_maintain_session.png (with props) jmeter/trunk/xdocs/images/screenshots/changes/2.7/11_jms_non_persistent_delivery_mode.png (with props) jmeter/trunk/xdocs/images/screenshots/changes/2.7/12_jms_sending_objects.png (with props) jmeter/trunk/xdocs/images/screenshots/changes/2.7/13_jms_properties.png (with props) jmeter/trunk/xdocs/images/screenshots/changes/2.7/14_ws_document_cache.png (with props) jmeter/trunk/xdocs/images/screenshots/changes/2.7/15_ws_maintain_session.png (with props) Modified: jmeter/trunk/xdocs/changes.xml Added: jmeter/trunk/docs/images/screenshots/changes/2.7/11_jms_non_persistent_delivery_mode.png URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/2.7/11_jms_non_persistent_delivery_mode.png?rev=1339350view=auto == Binary file - no diff available. Propchange: jmeter/trunk/docs/images/screenshots/changes/2.7/11_jms_non_persistent_delivery_mode.png -- svn:mime-type = application/octet-stream Added: jmeter/trunk/docs/images/screenshots/changes/2.7/12_jms_sending_objects.png URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/2.7/12_jms_sending_objects.png?rev=1339350view=auto == Binary file - no diff available. Propchange: jmeter/trunk/docs/images/screenshots/changes/2.7/12_jms_sending_objects.png -- svn:mime-type = application/octet-stream Added: jmeter/trunk/docs/images/screenshots/changes/2.7/13_jms_properties.png URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/2.7/13_jms_properties.png?rev=1339350view=auto == Binary file - no diff available. Propchange: jmeter/trunk/docs/images/screenshots/changes/2.7/13_jms_properties.png -- svn:mime-type = application/octet-stream Added: jmeter/trunk/docs/images/screenshots/changes/2.7/14_ws_document_cache.png URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/2.7/14_ws_document_cache.png?rev=1339350view=auto == Binary file - no diff available. Propchange: jmeter/trunk/docs/images/screenshots/changes/2.7/14_ws_document_cache.png -- svn:mime-type = application/octet-stream Added: jmeter/trunk/docs/images/screenshots/changes/2.7/15_ws_maintain_session.png URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/changes/2.7/15_ws_maintain_session.png?rev=1339350view=auto == Binary file - no diff available. Propchange: jmeter/trunk/docs/images/screenshots/changes/2.7/15_ws_maintain_session.png -- svn:mime-type = application/octet-stream Modified: jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1339350r1=1339349r2=1339350view=diff == --- jmeter/trunk/xdocs/changes.xml (original) +++ jmeter/trunk/xdocs/changes.xml Wed May 16 20:39:16 2012 @@ -45,6 +45,33 @@ Earlier changes are detailed in the a h figure width=877 height=470 image=changes/2.7/02_os_process_example_results.png/figure /p +h3JMS Samplers improvements/h3 +pAddition of a Non Persistent Delivery option to send Non-Persistent (Guaranteed to be delivered at most once. Message loss is not a concern.) JMS messages +figure width=1328 height=675 image=changes/2.7/11_jms_non_persistent_delivery_mode.png/figure +/p + +pSupport sending of JMS Object Messages to enable sending Objects unmarshalled from XML by XStream +figure width=809 height=723 image=changes/2.7/12_jms_sending_objects.png/figure +/p + +pEnable setting JMS Properties through JMS Publisher
