You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/02/29 08:05:06 UTC
svn commit: r1732825 - in /openmeetings/application/branches/3.1.x: ./
openmeetings-core/
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/
openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/
openmeetings-core/src...
Author: solomax
Date: Mon Feb 29 07:05:05 2016
New Revision: 1732825
URL: http://svn.apache.org/viewvc?rev=1732825&view=rev
Log:
[OPENMEETINGS-1259] library versions are updated; mail sending related code is simplified; code clean up
Removed:
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/SmtpAuthenticator.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestConvertGifs.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/gui/TestGui.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestReadKeyCodesNumber.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/TestMD5.java
openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-util/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
openmeetings/application/branches/3.1.x/pom.xml
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml Mon Feb 29 07:05:05 2016
@@ -31,6 +31,7 @@
<description>TODO</description>
<properties>
<smslib.version>3.5.4</smslib.version>
+ <mail.version>1.5.5</mail.version>
<site.basedir>${project.parent.basedir}</site.basedir>
<skip.site.copy>false</skip.site.copy>
</properties>
@@ -106,6 +107,11 @@
<artifactId>api-all</artifactId>
<version>1.0.0-M33</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>${mail.version}</version>
+ </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.red5</groupId>
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java Mon Feb 29 07:05:05 2016
@@ -32,7 +32,7 @@ import java.util.List;
import javax.swing.JTextArea;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.svggen.SVGGraphics2D;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.util.OpenmeetingsVariables;
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java Mon Feb 29 07:05:05 2016
@@ -31,10 +31,12 @@ import java.util.List;
import java.util.Properties;
import javax.activation.DataHandler;
+import javax.mail.Authenticator;
import javax.mail.BodyPart;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Multipart;
+import javax.mail.PasswordAuthentication;
import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.internet.InternetAddress;
@@ -48,14 +50,12 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.db.entity.basic.MailMessage;
import org.apache.openmeetings.db.entity.basic.MailMessage.Status;
import org.apache.openmeetings.util.mail.MailUtil;
-import org.apache.openmeetings.util.mail.SmtpAuthenticator;
+import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.task.TaskExecutor;
-import com.sun.mail.util.MailSSLSocketFactory;
-
/**
*
* @author swagner
@@ -75,6 +75,7 @@ public class MailHandler {
private TaskExecutor taskExecutor;
@Autowired
private MailMessageDao mailMessageDao;
+
private String smtpServer;
private String smtpPort;
private String from;
@@ -97,6 +98,16 @@ public class MailHandler {
smtpTimeOut = cfgDao.getConfValue("mail.smtp.timeout", Integer.class, "30000");
}
+ public void init(String smtpServer, String smtpPort, String from, String mailAuthUser, String mailAuthPass, boolean mailTls, boolean mailAddReplyTo) {
+ this.smtpServer = smtpServer;
+ this.smtpPort = smtpPort;
+ this.from = from;
+ this.mailAuthUser = mailAuthUser;
+ this.mailAuthPass = mailAuthPass;
+ this.mailTls = mailTls;
+ this.mailAddReplyTo = mailAddReplyTo;
+ }
+
protected MimeMessage appendIcsBody(MimeMessage msg, MailMessage m) throws Exception {
log.debug("setMessageBody for iCal message");
// -- Create a new message --
@@ -131,8 +142,12 @@ public class MailHandler {
}
private MimeMessage appendBody(MimeMessage msg, MailMessage m) throws MessagingException, IOException {
+ return appendBody(msg, m.getBody());
+ }
+
+ public MimeMessage appendBody(MimeMessage msg, String body) throws MessagingException, IOException {
// -- Set the subject and body text --
- msg.setDataHandler(new DataHandler(new ByteArrayDataSource(m.getBody(), "text/html; charset=\"utf-8\"")));
+ msg.setDataHandler(new DataHandler(new ByteArrayDataSource(body, "text/html; charset=\"utf-8\"")));
// -- Set some other header information --
msg.setHeader("X-Mailer", "XML-Mail");
@@ -141,7 +156,7 @@ public class MailHandler {
return msg;
}
- private MimeMessage getBasicMimeMessage() throws Exception {
+ public MimeMessage getBasicMimeMessage() throws Exception {
log.debug("getBasicMimeMessage");
if (smtpServer == null) {
init();
@@ -150,24 +165,23 @@ public class MailHandler {
props.put("mail.smtp.host", smtpServer);
props.put("mail.smtp.port", smtpPort);
-
- props.put("mail.smtp.connectiontimeout", smtpConnectionTimeOut);
- props.put("mail.smtp.timeout", smtpTimeOut);
-
if (mailTls) {
props.put("mail.smtp.starttls.enable", "true");
- MailSSLSocketFactory sf = new MailSSLSocketFactory();
- sf.setTrustAllHosts(true);
- props.put("mail.smtp.ssl.socketFactory", sf);
}
+ props.put("mail.smtp.connectiontimeout", smtpConnectionTimeOut);
+ props.put("mail.smtp.timeout", smtpTimeOut);
// Check for Authentication
Session session = null;
- if (mailAuthUser != null && mailAuthUser.length() > 0
- && mailAuthPass != null && mailAuthPass.length() > 0) {
+ if (!Strings.isEmpty(mailAuthUser) && !Strings.isEmpty(mailAuthPass)) {
// use SMTP Authentication
props.put("mail.smtp.auth", "true");
- session = Session.getInstance(props, new SmtpAuthenticator(mailAuthUser, mailAuthPass));
+ session = Session.getDefaultInstance(props, new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(mailAuthUser, mailAuthPass);
+ }
+ });
} else {
// not use SMTP Authentication
session = Session.getInstance(props, null);
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java Mon Feb 29 07:05:05 2016
@@ -33,8 +33,8 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.dom.GenericDOMImplementation;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.svggen.SVGGraphics2D;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java Mon Feb 29 07:05:05 2016
@@ -23,13 +23,11 @@ import static org.apache.openmeetings.ut
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.TestCase;
-
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-public class TestChatLinking extends TestCase {
+public class TestChatLinking {
private static final Logger log = Red5LoggerFactory.getLogger(TestChatLinking.class, webAppRootKey);
@Test
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java Mon Feb 29 07:05:05 2016
@@ -22,13 +22,11 @@ import static org.apache.openmeetings.ut
import java.util.LinkedList;
-import junit.framework.TestCase;
-
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-public class TestChatParsing extends TestCase {
+public class TestChatParsing {
private static final Logger log = Red5LoggerFactory.getLogger(TestChatParsing.class, webAppRootKey);
public static LinkedList<LinkedList<String>> emotfilesList = new LinkedList<LinkedList<String>>();
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestConvertGifs.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestConvertGifs.java?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestConvertGifs.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestConvertGifs.java Mon Feb 29 07:05:05 2016
@@ -18,22 +18,22 @@
*/
package org.apache.openmeetings.test.emotes;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.File;
import java.io.FileWriter;
import java.io.PrintWriter;
import java.util.LinkedList;
-import junit.framework.TestCase;
-
-import org.apache.log4j.Logger;
import org.junit.Test;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.XppDriver;
-public class TestConvertGifs extends TestCase {
-
- private static final Logger log = Logger.getLogger(TestConvertGifs.class);
+public class TestConvertGifs {
+ private static final Logger log = Red5LoggerFactory.getLogger(TestConvertGifs.class, webAppRootKey);
@Test
public void testConvertDir(){
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/gui/TestGui.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/gui/TestGui.java?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/gui/TestGui.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/gui/TestGui.java Mon Feb 29 07:05:05 2016
@@ -20,10 +20,8 @@ package org.apache.openmeetings.test.gui
import org.junit.Test;
-import junit.framework.TestCase;
-
-public class TestGui extends TestCase {
+public class TestGui {
@Test
public void testNoop() {
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java Mon Feb 29 07:05:05 2016
@@ -19,13 +19,12 @@
package org.apache.openmeetings.test.jai;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import junit.framework.TestCase;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-public class TestInterpolation extends TestCase {
+public class TestInterpolation {
private static final Logger log = Red5LoggerFactory.getLogger(TestInterpolation.class, webAppRootKey);
@Test
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java Mon Feb 29 07:05:05 2016
@@ -24,10 +24,8 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
-import junit.framework.TestCase;
-
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.dom.GenericDOMImplementation;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.svggen.SVGGraphics2D;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
@@ -36,7 +34,7 @@ import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-public class TestSVGTextExporterArrow extends TestCase {
+public class TestSVGTextExporterArrow {
private static final Logger log = Red5LoggerFactory.getLogger(TestSVGTextExporterArrow.class, webAppRootKey);
@Test
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java Mon Feb 29 07:05:05 2016
@@ -22,13 +22,11 @@ import static org.apache.openmeetings.ut
import java.awt.event.KeyEvent;
-import junit.framework.TestCase;
-
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-public class TestKeyCodesNumber extends TestCase {
+public class TestKeyCodesNumber {
private static final Logger log = Red5LoggerFactory.getLogger(TestKeyCodesNumber.class, webAppRootKey);
@Test
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestReadKeyCodesNumber.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestReadKeyCodesNumber.java?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestReadKeyCodesNumber.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestReadKeyCodesNumber.java Mon Feb 29 07:05:05 2016
@@ -18,15 +18,14 @@
*/
package org.apache.openmeetings.test.rdc;
-import junit.framework.TestCase;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import org.apache.log4j.Logger;
import org.junit.Test;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
-public class TestReadKeyCodesNumber extends TestCase {
-
- private static final Logger log = Logger
- .getLogger(TestReadKeyCodesNumber.class);
+public class TestReadKeyCodesNumber {
+ private static final Logger log = Red5LoggerFactory.getLogger(TestReadKeyCodesNumber.class, webAppRootKey);
@Test
public void testTestKeyCodesNumber() {
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java Mon Feb 29 07:05:05 2016
@@ -21,26 +21,16 @@ package org.apache.openmeetings.test.use
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.junit.Assert.assertTrue;
-import java.io.IOException;
-import java.util.Date;
-import java.util.Properties;
-
-import javax.activation.DataHandler;
import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
-import javax.mail.util.ByteArrayDataSource;
-import org.apache.openmeetings.util.mail.SmtpAuthenticator;
+import org.apache.openmeetings.core.mail.MailHandler;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import com.sun.mail.util.MailSSLSocketFactory;
-
/**
*
* @author swagner
@@ -51,10 +41,10 @@ public class TestMailSending {
//Example GMail email server data
private String smtpServer = "smtp.gmail.com";
- private String smtpPort = "25";
- private String from = "test@apache.org";
- private String mailAuthUser = "test@gmail.com";
- private String mailAuthPass = "*******";
+ private String smtpPort = "587";
+ private String from = "test-app@apache.org";
+ private String mailAuthUser = "test-app@gmail.com";
+ private String mailAuthPass = "test-pass";
private boolean mailTls = true;
/**
@@ -66,10 +56,8 @@ public class TestMailSending {
*/
@Test
public void doTestSendEmail() {
- try{
-
+ try {
Transport.send(getMimeMessage());
-
} catch (Exception err) {
log.error("Error", err);
}
@@ -77,57 +65,13 @@ public class TestMailSending {
}
private MimeMessage getMimeMessage() throws Exception {
+ MailHandler h = new MailHandler();
+ h.init(smtpServer, smtpPort, from, mailAuthUser, mailAuthPass, mailTls, true);
// Building MimeMessage
- MimeMessage msg = getBasicMimeMessage();
+ MimeMessage msg = h.getBasicMimeMessage();
msg.setSubject("getSubject()");
- msg.addRecipients(Message.RecipientType.TO, InternetAddress.parse("seba.wagner@gmail.com", false));
-
- return appendBody(msg);
- }
-
- private MimeMessage appendBody(MimeMessage msg) throws MessagingException, IOException {
- // -- Set the subject and body text --
- msg.setDataHandler(new DataHandler(new ByteArrayDataSource("getBody", "text/html; charset=\"utf-8\"")));
-
- // -- Set some other header information --
- msg.setHeader("X-Mailer", "XML-Mail");
- msg.setSentDate(new Date());
-
- return msg;
- }
-
- private MimeMessage getBasicMimeMessage() throws Exception {
- System.out.println("getBasicMimeMessage");
- Properties props = new Properties(System.getProperties());
-
- props.put("mail.smtp.connectiontimeout", 30000); //default timeout is 30 seconds, javaMail default is "infinite"
- props.put("mail.smtp.timeout", 30000); //default timeout is 30 seconds, javaMail default is "infinite"
+ msg.addRecipients(Message.RecipientType.TO, InternetAddress.parse("test-recipient@gmail.com", false));
- props.put("mail.smtp.host", smtpServer);
- props.put("mail.smtp.port", smtpPort);
-
- if (mailTls) {
- props.put("mail.smtp.starttls.enable", "true");
- MailSSLSocketFactory sf = new MailSSLSocketFactory();
- sf.setTrustAllHosts(true);
- props.put("mail.smtp.ssl.socketFactory", sf);
- }
-
- // Check for Authentication
- Session session = null;
- if (mailAuthUser != null && mailAuthUser.length() > 0
- && mailAuthPass != null && mailAuthPass.length() > 0) {
- // use SMTP Authentication
- props.put("mail.smtp.auth", "true");
- session = Session.getInstance(props, new SmtpAuthenticator(mailAuthUser, mailAuthPass));
- } else {
- // not use SMTP Authentication
- session = Session.getInstance(props, null);
- }
-
- // Building MimeMessage
- MimeMessage msg = new MimeMessage(session);
- msg.setFrom(new InternetAddress(from));
- return msg;
+ return h.appendBody(msg, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.");
}
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/TestMD5.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/TestMD5.java?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/TestMD5.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/TestMD5.java Mon Feb 29 07:05:05 2016
@@ -18,14 +18,12 @@
*/
package org.apache.openmeetings.test.userdata;
-import junit.framework.TestCase;
-
import org.junit.Test;
-public class TestMD5 extends TestCase {
+public class TestMD5 {
@Test
- public void testTestMD5(){
+ public void testTestMD5() {
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml Mon Feb 29 07:05:05 2016
@@ -25,7 +25,6 @@
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-flash</artifactId>
- <!-- packaging>swf</packaging-->
<packaging>jar</packaging>
<name>Openmeetings Flash</name>
<description>TODO</description>
@@ -96,28 +95,6 @@
</excludes>
</configuration>
</plugin>
- <!-- plugin>
- <groupId>net.flexmojos.oss</groupId>
- <artifactId>flexmojos-maven-plugin</artifactId>
- <version>7.1.0-SNAPSHOT</version>
- <extensions>true</extensions>
- <configuration>
- <sourceFile>main.mxml</sourceFile>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>net.flexmojos.oss</groupId>
- <artifactId>flexmojos-threadlocaltoolkit-wrapper</artifactId>
- <version>7.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.flex</groupId>
- <artifactId>compiler</artifactId>
- <version>4.12.1.20140427</version>
- <type>pom</type>
- </dependency>
- </dependencies>
- </plugin-->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -173,18 +150,4 @@
</plugins>
</pluginManagement>
</build>
- <!-- dependencies>
- <dependency>
- <groupId>org.apache.flex</groupId>
- <artifactId>framework</artifactId>
- <version>4.12.1.20140427</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>11.9</version>
- <type>swc</type>
- </dependency>
- </dependencies-->
</project>
Modified: openmeetings/application/branches/3.1.x/openmeetings-util/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-util/pom.xml?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-util/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-util/pom.xml Mon Feb 29 07:05:05 2016
@@ -31,8 +31,7 @@
<description>TODO</description>
<properties>
<dom4j.version>1.6.1</dom4j.version>
- <mail.version>1.4.7</mail.version>
- <commons-codec.version>1.8</commons-codec.version>
+ <commons-codec.version>1.9</commons-codec.version>
<site.basedir>${project.parent.basedir}</site.basedir>
<skip.site.copy>false</skip.site.copy>
</properties>
@@ -63,11 +62,6 @@
<artifactId>ical4j</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${mail.version}</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml Mon Feb 29 07:05:05 2016
@@ -32,7 +32,7 @@
<properties>
<wicket-dashboard.version>0.13.0+wicket-7</wicket-dashboard.version>
<commons-io.version>2.4</commons-io.version>
- <commons-fileupload.version>1.3</commons-fileupload.version>
+ <commons-fileupload.version>1.3.1</commons-fileupload.version>
<mysql.version>5.1.38</mysql.version>
<old-backups.dir>${project.basedir}/test-data</old-backups.dir>
<site.basedir>${project.parent.basedir}</site.basedir>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java Mon Feb 29 07:05:05 2016
@@ -28,26 +28,22 @@ import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Map;
-import java.util.Properties;
import java.util.Vector;
import javax.activation.DataHandler;
import javax.mail.BodyPart;
import javax.mail.Message;
import javax.mail.Multipart;
-import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.core.mail.MailHandler;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.apache.openmeetings.util.mail.ByteArrayDataSource;
import org.apache.openmeetings.util.mail.IcalHandler;
-import org.apache.openmeetings.util.mail.SmtpAuthenticator;
-import org.apache.wicket.util.string.Strings;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -75,7 +71,7 @@ public class TestSendIcalMessage extends
private static final Logger log = Red5LoggerFactory.getLogger(TestSendIcalMessage.class, webAppRootKey);
@Autowired
- private ConfigurationDao configurationDao;
+ private MailHandler mailHandler;
private byte[] iCalMimeBody;
@@ -213,38 +209,9 @@ public class TestSendIcalMessage extends
private void sendIcalMessage() throws Exception {
log.debug("sendIcalMessage");
- // Evaluating Configuration Data
- String smtpServer = configurationDao.getConfValue("smtp_server", String.class, "");
- String smtpPort = configurationDao.getConfValue("smtp_port", String.class, "");
- String from = configurationDao.getConfValue("system_email_addr", String.class, "");
- String emailUsername = configurationDao.getConfValue("email_username", String.class, "");
- String emailUserpass = configurationDao.getConfValue("email_userpass", String.class, "");
-
- Properties props = System.getProperties();
-
- props.put("mail.smtp.host", smtpServer);
- props.put("mail.smtp.port", smtpPort);
-
- boolean isTls = (1 == configurationDao.getConfValue("mail.smtp.starttls.enable", Integer.class, "0"));
- if (isTls) {
- props.put("mail.smtp.starttls.enable", "true");
- }
-
- // Check for Authentification
- Session session = null;
- if (!Strings.isEmpty(emailUsername) && !Strings.isEmpty(emailUserpass)) {
- // use SMTP Authentication
- props.put("mail.smtp.auth", "true");
- session = Session.getDefaultInstance(props, new SmtpAuthenticator(emailUsername, emailUserpass));
- } else {
- // not use SMTP Authentication
- session = Session.getDefaultInstance(props, null);
- }
-
// Building MimeMessage
- MimeMessage mimeMessage = new MimeMessage(session);
+ MimeMessage mimeMessage = mailHandler.getBasicMimeMessage();
mimeMessage.setSubject(subject);
- mimeMessage.setFrom(new InternetAddress(from));
mimeMessage.addRecipients(Message.RecipientType.TO, InternetAddress.parse(recipients, false));
// -- Create a new message --
Modified: openmeetings/application/branches/3.1.x/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1732825&r1=1732824&r2=1732825&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/pom.xml Mon Feb 29 07:05:05 2016
@@ -39,20 +39,20 @@
<spring.version>4.1.7.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<maven.javadoc.version>2.10.3</maven.javadoc.version>
- <maven.surefire.version>2.18.1</maven.surefire.version>
+ <maven.surefire.version>2.19.1</maven.surefire.version>
<maven-site.version>3.4</maven-site.version>
<wicket.version>7.2.0</wicket.version>
<wicketju.version>7.2.0</wicketju.version>
<wickets.version>7.2.0</wickets.version>
<red5-server.version>1.0.6-RELEASE</red5-server.version>
<red5-client.version>1.0.6-RELEASE</red5-client.version>
- <batik.version>1.7</batik.version>
+ <batik.version>1.8</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>
<ical4j.version>2.0-beta1</ical4j.version>
- <cxf.version>3.1.4</cxf.version>
+ <cxf.version>3.1.5</cxf.version>
<selenium.version>2.52.0</selenium.version>
<simple-xml.version>2.7.1</simple-xml.version>
- <jettison.version>1.3.5</jettison.version>
+ <jettison.version>1.3.7</jettison.version>
<site.basedir>${project.basedir}</site.basedir>
<skip.site.copy>true</skip.site.copy>
<src.pack.skip>false</src.pack.skip>
@@ -325,10 +325,6 @@
</mailingLists>
<repositories>
<repository>
- <id>flex-mojos-repository</id>
- <url>https://oss.sonatype.org/content/groups/staging</url>
- </repository>
- <repository>
<releases>
<enabled>false</enabled>
</releases>
@@ -341,10 +337,6 @@
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>flex-mojos-plugin-repository</id>
- <url>https://oss.sonatype.org/content/groups/staging</url>
- </pluginRepository>
- <pluginRepository>
<id>apache-snapshots</id>
<url>https://repository.apache.org/content/groups/snapshots</url>
</pluginRepository>
@@ -976,7 +968,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8.1</version>
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
<showAvatarImages>true</showAvatarImages>