Index: lams_common/db/sql/insert_lams_unix_config_data.sql =================================================================== diff -u -r3dbf966d900adefc34cdad501d3c392118451cd9 -rae00a23fc996e5c79ae31259693c56816d5f5ccb --- lams_common/db/sql/insert_lams_unix_config_data.sql (.../insert_lams_unix_config_data.sql) (revision 3dbf966d900adefc34cdad501d3c392118451cd9) +++ lams_common/db/sql/insert_lams_unix_config_data.sql (.../insert_lams_unix_config_data.sql) (revision ae00a23fc996e5c79ae31259693c56816d5f5ccb) @@ -5,7 +5,7 @@ values ('ServerURLContextPath','lams/', 'config.server.url.context.path', 'config.header.system', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('Version','2.4', 'config.version', 'config.header.system', 'STRING', 1); +values ('Version','3.0', 'config.version', 'config.header.system', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('TempDir','@temp.directory@', 'config.temp.dir', 'config.header.system', 'STRING', 1); @@ -53,16 +53,16 @@ values ('AuthoringActivitiesColour', 'true', 'config.authoring.activities.colour', 'config.header.look.feel', 'BOOLEAN', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('AuthoringClientVersion','2.4.0.@datetimestamp@', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1); +values ('AuthoringClientVersion','3.0.0.@datetimestamp@', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('MonitorClientVersion','2.4.0.@datetimestamp@', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1); +values ('MonitorClientVersion','3.0.0.@datetimestamp@', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('LearnerClientVersion','2.4.0.@datetimestamp@', 'config.learner.client.version', 'config.header.versions', 'STRING', 1); +values ('LearnerClientVersion','3.0.0.@datetimestamp@', 'config.learner.client.version', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('ServerVersionNumber','2.4.0.@datetimestamp@', 'config.server.version.number', 'config.header.versions', 'STRING', 1); +values ('ServerVersionNumber','3.0.0.@datetimestamp@', 'config.server.version.number', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('ServerLanguage','en_AU', 'config.server.language', 'config.header.look.feel', 'STRING', 1); @@ -71,7 +71,7 @@ values ('ServerPageDirection','LTR', 'config.server.page.direction', 'config.header.look.feel', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('DictionaryDateCreated','2009-08-28', 'config.dictionary.date.created', 'config.header.versions', 'STRING', 1); +values ('DictionaryDateCreated','2017-01-01', 'config.dictionary.date.created', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/', 'config.help.url', 'config.header.system', 'STRING', 1); @@ -279,3 +279,4 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('KalturaKDPUiConfId','6308762', 'config.kaltura.kdp.uiconfid', 'config.header.kaltura', 'STRING', 0); +update lams_configuration set config_value = 'false' where config_key = 'LDAPEncryptPasswordFromBrowser'; Index: lams_common/db/sql/insert_lams_windows_config_data.sql =================================================================== diff -u -r3dbf966d900adefc34cdad501d3c392118451cd9 -rae00a23fc996e5c79ae31259693c56816d5f5ccb --- lams_common/db/sql/insert_lams_windows_config_data.sql (.../insert_lams_windows_config_data.sql) (revision 3dbf966d900adefc34cdad501d3c392118451cd9) +++ lams_common/db/sql/insert_lams_windows_config_data.sql (.../insert_lams_windows_config_data.sql) (revision ae00a23fc996e5c79ae31259693c56816d5f5ccb) @@ -5,7 +5,7 @@ values ('ServerURLContextPath','lams/', 'config.server.url.context.path', 'config.header.system', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('Version','2.4', 'config.version', 'config.header.system', 'STRING', 1); +values ('Version','3.0', 'config.version', 'config.header.system', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('TempDir','@temp.directory@', 'config.temp.dir', 'config.header.system', 'STRING', 1); @@ -50,16 +50,16 @@ values ('AuthoringActivitiesColour', 'true', 'config.authoring.activities.colour', 'config.header.look.feel', 'BOOLEAN', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('AuthoringClientVersion','2.4.0.@datetimestamp@', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1); +values ('AuthoringClientVersion','3.0.0.@datetimestamp@', 'config.authoring.client.version', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('MonitorClientVersion','2.4.0.@datetimestamp@', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1); +values ('MonitorClientVersion','3.0.0.@datetimestamp@', 'config.monitor.client.version', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('LearnerClientVersion','2.4.0.@datetimestamp@', 'config.learner.client.version', 'config.header.versions', 'STRING', 1); +values ('LearnerClientVersion','3.0.0.@datetimestamp@', 'config.learner.client.version', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('ServerVersionNumber','2.4.0.@datetimestamp@', 'config.server.version.number', 'config.header.versions', 'STRING', 1); +values ('ServerVersionNumber','3.0.0.@datetimestamp@', 'config.server.version.number', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('ServerLanguage','en_AU', 'config.server.language', 'config.header.look.feel', 'STRING', 1); @@ -68,7 +68,7 @@ values ('ServerPageDirection','LTR', 'config.server.page.direction', 'config.header.look.feel', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('DictionaryDateCreated','2009-08-28', 'config.dictionary.date.created', 'config.header.versions', 'STRING', 1); +values ('DictionaryDateCreated','2017-01-01', 'config.dictionary.date.created', 'config.header.versions', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/', 'config.help.url', 'config.header.system', 'STRING', 1); Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040084.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040084.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040084.sql (revision ae00a23fc996e5c79ae31259693c56816d5f5ccb) @@ -0,0 +1,17 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4180 Update configuration to 3.0 release + +update lams_configuration set config_value='3.0' where config_key='Version'; +update lams_configuration set config_value='3.0.201701010000' where config_key='LearnerClientVersion' OR config_key='ServerVersionNumber' OR config_key='MonitorClientVersion' OR config_key='AuthoringClientVersion'; +update lams_configuration set config_value='2017-01-01' where config_key='DictionaryDateCreated'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1;