You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/09/03 12:51:24 UTC
svn commit: r992261 - in /jakarta/jmeter/trunk: docs/images/screenshots/
src/core/org/apache/jmeter/resources/
src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/
src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/
src/protocol/mail/o...
Author: sebb
Date: Fri Sep 3 10:51:23 2010
New Revision: 992261
URL: http://svn.apache.org/viewvc?rev=992261&view=rev
Log:
Add Reply-To field to SMTP Sampler
Modified:
jakarta/jmeter/trunk/docs/images/screenshots/smtp_sampler.png
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
jakarta/jmeter/trunk/xdocs/images/screenshots/smtp_sampler.png
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jakarta/jmeter/trunk/docs/images/screenshots/smtp_sampler.png
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/smtp_sampler.png?rev=992261&r1=992260&r2=992261&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=992261&r1=992260&r2=992261&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Fri Sep 3 10:51:23 2010
@@ -808,6 +808,7 @@ smtp_message_settings=Message settings
smtp_messagesize=Calculate message size
smtp_password=Password:
smtp_plainbody=Send plain body (i.e. not multipart/mixed)
+smtp_replyto=Address Reply-To:
smtp_sampler_title=SMTP Sampler
smtp_security_settings=Security settings
smtp_server_port=Port:
Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java?rev=992261&r1=992260&r2=992261&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java Fri Sep 3 10:51:23 2010
@@ -67,6 +67,7 @@ public class SmtpSampler extends Abstrac
public final static String USERNAME = "SMTPSampler.username"; // $NON-NLS-1$
public final static String PASSWORD = "SMTPSampler.password"; // $NON-NLS-1$
public final static String MAIL_FROM = "SMTPSampler.mailFrom"; // $NON-NLS-1$
+ public static final String MAIL_REPLYTO = "SMTPSampler.replyTo"; // $NON-NLS-1$
public final static String RECEIVER_TO = "SMTPSampler.receiverTo"; // $NON-NLS-1$
public final static String RECEIVER_CC = "SMTPSampler.receiverCC"; // $NON-NLS-1$
public final static String RECEIVER_BCC = "SMTPSampler.receiverBCC"; // $NON-NLS-1$
@@ -132,12 +133,14 @@ public class SmtpSampler extends Abstrac
final String receiverTo = getPropertyAsString(SmtpSampler.RECEIVER_TO).trim();
final String receiverCC = getPropertyAsString(SmtpSampler.RECEIVER_CC).trim();
final String receiverBcc = getPropertyAsString(SmtpSampler.RECEIVER_BCC).trim();
+ final String replyTo = getPropertyAsString(SmtpSampler.MAIL_REPLYTO).trim();
try {
// Process address lists
instance.setReceiverTo(getPropNameAsAddresses(receiverTo));
instance.setReceiverCC(getPropNameAsAddresses(receiverCC));
instance.setReceiverBCC(getPropNameAsAddresses(receiverBcc));
+ instance.setReplyTo(getPropNameAsAddresses(replyTo));
if(getPropertyAsBoolean(SUPPRESS_SUBJECT)){
instance.setSubject(null);
Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java?rev=992261&r1=992260&r2=992261&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java Fri Sep 3 10:51:23 2010
@@ -53,6 +53,7 @@ public class SmtpPanel extends JPanel {
// local vars
private JTextField tfMailFrom;
+ private JTextField tfMailReplyTo;
private JButton browseButton;
private JButton emlBrowseButton;
private JCheckBox cbUseAuth;
@@ -67,6 +68,7 @@ public class SmtpPanel extends JPanel {
private JCheckBox cbPlainBody;
private JLabel jlAddressFrom;
+ private JLabel jlAddressReplyTo;
private JLabel jlAddressTo;
private JLabel jlAddressToCC;
private JLabel jlAddressToBCC;
@@ -471,12 +473,23 @@ public class SmtpPanel extends JPanel {
}
validate();
}
+
+ public String getMailReplyTo() {
+ return tfMailReplyTo.getText();
+ }
+
+ public void setMailReplyTo(String replyTo) {
+ tfMailReplyTo.setText(replyTo);
+ }
+
+
/**
* Main method of class, builds all gui-components for SMTP-sampler.
*/
private void initComponents() {
GridBagConstraints gridBagConstraints, gridBagConstraintsMain;
+ jlAddressReplyTo = new JLabel(JMeterUtils.getResString("smtp_replyto")); // $NON-NLS-1$
jlAddressFrom = new JLabel(JMeterUtils.getResString("smtp_from")); // $NON-NLS-1$
jlAddressTo = new JLabel(JMeterUtils.getResString("smtp_to")); // $NON-NLS-1$
jlAddressToCC = new JLabel(JMeterUtils.getResString("smtp_cc")); // $NON-NLS-1$
@@ -493,6 +506,7 @@ public class SmtpPanel extends JPanel {
tfMailServer = new JTextField(30);
tfMailServerPort = new JTextField(6);
tfMailFrom = new JTextField(25);
+ tfMailReplyTo = new JTextField(25);
tfMailTo = new JTextField(25);
tfMailToCC = new JTextField(25);
tfMailToBCC = new JTextField(25);
@@ -629,6 +643,14 @@ public class SmtpPanel extends JPanel {
gridBagConstraints.gridy = 3;
panelMailSettings.add(tfMailToBCC, gridBagConstraints);
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 4;
+ panelMailSettings.add(jlAddressReplyTo, gridBagConstraints);
+
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 4;
+ panelMailSettings.add(tfMailReplyTo, gridBagConstraints);
+
gridBagConstraintsMain.gridx = 0;
gridBagConstraintsMain.gridy = 1;
add(panelMailSettings, gridBagConstraintsMain);
@@ -964,6 +986,7 @@ public class SmtpPanel extends JPanel {
tfAuthUsername.setText("");
tfEmlMessage.setText("");
tfMailFrom.setText("");
+ tfMailReplyTo.setText("");
tfMailServer.setText("");
tfMailServerPort.setText("");
tfMailTo.setText("");
@@ -1073,5 +1096,5 @@ public class SmtpPanel extends JPanel {
}
}
}
-
+
}
\ No newline at end of file
Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java?rev=992261&r1=992260&r2=992261&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpSamplerGui.java Fri Sep 3 10:51:23 2010
@@ -69,6 +69,7 @@ public class SmtpSamplerGui extends Abst
smtpPanel.setServer(element.getPropertyAsString(SmtpSampler.SERVER));
smtpPanel.setPort(element.getPropertyAsString(SmtpSampler.SERVER_PORT));
smtpPanel.setMailFrom(element.getPropertyAsString(SmtpSampler.MAIL_FROM));
+ smtpPanel.setMailReplyTo(element.getPropertyAsString(SmtpSampler.MAIL_REPLYTO));
smtpPanel.setReceiverTo(element.getPropertyAsString(SmtpSampler.RECEIVER_TO));
smtpPanel.setReceiverCC(element.getPropertyAsString(SmtpSampler.RECEIVER_CC));
smtpPanel.setReceiverBCC(element.getPropertyAsString(SmtpSampler.RECEIVER_BCC));
@@ -124,6 +125,7 @@ public class SmtpSamplerGui extends Abst
te.setProperty(SmtpSampler.SERVER, smtpPanel.getServer());
te.setProperty(SmtpSampler.SERVER_PORT, smtpPanel.getPort());
te.setProperty(SmtpSampler.MAIL_FROM, smtpPanel.getMailFrom());
+ te.setProperty(SmtpSampler.MAIL_REPLYTO, smtpPanel.getMailReplyTo());
te.setProperty(SmtpSampler.RECEIVER_TO, smtpPanel.getReceiverTo());
te.setProperty(SmtpSampler.RECEIVER_CC, smtpPanel.getReceiverCC());
te.setProperty(SmtpSampler.RECEIVER_BCC, smtpPanel.getReceiverBCC());
Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java?rev=992261&r1=992260&r2=992261&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java Fri Sep 3 10:51:23 2010
@@ -70,6 +70,7 @@ public class SendMailCommand {
private String smtpServer;
private String smtpPort;
private String sender;
+ private List<InternetAddress> replyTo;
private String emlMessage;
private List<InternetAddress> receiverTo;
private List<InternetAddress> receiverCC;
@@ -212,6 +213,11 @@ public class SendMailCommand {
message.setFrom(new InternetAddress(sender));
}
+ if (null != replyTo) {
+ InternetAddress[] to = new InternetAddress[replyTo.size()];
+ message.setReplyTo(replyTo.toArray(to));
+ }
+
message.setSubject(subject);
if (receiverTo != null) {
@@ -761,4 +767,8 @@ public class SendMailCommand {
enableDebug = selected;
}
+
+ public void setReplyTo(List<InternetAddress> replyTo) {
+ this.replyTo = replyTo;
+ }
}
\ No newline at end of file
Modified: jakarta/jmeter/trunk/xdocs/images/screenshots/smtp_sampler.png
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/images/screenshots/smtp_sampler.png?rev=992261&r1=992260&r2=992261&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=992261&r1=992260&r2=992261&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Fri Sep 3 10:51:23 2010
@@ -1505,7 +1505,7 @@ In non-GUI mode, JMeter will exit if som
</component>
-<component name="SMTP Sampler" index="§-num;.1.19" width="710" height="779" screenshot="smtp_sampler.png">
+<component name="SMTP Sampler" index="§-num;.1.19" width="713" height="802" screenshot="smtp_sampler.png">
<description>
<p>
The SMTP Sampler can send mail messages using SMTP/SMTPS protocol.
@@ -1524,9 +1524,10 @@ Two alternatives to handle this verifica
Defaults are: SMTP=25, SSL=465, StartTLS=587
</property>
<property name="Address From" required="Yes">The from address that will appear in the e-mail</property>
-<property name="Address To" required="Yes, unless CC or BCC is specified">The destination e-mail address</property>
-<property name="Address To BCC" required="No">Blind carbon copy destinations e-mail address</property>
-<property name="Address To CC" required="No">Carbon copy destinations e-mail address</property>
+<property name="Address To" required="Yes, unless CC or BCC is specified">The destination e-mail address (multiple values separated by ";")</property>
+<property name="Address To CC" required="No">Carbon copy destinations e-mail address (multiple values separated by ";")</property>
+<property name="Address To BCC" required="No">Blind carbon copy destinations e-mail address (multiple values separated by ";")</property>
+<property name="Address Reply-To" required="No">Alternate Reply-To address (multiple values separated by ";")</property>
<property name="Use Auth" required="">Indicates if the SMTP server requires user authentication</property>
<property name="Username" required="">User login name</property>
<property name="Password" required="">User login password (N.B. this is stored unencrypted in the test plan)</property>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org