jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject 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/
Date Wed, 16 May 2012 18:10:55 GMT
Author: milamber
Date: Wed May 16 18:10:54 2012
New Revision: 1339294

URL: http://svn.apache.org/viewvc?rev=1339294&view=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=1339294&r1=1339293&r2=1339294&view=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=1339294&r1=1339293&r2=1339294&view=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());
+        settingsPane.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
+                JMeterUtils.getResString("mailer_title_message"))); // $NON-NLS-1$
+        
+        JPanel headerPane = new JPanel(new BorderLayout());
+        headerPane.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0));
+        JPanel fromPane = new JPanel(new BorderLayout());
+        fromPane.add(new JLabel(JMeterUtils.getResString("mailer_from")), BorderLayout.WEST);
// $NON-NLS-1$
         fromField = new JTextField(25);
         fromField.setEditable(true);
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        g.setConstraints(fromField, c);
-        mailerPanel.add(fromField);
-
-        c.anchor = GridBagConstraints.NORTHWEST;
-        c.insets = new Insets(0, 0, 0, 0);
-        c.gridwidth = 1;
-        mailerPanel.add(new JLabel("Addressee(s):"));
-
-        addressField = new JTextField(25);
+        fromPane.add(fromField, BorderLayout.CENTER);
+        fromPane.add(Box.createRigidArea(new Dimension(5,0)), BorderLayout.EAST);
+        headerPane.add(fromPane, BorderLayout.WEST);
+        JPanel addressPane = new JPanel(new BorderLayout());
+        addressPane.add(new JLabel(JMeterUtils.getResString("mailer_addressees")), BorderLayout.WEST);
// $NON-NLS-1$
+        addressField = new JTextField(10);
         addressField.setEditable(true);
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        g.setConstraints(addressField, c);
-        mailerPanel.add(addressField);
-
-        c.gridwidth = 1;
-        mailerPanel.add(new JLabel("SMTP Host:"));
+        addressPane.add(addressField, BorderLayout.CENTER);
+        headerPane.add(addressPane, BorderLayout.CENTER);
+        
+        JPanel successPane = new JPanel(new BorderLayout());
+        successPane.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0));
+        JPanel succesSubjectPane = new JPanel(new BorderLayout());
+        succesSubjectPane.add(new JLabel(JMeterUtils.getResString("mailer_success_subject")),
BorderLayout.WEST); // $NON-NLS-1$
+        successSubjectField = new JTextField(10);
+        successSubjectField.setEditable(true);
+        succesSubjectPane.add(successSubjectField, BorderLayout.CENTER);
+        succesSubjectPane.add(Box.createRigidArea(new Dimension(5,0)), BorderLayout.EAST);
+        successPane.add(succesSubjectPane, BorderLayout.CENTER);
+        JPanel successLimitPane = new JPanel(new BorderLayout());
+        successLimitPane.add(new JLabel(JMeterUtils.getResString("mailer_success_limit")),
BorderLayout.WEST); // $NON-NLS-1$
+        successLimitField = new JTextField("2", 5); // $NON-NLS-1$
+        successLimitField.setEditable(true);
+        successLimitPane.add(successLimitField, BorderLayout.CENTER);
+        successPane.add(successLimitPane, BorderLayout.EAST);
+        
+        JPanel failurePane = new JPanel(new BorderLayout());
+        failurePane.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0));
+        JPanel failureSubjectPane = new JPanel(new BorderLayout());
+        failureSubjectPane.add(new JLabel(JMeterUtils.getResString("mailer_failure_subject")),
BorderLayout.WEST); // $NON-NLS-1$
+        failureSubjectField = new JTextField(10);
+        failureSubjectField.setEditable(true);
+        failureSubjectPane.add(failureSubjectField, BorderLayout.CENTER);
+        failureSubjectPane.add(Box.createRigidArea(new Dimension(5,0)), BorderLayout.EAST);
+        failurePane.add(failureSubjectPane, BorderLayout.CENTER);
+        JPanel failureLimitPane = new JPanel(new BorderLayout());
+        failureLimitPane.add(new JLabel(JMeterUtils.getResString("mailer_failure_limit")),
BorderLayout.WEST); // $NON-NLS-1$
+        failureLimitField = new JTextField("2", 5); // $NON-NLS-1$
+        failureLimitField.setEditable(true);
+        failureLimitPane.add(failureLimitField, BorderLayout.CENTER);
+        failurePane.add(failureLimitPane, BorderLayout.EAST);
+        
+        settingsPane.add(headerPane, BorderLayout.NORTH);
+        settingsPane.add(successPane, BorderLayout.CENTER);
+        settingsPane.add(failurePane, BorderLayout.SOUTH);
+        
+        return settingsPane;
+    }
 
