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/07/07 17:52:09 UTC
svn commit: r961418 - in /jakarta/jmeter/trunk:
src/core/org/apache/jmeter/resources/messages.properties
src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
xdocs/usermanual/component_reference.xml
Author: sebb
Date: Wed Jul 7 15:52:09 2010
New Revision: 961418
URL: http://svn.apache.org/viewvc?rev=961418&view=rev
Log:
Tidy up tooltips. Document local truststore pathname resolution
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
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=961418&r1=961417&r2=961418&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 Wed Jul 7 15:52:09 2010
@@ -815,11 +815,12 @@ smtp_subject=Subject:
smtp_to=Address To:
smtp_timestamp=Include timestamp in subject
smtp_trustall=Trust all certificates
-smtp_trustall_tooltip=<html><b>Enforces</b> JMeter to trust all certificates, whatever CA it comes from. <br />If not selected, you should install the server certificate manually <br />(using the corresponding option below)</html>
+smtp_trustall_tooltip=<html><b>Enforces</b> JMeter to trust all certificates, whatever CA it comes from.</html>
smtp_truststore=Local truststore:
+smtp_truststore_tooltip=<html>The pathname of the truststore.<br />Relative paths are resolved against the current directory.<br />Failing that, against the directory containing the test script (JMX file)</html>
smtp_useauth=Use Auth
smtp_usetruststore=Use local truststore
-smtp_usetruststore_tooltip=<html><b>Please note:</b></html>
+smtp_usetruststore_tooltip=<html>Allows JMeter to use a local truststore.</html>
smtp_usenone=Use no security features
smtp_username=Username:
smtp_usessl=Use SSL
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=961418&r1=961417&r2=961418&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 Wed Jul 7 15:52:09 2010
@@ -866,10 +866,12 @@ public class SmtpPanel extends JPanel {
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 2;
gridBagConstraints.gridwidth = 1;
+ jlTrustStoreToUse.setToolTipText(JMeterUtils.getResString("smtp_truststore_tooltip"));
panelSecuritySettings.add(jlTrustStoreToUse, gridBagConstraints);
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 2;
+ tfTrustStoreToUse.setToolTipText(JMeterUtils.getResString("smtp_truststore_tooltip"));
panelSecuritySettings.add(tfTrustStoreToUse, gridBagConstraints);
gridBagConstraintsMain.gridx = 0;
Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=961418&r1=961417&r2=961418&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Wed Jul 7 15:52:09 2010
@@ -1523,7 +1523,10 @@ Defaults are: SMTP=25, SSL=465, StartTLS
<property name="Enforce StartTLS" required="">If the server does not start the TLS protocol the connection will be terminated.</property>
<property name="Trust All Certificates" required="">When selected it will accept all certificates independent of the CA.</property>
<property name="Use local truststore" required="">When selected it will only accept certificates that are locally trusted.</property>
-<property name="Local truststore" required="">Local file containing the trusted certificates.</property>
+<property name="Local truststore" required="">Path to file containing the trusted certificates.
+Relative paths are resolved against the current directory.
+<br />Failing that, against the directory containing the test script (JMX file).
+</property>
<property name="Subject" required="">The e-mail message subject.</property>
<property name="Include timestamp in subject" required="">Includes the System.currentTimemilis() in the subject line.</property>
<property name="Add Header" required="No">Additional headers can be defined using this button.</property>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org