Index: lams_admin/web/config/editconfig.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/config/editconfig.jsp,v diff -u -r1.12 -r1.13 --- lams_admin/web/config/editconfig.jsp 9 Nov 2009 05:47:21 -0000 1.12 +++ lams_admin/web/config/editconfig.jsp 5 Mar 2010 15:13:50 -0000 1.13 @@ -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.45 -r1.46 --- lams_build/3rdParty.userlibraries 18 Feb 2010 05:42:12 -0000 1.45 +++ lams_build/3rdParty.userlibraries 5 Mar 2010 15:14:59 -0000 1.46 @@ -1,6 +1,7 @@ + Index: lams_build/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/build.xml,v diff -u -r1.86 -r1.87 --- lams_build/build.xml 18 Feb 2010 05:42:12 -0000 1.86 +++ lams_build/build.xml 5 Mar 2010 15:14:59 -0000 1.87 @@ -113,6 +113,7 @@ + Index: lams_build/liblist.txt =================================================================== RCS file: /usr/local/cvsroot/lams_build/liblist.txt,v diff -u -r1.8 -r1.9 --- lams_build/liblist.txt 16 Apr 2009 07:57:32 -0000 1.8 +++ lams_build/liblist.txt 5 Mar 2010 15:14:59 -0000 1.9 @@ -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/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 Binary files differ Index: lams_build/lib/aspirin/aspirin.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/aspirin/aspirin.jar,v diff -u 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 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 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 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.4 --- 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 5 Mar 2010 15:16:41 -0000 1.4 @@ -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.50 -r1.51 --- lams_common/db/sql/insert_lams_unix_config_data.sql 6 Nov 2009 06:48:33 -0000 1.50 +++ lams_common/db/sql/insert_lams_unix_config_data.sql 5 Mar 2010 15:19:30 -0000 1.51 @@ -17,6 +17,9 @@ values ('EARDir','/usr/local/jboss-5/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.42 -r1.43 --- lams_common/db/sql/insert_lams_windows_config_data.sql 6 Nov 2009 06:48:33 -0000 1.42 +++ lams_common/db/sql/insert_lams_windows_config_data.sql 5 Mar 2010 15:19:30 -0000 1.43 @@ -17,6 +17,9 @@ values ('EARDir','D:/jboss-5/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.22 -r1.23 --- lams_common/db/sql/insert_rams_unix_config_data.sql 1 Jul 2009 02:47:09 -0000 1.22 +++ lams_common/db/sql/insert_rams_unix_config_data.sql 5 Mar 2010 15:19:30 -0000 1.23 @@ -17,6 +17,9 @@ values ('EARDir','/usr/local/jboss-5/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.19 -r1.20 --- lams_common/db/sql/insert_rams_windows_config_data.sql 1 Jul 2009 02:47:09 -0000 1.19 +++ lams_common/db/sql/insert_rams_windows_config_data.sql 5 Mar 2010 15:19:30 -0000 1.20 @@ -17,6 +17,9 @@ values ('EARDir','C:/jboss-5/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_types_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_types_data.sql,v diff -u -r1.93 -r1.94 --- lams_common/db/sql/insert_types_data.sql 18 Feb 2010 05:41:35 -0000 1.93 +++ lams_common/db/sql/insert_types_data.sql 5 Mar 2010 15:19:29 -0000 1.94 @@ -317,4 +317,4 @@ INSERT INTO lams_openid_config(config_key, config_value) values ("trustedIDPs", ""); -- initialise db version -INSERT INTO patches VALUES ('lams', 02040004, NOW(), 'F'); +INSERT INTO patches VALUES ('lams', 02040005, NOW(), 'F'); Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040005.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/Attic/patch02040005.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040005.sql 5 Mar 2010 15:19:30 -0000 1.1 @@ -0,0 +1,8 @@ +SET AUTOCOMMIT = 0; + +-- 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.41 -r1.42 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 6 Nov 2009 06:48:33 -0000 1.41 +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 5 Mar 2010 15:19:29 -0000 1.42 @@ -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";