-        smtpHostField = new JTextField(25);
+    private JPanel createSmtpSettings() {
+        JPanel settingsPane = new JPanel(new BorderLayout());
+        settingsPane.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
+                JMeterUtils.getResString("mailer_title_smtpserver"))); // $NON-NLS-1$
+        
+        JPanel hostPane = new JPanel(new BorderLayout());
+        hostPane.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0));
+        JPanel smtpHostPane = new JPanel(new BorderLayout());
+        smtpHostPane.add(new JLabel(JMeterUtils.getResString("mailer_host")), BorderLayout.WEST);
// $NON-NLS-1$
+        smtpHostField = new JTextField(10);
         smtpHostField.setEditable(true);
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        g.setConstraints(smtpHostField, c);
-        mailerPanel.add(smtpHostField);
-
-        c.gridwidth = 1;
-        mailerPanel.add(new JLabel("SMTP Port:"));
-
-        smtpPortField = new JTextField(25);
+        smtpHostPane.add(smtpHostField, BorderLayout.CENTER);
+        smtpHostPane.add(Box.createRigidArea(new Dimension(5,0)), BorderLayout.EAST);
+        hostPane.add(smtpHostPane, BorderLayout.CENTER);
+        JPanel smtpPortPane = new JPanel(new BorderLayout());
+        smtpPortPane.add(new JLabel(JMeterUtils.getResString("mailer_port")), BorderLayout.WEST);
// $NON-NLS-1$
+        smtpPortField = new JTextField(10);
         smtpPortField.setEditable(true);
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        g.setConstraints(smtpPortField, c);
-        mailerPanel.add(smtpPortField);
+        smtpPortPane.add(smtpPortField, BorderLayout.CENTER);
+        hostPane.add(smtpPortPane, BorderLayout.EAST);
 
-        c.gridwidth = 1;
-        mailerPanel.add(new JLabel("SMTP Login:"));
-
-        smtpLoginField = new JTextField(25);
+        JPanel authPane = new JPanel(new BorderLayout());
+        hostPane.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0));
+        JPanel smtpLoginPane = new JPanel(new BorderLayout());
+        smtpLoginPane.add(new JLabel(JMeterUtils.getResString("mailer_login")), BorderLayout.WEST);
// $NON-NLS-1$
+        smtpLoginField = new JTextField(10);
         smtpLoginField.setEditable(true);
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        g.setConstraints(smtpLoginField, c);
-        mailerPanel.add(smtpLoginField);
-
-        c.gridwidth = 1;
-        mailerPanel.add(new JLabel("SMTP Password:"));
-
-        smtpPasswordField = new JPasswordField(25);
+        smtpLoginPane.add(smtpLoginField, BorderLayout.CENTER);
+        smtpLoginPane.add(Box.createRigidArea(new Dimension(5,0)), BorderLayout.EAST);
+        authPane.add(smtpLoginPane, BorderLayout.CENTER);
+        JPanel smtpPasswordPane = new JPanel(new BorderLayout());
+        smtpPasswordPane.add(new JLabel(JMeterUtils.getResString("mailer_password")), BorderLayout.WEST);
// $NON-NLS-1$
+        smtpPasswordField = new JPasswordField(10);
         smtpPasswordField.setEditable(true);
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        g.setConstraints(smtpPasswordField, c);
-        mailerPanel.add(smtpPasswordField);
+        smtpPasswordPane.add(smtpPasswordField, BorderLayout.CENTER);
+        smtpPasswordPane.add(Box.createRigidArea(new Dimension(5,0)), BorderLayout.EAST);
+        authPane.add(smtpPasswordPane, BorderLayout.EAST);
 
-        c.gridwidth = 1;
-        mailerPanel.add(new JLabel("AUTH TYPE"));
-        
+        JPanel authTypePane = new JPanel(new BorderLayout());
+        authTypePane.add(new JLabel(JMeterUtils.getResString("mailer_connection_security")),
BorderLayout.WEST);
         authTypeCombo = new JComboBox(new Object[] { 
                 MailerModel.MailAuthType.NONE.toString(), 
                 MailerModel.MailAuthType.SSL.toString(),
                 MailerModel.MailAuthType.TLS.toString()});
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        g.setConstraints(authTypeCombo, c);
-        mailerPanel.add(authTypeCombo);
+        authTypeCombo.setFont(new Font("SansSerif", Font.PLAIN, 10)); // $NON-NLS-1$
+        authTypePane.add(authTypeCombo, BorderLayout.CENTER);
         
+        JPanel credPane = new JPanel(new BorderLayout());
+        credPane.add(authPane, BorderLayout.CENTER);
+        credPane.add(authTypePane, BorderLayout.EAST);
         
