Index: lams_tool_chat/db/sql/updatescripts/updateTo20070227.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/db/sql/updatescripts/Attic/updateTo20070227.sql,v diff -u -r1.2 -r1.3 --- lams_tool_chat/db/sql/updatescripts/updateTo20070227.sql 7 Mar 2007 23:22:07 -0000 1.2 +++ lams_tool_chat/db/sql/updatescripts/updateTo20070227.sql 8 Mar 2007 07:25:09 -0000 1.3 @@ -1,4 +1,4 @@ -- Update the Notebook tables to 20070227 -- This is for the LAMS 2.0.1 release. -UPDATE lams_tool set modified_date_time = now(), classpath_addition = './lams-tool-lachat11.jar', context_file = '/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml' where tool_signature = 'lachat11'; +UPDATE lams_tool set modified_date_time = now(), classpath_addition = 'lams-tool-lachat11.jar', context_file = '/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml' where tool_signature = 'lachat11'; Index: win_installer/src/Functions.nsh =================================================================== RCS file: /usr/local/cvsroot/win_installer/src/Attic/Functions.nsh,v diff -u -r1.4 -r1.5 --- win_installer/src/Functions.nsh 8 Mar 2007 05:01:14 -0000 1.4 +++ win_installer/src/Functions.nsh 8 Mar 2007 07:25:10 -0000 1.5 @@ -421,3 +421,113 @@ Exch 2 Exch $0 ;output count found FunctionEnd + +;---------------------------------------------------------------------------- +; Superseded by : GetTime function. +;---------------------------------------------------------------------------- +; Title : Get Local Time +; Short Name : GetLocalTime +; Last Changed : 22/Feb/2005 +; Code Type : Function +; Code Sub-Type : One-way Output +;---------------------------------------------------------------------------- +; Required : System plugin. +; Description : Gets the current local time of the user's computer +;---------------------------------------------------------------------------- +; Function Call : Call GetLocalTime +; +; Pop "$Variable1" +; Day. +; +; Pop "$Variable2" +; Month. +; +; Pop "$Variable3" +; Year. +; +; Pop "$Variable4" +; Day of the week name. +; +; Pop "$Variable5" +; Hour. +; +; Pop "$Variable6" +; Minute. +; +; Pop "$Variable7" +; Second. +;---------------------------------------------------------------------------- +; Author : Diego Pedroso +; Author Reg. Name : deguix +;---------------------------------------------------------------------------- + +Function GetLocalTime + + # Prepare variables + Push $0 + Push $1 + Push $2 + Push $3 + Push $4 + Push $5 + Push $6 + + # Call GetLocalTime API from Kernel32.dll + System::Call '*(&i2, &i2, &i2, &i2, &i2, &i2, &i2, &i2) i .r0' + System::Call 'kernel32::GetLocalTime(i) i(r0)' + System::Call '*$0(&i2, &i2, &i2, &i2, &i2, &i2, &i2, &i2)i \ + (.r4, .r5, .r3, .r6, .r2, .r1, .r0,)' + + # Day of week: convert to name + StrCmp $3 0 0 +3 + StrCpy $3 Sunday + Goto WeekNameEnd + StrCmp $3 1 0 +3 + StrCpy $3 Monday + Goto WeekNameEnd + StrCmp $3 2 0 +3 + StrCpy $3 Tuesday + Goto WeekNameEnd + StrCmp $3 3 0 +3 + StrCpy $3 Wednesday + Goto WeekNameEnd + StrCmp $3 4 0 +3 + StrCpy $3 Thursday + Goto WeekNameEnd + StrCmp $3 5 0 +3 + StrCpy $3 Friday + Goto WeekNameEnd + StrCmp $3 6 0 +2 + StrCpy $3 Saturday + WeekNameEnd: + + # Minute: convert to 2 digits format + IntCmp $1 9 0 0 +2 + StrCpy $1 '0$1' + + # Second: convert to 2 digits format + IntCmp $0 9 0 0 +2 + StrCpy $0 '0$0' + + # Return to user + Exch $6 + Exch + Exch $5 + Exch + Exch 2 + Exch $4 + Exch 2 + Exch 3 + Exch $3 + Exch 3 + Exch 4 + Exch $2 + Exch 4 + Exch 5 + Exch $1 + Exch 5 + Exch 6 + Exch $0 + Exch 6 + +FunctionEnd Index: win_installer/src/updateLocales.sql =================================================================== RCS file: /usr/local/cvsroot/win_installer/src/Attic/updateLocales.sql,v diff -u -r1.6 -r1.7 Binary files differ Index: win_installer/src/updater.nsi =================================================================== RCS file: /usr/local/cvsroot/win_installer/src/Attic/updater.nsi,v diff -u -r1.4 -r1.5 Binary files differ Index: win_installer/templates/update-core-database.xml =================================================================== RCS file: /usr/local/cvsroot/win_installer/templates/Attic/update-core-database.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ win_installer/templates/update-core-database.xml 8 Mar 2007 07:25:10 -0000 1.1 @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file Index: win_installer/templates/update-deploy-tools.xml =================================================================== RCS file: /usr/local/cvsroot/win_installer/templates/Attic/update-deploy-tools.xml,v diff -u -r1.3 -r1.4 --- win_installer/templates/update-deploy-tools.xml 2 Mar 2007 00:35:19 -0000 1.3 +++ win_installer/templates/update-deploy-tools.xml 8 Mar 2007 07:25:10 -0000 1.4 @@ -63,13 +63,12 @@ Deploy packaqe for ${signature} created. - Updating web.xml and MANIFEST.MF for lams-central.war, lams-monitor.war and lams-learning.war. - - - + + + @@ -87,16 +86,69 @@ - - + + + + + + - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -112,20 +164,19 @@ - - - - - - - - + + Updating web.xml and MANIFEST.MF for lams-central.war, lams-monitor.war and lams-learning.war. using config from ${build.deploy}/deploy.xml + + + + + + + + + + + \ No newline at end of file Index: win_installer/templates/update_lams_configuration.sql =================================================================== RCS file: /usr/local/cvsroot/win_installer/templates/Attic/update_lams_configuration.sql,v diff -u -r1.6 -r1.7 --- win_installer/templates/update_lams_configuration.sql 2 Mar 2007 00:35:19 -0000 1.6 +++ win_installer/templates/update_lams_configuration.sql 8 Mar 2007 07:25:10 -0000 1.7 @@ -12,6 +12,10 @@ update lams_configuration set config_value='@WILDFIRE_PASS@' where config_key='XmppPassword'; update lams_user set login='@LAMS_USER@', password=sha1('@LAMS_PASS@') where user_id=1; update lams_user set locale_id=(select locale_id from lams_supported_locale where language_iso_code=(SELECT SUBSTRING_INDEX('@LOCALE@', '_', 1)) and country_iso_code=(SELECT SUBSTRING_INDEX('@LOCALE@', '_', -1))) where user_id=1; +update lams_user set locale_id=(select locale_id from lams_supported_locale where language_iso_code=(SELECT SUBSTRING_INDEX('@LOCALE@', '_', 1)) and country_iso_code=(SELECT SUBSTRING_INDEX('@LOCALE@', '_', -1))) where login='test1'; +update lams_user set locale_id=(select locale_id from lams_supported_locale where language_iso_code=(SELECT SUBSTRING_INDEX('@LOCALE@', '_', 1)) and country_iso_code=(SELECT SUBSTRING_INDEX('@LOCALE@', '_', -1))) where login='test2'; +update lams_user set locale_id=(select locale_id from lams_supported_locale where language_iso_code=(SELECT SUBSTRING_INDEX('@LOCALE@', '_', 1)) and country_iso_code=(SELECT SUBSTRING_INDEX('@LOCALE@', '_', -1))) where login='test3'; +update lams_user set locale_id=(select locale_id from lams_supported_locale where language_iso_code=(SELECT SUBSTRING_INDEX('@LOCALE@', '_', 1)) and country_iso_code=(SELECT SUBSTRING_INDEX('@LOCALE@', '_', -1))) where login='test4'; update lams_user set password=sha1('@LAMS_PASS@') where login='test1'; update lams_user set password=sha1('@LAMS_PASS@') where login='test2'; update lams_user set password=sha1('@LAMS_PASS@') where login='test3';