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.34 -r1.35 --- lams_common/db/sql/insert_lams_unix_config_data.sql 1 Dec 2008 03:26:35 -0000 1.34 +++ lams_common/db/sql/insert_lams_unix_config_data.sql 16 Jan 2009 04:30:25 -0000 1.35 @@ -14,7 +14,7 @@ values ('DumpDir','/var/opt/lams/dump', 'config.dump.dir', 'config.header.system', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('EARDir','/usr/local/jboss-4.0.2/server/default/deploy/lams.ear', 'config.ear.dir', 'config.header.system', 'STRING', 1); +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 ('SMTPServer','', 'config.smtp.server', 'config.header.email', 'STRING', 0); @@ -240,3 +240,9 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('SMTPUser','', 'config.smtp.user', 'config.header.email', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('SMTPPassword','', 'config.smtp.password', 'config.header.email', 'STRING', 1); 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.29 -r1.30 --- lams_common/db/sql/insert_lams_windows_config_data.sql 1 Dec 2008 03:26:35 -0000 1.29 +++ lams_common/db/sql/insert_lams_windows_config_data.sql 16 Jan 2009 04:30:25 -0000 1.30 @@ -240,3 +240,9 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('SMTPUser','', 'config.smtp.user', 'config.header.email', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('SMTPPassword','', 'config.smtp.password', 'config.header.email', 'STRING', 1); Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql,v diff -u -r1.2 -r1.3 --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql 13 Jan 2009 07:00:31 -0000 1.2 +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql 16 Jan 2009 04:31:32 -0000 1.3 @@ -14,6 +14,14 @@ ALTER TABLE lams_learning_design ADD COLUMN first_activity_id BIGINT(20); CREATE INDEX idx_design_floating_act ON lams_learning_design (floating_activity_id ASC); +-- LDEV-1983 -------------- +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('SMTPUser','', 'config.smtp.user', 'config.header.email', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('SMTPPassword','', 'config.smtp.password', 'config.header.email', 'STRING', 1); + + ----------------------Put all sql statements above here------------------------- -- If there were no errors, commit and restore autocommit to on