-        c.gridwidth = 1;
-        mailerPanel.add(new JLabel("Failure Subject:"));
-
-        failureSubjectField = new JTextField(25);
-        failureSubjectField.setEditable(true);
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        g.setConstraints(failureSubjectField, c);
-        mailerPanel.add(failureSubjectField);
-
-        c.gridwidth = 1;
-        mailerPanel.add(new JLabel("Success Subject:"));
-
-        successSubjectField = new JTextField(25);
-        successSubjectField.setEditable(true);
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        g.setConstraints(successSubjectField, c);
-        mailerPanel.add(successSubjectField);
-
-        c.gridwidth = 1;
-        mailerPanel.add(new JLabel("Failure Limit:"));
-
-        failureLimitField = new JTextField("2", 25);
-        failureLimitField.setEditable(true);
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        g.setConstraints(failureLimitField, c);
-        mailerPanel.add(failureLimitField);
-
-        c.gridwidth = 1;
-        mailerPanel.add(new JLabel("Success Limit:"));
-
-        successLimitField = new JTextField("2", 25);
-        successLimitField.setEditable(true);
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        g.setConstraints(successLimitField, c);
-        mailerPanel.add(successLimitField);
-
-        testerButton = new JButton("Test Mail");
-        testerButton.addActionListener(this);
-        testerButton.setEnabled(true);
-        c.gridwidth = 1;
-        g.setConstraints(testerButton, c);
-        mailerPanel.add(testerButton);
-
-        c.gridwidth = 1;
-        mailerPanel.add(new JLabel("Failures:"));
-        failureField = new JTextField(6);
-        failureField.setEditable(false);
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        g.setConstraints(failureField, c);
-        mailerPanel.add(failureField);
-
-        mainPanel.add(mailerPanel);
-
-        this.add(mainPanel, BorderLayout.WEST);
+        settingsPane.add(hostPane, BorderLayout.NORTH);
+        settingsPane.add(credPane, BorderLayout.CENTER);
+        
+        return settingsPane;
     }
 
     public String getLabelResource() {
@@ -425,7 +429,8 @@ public class MailerVisualizer extends Ab
         } else {
             type = JOptionPane.INFORMATION_MESSAGE;
         }
