Index: lams_admin/web/config/editconfig.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/config/editconfig.jsp,v diff -u -r1.11 -r1.11.10.1 --- lams_admin/web/config/editconfig.jsp 14 Dec 2007 04:18:20 -0000 1.11 +++ lams_admin/web/config/editconfig.jsp 15 Oct 2010 17:04:11 -0000 1.11.10.1 @@ -2,6 +2,35 @@ <%@ page import="org.lamsfoundation.lams.config.ConfigurationItem" %> <%@ include file="/taglibs.jsp"%> + + + +

Index: lams_build/3rdParty.userlibraries =================================================================== RCS file: /usr/local/cvsroot/lams_build/3rdParty.userlibraries,v diff -u -r1.40.2.1.4.2 -r1.40.2.1.4.3 --- lams_build/3rdParty.userlibraries 14 Sep 2010 12:25:43 -0000 1.40.2.1.4.2 +++ lams_build/3rdParty.userlibraries 15 Oct 2010 17:03:52 -0000 1.40.2.1.4.3 @@ -1,6 +1,7 @@ + Index: lams_build/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/build.xml,v diff -u -r1.79.2.2.2.2 -r1.79.2.2.2.3 --- lams_build/build.xml 3 Sep 2010 20:14:41 -0000 1.79.2.2.2.2 +++ lams_build/build.xml 15 Oct 2010 17:03:52 -0000 1.79.2.2.2.3 @@ -108,6 +108,7 @@ + Index: lams_build/liblist.txt =================================================================== RCS file: /usr/local/cvsroot/lams_build/liblist.txt,v diff -u -r1.7.6.1.4.2 -r1.7.6.1.4.3 --- lams_build/liblist.txt 14 Sep 2010 12:25:43 -0000 1.7.6.1.4.2 +++ lams_build/liblist.txt 15 Oct 2010 17:03:52 -0000 1.7.6.1.4.3 @@ -2,6 +2,11 @@ Folder Library Version License Vendor Description +aspirin activation-1.1.1.jar + aspirin.jar 0.8.03 Apache 1.1 license embeddable send-only SMTP server + commons-pool-1.5.1.jar + dnsjava-2.0.6.jar + axis axis-ant.jar axis.jar jaxrpc.jar Index: lams_build/conf/j2ee/lams.application.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/conf/j2ee/lams.application.xml,v diff -u -r1.12.2.1.4.2 -r1.12.2.1.4.3 --- lams_build/conf/j2ee/lams.application.xml 14 Sep 2010 12:25:43 -0000 1.12.2.1.4.2 +++ lams_build/conf/j2ee/lams.application.xml 15 Oct 2010 17:03:52 -0000 1.12.2.1.4.3 @@ -83,6 +83,18 @@ + activation-1.1.1.jar + + + aspirin.jar + + + commons-pool-1.5.1.jar + + + dnsjava-2.0.6.jar + + tk-autopatch-1.2.0-b2-cvs.jar Index: lams_build/conf/j2ee/rams.application.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/conf/j2ee/Attic/rams.application.xml,v diff -u -r1.10.2.1 -r1.10.2.1.4.1 --- lams_build/conf/j2ee/rams.application.xml 16 Apr 2009 08:14:17 -0000 1.10.2.1 +++ lams_build/conf/j2ee/rams.application.xml 15 Oct 2010 17:03:52 -0000 1.10.2.1.4.1 @@ -82,6 +82,18 @@ + + activation-1.1.1.jar + + + aspirin.jar + + + commons-pool-1.5.1.jar + + + dnsjava-2.0.6.jar + tk-autopatch-1.2.0-b2-cvs.jar Index: lams_build/lib/aspirin/activation-1.1.1.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/aspirin/Attic/activation-1.1.1.jar,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Index: lams_build/lib/aspirin/aspirin.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/aspirin/aspirin.jar,v diff -u -r1.4.2.1 -r1.4.2.2 Binary files differ Index: lams_build/lib/aspirin/commons-pool-1.5.1.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/aspirin/commons-pool-1.5.1.jar,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Index: lams_build/lib/aspirin/dnsjava-2.0.6.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/aspirin/dnsjava-2.0.6.jar,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Index: lams_build/lib/aspirin/src/aspirin-src.zip =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/aspirin/src/Attic/aspirin-src.zip,v diff -u -r1.3.2.1 -r1.3.2.2 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/util/Emailer.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/util/Attic/Emailer.java,v diff -u -r1.3 -r1.3.8.1 --- lams_central/src/java/org/lamsfoundation/lams/util/Emailer.java 15 Jan 2009 02:59:13 -0000 1.3 +++ lams_central/src/java/org/lamsfoundation/lams/util/Emailer.java 15 Oct 2010 17:04:47 -0000 1.3.8.1 @@ -13,6 +13,7 @@ import javax.mail.internet.MimeMessage; import org.apache.log4j.Logger; +import org.masukomi.aspirin.core.MailQue; /** * A class that handles emails @@ -37,9 +38,14 @@ public static void sendFromSupportEmail(String subject, String to, String body) throws AddressException, MessagingException { String supportEmail = Configuration.get(ConfigurationKeys.LAMS_ADMIN_EMAIL); - String smtpServer = Configuration.get(ConfigurationKeys.SMTP_SERVER); + boolean useInternalSMTPServer = Boolean.parseBoolean(Configuration.get(ConfigurationKeys.USE_INTERNAL_SMTP_SERVER)); Properties properties = new Properties(); - properties.put("mail.smtp.host", smtpServer); + + if (! useInternalSMTPServer) { + String smtpServer = Configuration.get(ConfigurationKeys.SMTP_SERVER); + properties.put("mail.smtp.host", smtpServer); + } + send(subject, to, supportEmail, body, properties); } @@ -52,9 +58,10 @@ */ public static Session getMailSession(Properties properties) { Session session; + boolean useInternalSMTPServer = Boolean.parseBoolean(Configuration.get(ConfigurationKeys.USE_INTERNAL_SMTP_SERVER)); String smtpAuthUser = Configuration.get(ConfigurationKeys.SMTP_AUTH_USER); String smtpAuthPass = Configuration.get(ConfigurationKeys.SMTP_AUTH_PASSWORD); - if (smtpAuthUser != null && !smtpAuthUser.trim().equals("")) { + if (!useInternalSMTPServer && (smtpAuthUser != null) && !smtpAuthUser.trim().equals("")) { properties.setProperty("mail.smtp.submitter", smtpAuthUser); properties.setProperty("mail.smtp.auth", "true"); @@ -87,7 +94,15 @@ message.addRecipient(RecipientType.TO, new InternetAddress(to)); message.setSubject(subject); message.setText(body); - Transport.send(message); + + boolean useInternalSMTPServer = Boolean.parseBoolean(Configuration.get(ConfigurationKeys.USE_INTERNAL_SMTP_SERVER)); + if (useInternalSMTPServer) { + MailQue myMailQue = new MailQue(); + myMailQue.queMail(message); + } else { + Transport.send(message); + } + } } Index: lams_common/db/sql/insert_lams_unix_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_unix_config_data.sql,v diff -u -r1.43.2.4.2.3 -r1.43.2.4.2.4 --- lams_common/db/sql/insert_lams_unix_config_data.sql 25 May 2010 20:24:01 -0000 1.43.2.4.2.3 +++ lams_common/db/sql/insert_lams_unix_config_data.sql 15 Oct 2010 17:06:33 -0000 1.43.2.4.2.4 @@ -17,6 +17,9 @@ values ('EARDir','/usr/local/jboss-4.0.2/server/default/deploy/lams.ear/', 'config.ear.dir', 'config.header.system', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('InternalSMTPServer','true', 'config.use.internal.smtp.server', 'config.header.email', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('SMTPServer','', 'config.smtp.server', 'config.header.email', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) Index: lams_common/db/sql/insert_lams_windows_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_windows_config_data.sql,v diff -u -r1.35.4.4.2.3 -r1.35.4.4.2.4 --- lams_common/db/sql/insert_lams_windows_config_data.sql 25 May 2010 20:24:01 -0000 1.35.4.4.2.3 +++ lams_common/db/sql/insert_lams_windows_config_data.sql 15 Oct 2010 17:06:33 -0000 1.35.4.4.2.4 @@ -17,6 +17,9 @@ values ('EARDir','D:/jboss-4.0.2/server/default/deploy/lams.ear', 'config.ear.dir', 'config.header.system', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('InternalSMTPServer','true', 'config.use.internal.smtp.server', 'config.header.email', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('SMTPServer','', 'config.smtp.server', 'config.header.email', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) Index: lams_common/db/sql/insert_rams_unix_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_rams_unix_config_data.sql,v diff -u -r1.20.6.1 -r1.20.6.1.4.1 --- lams_common/db/sql/insert_rams_unix_config_data.sql 20 Apr 2009 00:31:27 -0000 1.20.6.1 +++ lams_common/db/sql/insert_rams_unix_config_data.sql 15 Oct 2010 17:06:33 -0000 1.20.6.1.4.1 @@ -17,6 +17,9 @@ values ('EARDir','/usr/local/jboss-4.0.2/server/default/deploy/rams.ear', 'config.ear.dir', 'config.header.system', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('InternalSMTPServer','true', 'config.use.internal.smtp.server', 'config.header.email', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('SMTPServer','', 'config.smtp.server', 'config.header.email', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) Index: lams_common/db/sql/insert_rams_windows_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_rams_windows_config_data.sql,v diff -u -r1.17.6.1 -r1.17.6.1.4.1 --- lams_common/db/sql/insert_rams_windows_config_data.sql 20 Apr 2009 00:31:28 -0000 1.17.6.1 +++ lams_common/db/sql/insert_rams_windows_config_data.sql 15 Oct 2010 17:06:33 -0000 1.17.6.1.4.1 @@ -17,6 +17,9 @@ values ('EARDir','C:/jboss-4.0.2/server/default/deploy/rams.ear', 'config.ear.dir', 'config.header.system', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('InternalSMTPServer','true', 'config.use.internal.smtp.server', 'config.header.email', 'BOOLEAN', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('SMTPServer','', 'config.smtp.server', 'config.header.email', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030500.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/Attic/patch02030500.sql,v diff -u -r1.1.2.4 -r1.1.2.5 --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030500.sql 1 Oct 2010 17:02:35 -0000 1.1.2.4 +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030500.sql 15 Oct 2010 17:06:33 -0000 1.1.2.5 @@ -115,5 +115,9 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('ShowAllMyLessonLink','true', 'config.show.all.my.lesson.link', 'config.header.features', 'BOOLEAN', 1); +-- LDEV-2509 Adding configuration setting for Embedded SMTP server +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('InternalSMTPServer','true', 'config.use.internal.smtp.server', 'config.header.email', 'BOOLEAN', 0); + COMMIT; SET AUTOCOMMIT = 1; \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v diff -u -r1.40.8.1 -r1.40.8.2 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 25 May 2010 20:24:01 -0000 1.40.8.1 +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 15 Oct 2010 17:06:33 -0000 1.40.8.2 @@ -48,6 +48,8 @@ public static String LAMS_EAR_DIR = "EARDir"; public static String SMTP_SERVER = "SMTPServer"; + + public static String USE_INTERNAL_SMTP_SERVER = "InternalSMTPServer"; public static String LAMS_ADMIN_EMAIL = "LamsSupportEmail";