You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2005/05/18 23:40:14 UTC
cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/visualizers MailerVisualizer.java
sebb 2005/05/18 14:40:13
Modified: src/components/org/apache/jmeter/reporters
MailerResultCollector.java
src/components/org/apache/jmeter/visualizers
MailerVisualizer.java
Log:
Allow for optional mail jar
Revision Changes Path
1.8 +12 -6 jakarta-jmeter/src/components/org/apache/jmeter/reporters/MailerResultCollector.java
Index: MailerResultCollector.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/reporters/MailerResultCollector.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MailerResultCollector.java 13 Feb 2004 01:39:06 -0000 1.7
+++ MailerResultCollector.java 18 May 2005 21:40:13 -0000 1.8
@@ -22,8 +22,8 @@
import org.apache.jmeter.samplers.SampleEvent;
import org.apache.jmeter.testelement.property.TestElementProperty;
-//import org.apache.jorphan.logging.LoggingManager;
-//import org.apache.log.Logger;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
/**
* @author Michael Stover
@@ -33,7 +33,7 @@
extends ResultCollector
implements Serializable
{
- //transient private static Logger log = LoggingManager.getLoggerForClass();
+ transient private static Logger log = LoggingManager.getLoggerForClass();
public static final String MAILER_MODEL =
"MailerResultCollector.mailer_model";
@@ -41,7 +41,13 @@
public MailerResultCollector()
{
super();
- setProperty(new TestElementProperty(MAILER_MODEL, new MailerModel()));
+ try {
+ setProperty(new TestElementProperty(MAILER_MODEL, new MailerModel()));
+ }
+ catch (NoClassDefFoundError e)
+ {
+ log.warn("Missing mail jar "+e);
+ }
}
public void clear()
1.24 +14 -11 jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
Index: MailerVisualizer.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- MailerVisualizer.java 20 Sep 2004 23:08:41 -0000 1.23
+++ MailerVisualizer.java 18 May 2005 21:40:13 -0000 1.24
@@ -27,8 +27,6 @@
import java.awt.event.ActionListener;
import java.net.UnknownHostException;
-import javax.mail.MessagingException;
-import javax.mail.internet.AddressException;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JLabel;
@@ -49,6 +47,7 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JMeterError;
import org.apache.log.Logger;
@@ -282,17 +281,21 @@
log.error("Invalid Mail Server ", e1);
displayMessage(JMeterUtils.getResString("invalid_mail_server"), true);
}
- catch (AddressException ex)
+ catch (Exception ex)
{
+ if (ex.getClass().getName().equals("javax.mail.internet.AddressException"))
+ {
log.error("Invalid mail address ", ex);
displayMessage(JMeterUtils.getResString("invalid_mail_address")
+ "\n" + ex.getMessage(), true);
- }
- catch (MessagingException ex)
- {
- log.error("Couldn't send mail...", ex);
- displayMessage(JMeterUtils.getResString("invalid_mail")
- +"\n"+ex.getMessage(), true);
+ } else if (ex.getClass().getName().equals("javax.mail.MessagingException"))
+ {
+ log.error("Couldn't send mail...", ex);
+ displayMessage(JMeterUtils.getResString("invalid_mail")
+ +"\n"+ex.getMessage(), true);
+ } else {
+ throw new JMeterError("Unexpected error",ex);
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org