-        JOptionPane.showMessageDialog(null, message, isError ? "Error" : "Information", type);
+        JOptionPane.showMessageDialog(null, message, isError ? 
+                JMeterUtils.getResString("mailer_msg_title_error") : JMeterUtils.getResString("mailer_msg_title_information"),
type);
     }
 
     /**

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1339294&r1=1339293&r2=1339294&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Wed May 16 18:10:54
2012
@@ -524,8 +524,27 @@ mail_reader_server_type=Protocol (e.g. p
 mail_reader_storemime=Store the message using MIME (raw)
 mail_reader_title=Mail Reader Sampler
 mail_sent=Mail sent successfully
+mailer_addressees=Addressee(s): 
 mailer_attributes_panel=Mailing attributes
+mailer_connection_security=Connection security: 
 mailer_error=Couldn't send mail. Please correct any misentries.
+mailer_failure_limit=Failure Limit: 
+mailer_failure_subject=Failure Subject: 
+mailer_failures=Failures: 
+mailer_from=From: 
+mailer_host=Host: 
+mailer_login=Login: 
+mailer_msg_title_error=Error
+mailer_msg_title_information=Information
+mailer_password=Password: 
+mailer_port=Port: 
+mailer_string=E-Mail Notification
+mailer_success_limit=Success Limit: 
+mailer_success_subject=Success Subject: 
+mailer_test_mail=Test Mail
+mailer_title_message=Message
+mailer_title_settings=Mailer settings
+mailer_title_smtpserver=SMTP server
 mailer_visualizer_title=Mailer Visualizer
 match_num_field=Match No. (0 for Random)\:
 max=Maximum

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1339294&r1=1339293&r2=1339294&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Wed May 16 18:10:54
2012
@@ -518,9 +518,28 @@ mail_reader_server_type=Protocole (ex. p
 mail_reader_storemime=Stocker le message en utilisant MIME (brut)
 mail_reader_title=Echantillon Lecteur d'email
 mail_sent=Email envoy\u00E9 avec succ\u00E8s
+mailer_addressees=Destinataire(s) \: 
 mailer_attributes_panel=Attributs de courrier
+mailer_connection_security=S\u00E9curit\u00E9 connexion \: 
 mailer_error=N'a pas p\u00FB envoyer l'email. Veuillez corriger les erreurs de saisie.
-mailer_visualizer_title=Visualiseur de courrier
+mailer_failure_limit=Limite d'\u00E9chec \: 
+mailer_failure_subject=Sujet Echec \: 
+mailer_failures=Nombre d'\u00E9checs \: 
+mailer_from=Exp\u00E9diteur \: 
+mailer_host=Serveur \: 
+mailer_login=Identifiant \: 
+mailer_msg_title_error=Erreur
+mailer_msg_title_information=Information
+mailer_password=Mot de passe \: 
+mailer_port=Port \: 
+mailer_string=Notification d'email
+mailer_success_limit=Limite de succ\u00E8s \: 
+mailer_success_subject=Sujet Succ\u00E8s \: 
+mailer_test_mail=Tester email
+mailer_title_message=Message
+mailer_title_settings=Param\u00E8tres
+mailer_title_smtpserver=Serveur SMTP
+mailer_visualizer_title=R\u00E9cepteur Notification Email
 match_num_field=R\u00E9cup\u00E9rer la Ni\u00E8me corresp. (0 \: Al\u00E9atoire) \:
 max=Maximum \:
 maximum_param=La valeur maximum autoris\u00E9e pour un \u00E9cart de valeurs

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1339294&r1=1339293&r2=1339294&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Wed May 16 18:10:54 2012
@@ -236,6 +236,7 @@ Graph Full Results Listener has been rem
 <li>Bug 52603 - MailerVisualizer : Enable SSL , TLS and Authentication</li>
 <li>Bug 52698 - Remove Graph Full Results Listener</li>
 <li>Bug 53070 - Change Aggregate graph to Clustered Bar chart, add more columns (median,
90% line, min, max) and options, fixed some bugs</li>
+<li>Bug 53246 - Mailer Visualizer: improve GUI design and I18N</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
@@ -248,6 +249,7 @@ Graph Full Results Listener has been rem
 
 <h3>I18N</h3>
 <ul>
+<li>Mailer Visualizer has been internationalized. French translation added. (see Bug
53246)</li>
 </ul>
 
 <h3>General</h3>

Modified: jmeter/trunk/xdocs/images/screenshots/mailervisualizer.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/mailervisualizer.png?rev=1339294&r1=1339293&r2=1339294&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1339294&r1=1339293&r2=1339294&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Wed May 16 18:10:54 2012
@@ -2708,27 +2708,28 @@ the graph as a PNG file.</description>
 </div>
 </component>
 
-<component name="Mailer Visualizer" index="&sect-num;.3.13"  width="807" height="415"
screenshot="mailervisualizer.png">
+<component name="Mailer Visualizer" index="&sect-num;.3.13"  width="860" height="463"
screenshot="mailervisualizer.png">
 <description><p>The mailer visualizer can be set up to send email if a test run
receives too many
 failed responses from the server.</p></description>
 <properties>
         <property name="Name" required="No">Descriptive name for this element that
is shown in the tree.</property>
         <property name="From" required="Yes">Email address to send messages from.</property>
         <property name="Addressee(s)" required="Yes">Email address to send messages
to, comma-separated.</property>
-        <property name="SMTP Host" required="No">IP address or host name of SMTP (email
redirector)
-        server.</property>
-        <property name="SMTP Port" required="No">Port of SMTP server (defaults to 25).</property>
-        <property name="SMTP Login" required="No">Login used to authenticate.</property>
-        <property name="SMTP Password" required="No">Password used to authenticate.</property>
-        <property name="Auth Type" required="No">Type of encryption for SMTP authentication
(SSL, TLS or none).</property>
-
-        <property name="Failure Subject" required="No">Email subject line for fail
messages.</property>
         <property name="Success Subject" required="No">Email subject line for success
messages.</property>
-        <property name="Failure Limit" required="Yes">Once this number of failed responses
is exceeded, a failure
-        email is sent - i.e. set the count to 0 to send an e-mail on the first failure.</property>
         <property name="Success Limit" required="Yes">Once this number of successful
responses is exceeded
         <strong>after previously reaching the failure limit</strong>, a success
email
         is sent.  The mailer will thus only send out messages in a sequence of failed-succeeded-failed-succeeded,
etc.</property>
+        <property name="Failure Subject" required="No">Email subject line for fail
messages.</property>
+        <property name="Failure Limit" required="Yes">Once this number of failed responses
is exceeded, a failure
+        email is sent - i.e. set the count to 0 to send an e-mail on the first failure.</property>
+
+        <property name="Host" required="No">IP address or host name of SMTP server
(email redirector)
+        server.</property>
+        <property name="Port" required="No">Port of SMTP server (defaults to 25).</property>
+        <property name="Login" required="No">Login used to authenticate.</property>
+        <property name="Password" required="No">Password used to authenticate.</property>
+        <property name="Connection security" required="No">Type of encryption for SMTP
authentication (SSL, TLS or none).</property>
+
         <property name="Test Mail" required="No">Press this button to send a test mail</property>
         <property name="Failures" required="No">A field that keeps a running total
of number
         of failures so far received.</property>



Mime
View raw message