Index: win_installer/license.txt =================================================================== diff -u -rff6af966b0faa1e10b2b254849219dd0d610a1c8 -r264a81e13f9851c2f44ecfdbbf6fbb35a10a02ce --- win_installer/license.txt (.../license.txt) (revision ff6af966b0faa1e10b2b254849219dd0d610a1c8) +++ win_installer/license.txt (.../license.txt) (revision 264a81e13f9851c2f44ecfdbbf6fbb35a10a02ce) @@ -1,4 +1,4 @@ -LAMS 2.0 is released under the GPL license detailed below. This package +LAMS 2.0.1 is released under the GPL license detailed below. This package also includes other libraries/packages, whose respective licenses are detailed below. Index: win_installer/readme.txt =================================================================== diff -u -r4045fa1fce23e3892b0f78780920997006ad4465 -r264a81e13f9851c2f44ecfdbbf6fbb35a10a02ce --- win_installer/readme.txt (.../readme.txt) (revision 4045fa1fce23e3892b0f78780920997006ad4465) +++ win_installer/readme.txt (.../readme.txt) (revision 264a81e13f9851c2f44ecfdbbf6fbb35a10a02ce) @@ -1,7 +1,7 @@ -LAMS 2.0 - Learning Activity Management System +LAMS 2.0.1.1 - Learning Activity Management System ---------------------------------------------- -This is a pre-packaged copy of LAMS 2.0 for Windows 2000, XP, or 2003. +This is a pre-packaged copy of LAMS 2.0.1 for Windows 2000, XP, or 2003. For the source code, please see the 'Building LAMS' wiki at http://wiki.lamsfoundation.org/display/lams/Building+LAMS @@ -11,14 +11,15 @@ 1. Startup and Shutdown ======================= -To use LAMS 2.0, first make sure it is started - use the 'Start LAMS' shortcut +To use LAMS 2.0.1, first make sure it is started - use the 'Start LAMS' shortcut in the LAMSv2 Start Menu folder if you're not sure. MySQL must be running. For chat rooms to function, Wildfire must also be running. -While LAMS 2.0 is running, you may access the login page using the 'Access +While LAMS 2.0.1 is running, you may access the login page using the 'Access LAMS' short cut in the LAMSv2 Start Menu folder. -To stop LAMS 2.0, use the 'Stop LAMS' shortcut in the LAMSv2 Start Menu folder. +To stop LAMS 2.0.1, use the 'Stop LAMS' shortcut in the LAMSv2 Start Menu +folder. 2. Server Configuration ======================= @@ -27,7 +28,7 @@ For server deployments, you will probably want to configure the default JVM memory settings for your server. In C:\lams\jboss-4.0.2\bin\run.bat (or -wherever you installed LAMS 2.0), find the line near the bottom that says +wherever you installed LAMS 2.0.1), find the line near the bottom that says set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx512m @@ -48,19 +49,19 @@ http://wiki.lamsfoundation.org/display/lamsdocs/Windows+Installer+Help -LAMS 2.0 developer-oriented information +LAMS 2.0.1 developer-oriented information http://wiki.lamsfoundation.org/display/lams -LAMS 2.0 help documents +LAMS 2.0.1 help documents http://wiki.lamsfoundation.org/display/lamsdocs Educational and technical forums for help and discussion http://www.lamscommunity.org -LAMS 2.0 bug tracker +LAMS 2.0.1 bug tracker https://bugs.lamsfoundation.org Index: win_installer/src/language-pack.nsi =================================================================== diff -u -r3e0afea3eb6fc82e9bb97b1374c29caa67439d87 -r264a81e13f9851c2f44ecfdbbf6fbb35a10a02ce --- win_installer/src/language-pack.nsi (.../language-pack.nsi) (revision 3e0afea3eb6fc82e9bb97b1374c29caa67439d87) +++ win_installer/src/language-pack.nsi (.../language-pack.nsi) (revision 264a81e13f9851c2f44ecfdbbf6fbb35a10a02ce) @@ -30,7 +30,7 @@ # constants -!define VERSION "2007-02-09" ; DATE of language pack in fromat YYYYMMDD +!define VERSION "2007-02-10" ; DATE of language pack in fromat YYYYMMDD !define SOURCE_JBOSS_HOME "D:\jboss-4.0.2" ; location of jboss where lams is deployed !define REG_HEAD "Software\LAMS Foundation\LAMSv2" @@ -120,7 +120,7 @@ SectionIn RO - + Detailprint "${__TIMESTAMP__}" Detailprint 'Writing Language pack version ${VERSION} to registry: "${REG_HEAD}"' setoutpath "$INSTDIR\zip" @@ -212,7 +212,6 @@ delete "$INSTDIR\updateLocales.sql" delete "$INSTDIR\LanguagePack.xml" delete "$INSTDIR\installer.properties" - rmdir /r $TEMP rmdir /r "$INSTDIR\apache-ant-1.6.5" rmdir /r $TEMP\installer.properties" FunctionEnd Index: win_installer/src/updater.nsi =================================================================== diff -u -r3e0afea3eb6fc82e9bb97b1374c29caa67439d87 -r264a81e13f9851c2f44ecfdbbf6fbb35a10a02ce --- win_installer/src/updater.nsi (.../updater.nsi) (revision 3e0afea3eb6fc82e9bb97b1374c29caa67439d87) +++ win_installer/src/updater.nsi (.../updater.nsi) (revision 264a81e13f9851c2f44ecfdbbf6fbb35a10a02ce) @@ -153,6 +153,7 @@ Var IS_UPDATE Var INCLUDE_JSMATH Var TOOL_SIG +Var TIMESTAMP #LANGUAGE PACK VARIABLES ##### @@ -173,6 +174,9 @@ Section !lamsCore ${if} $IS_UPDATE == "1" Detailprint "Installing LAMS ${VERSION} core" + # extract support files to write configuration + SetOutPath $INSTDIR + File /r "..\apache-ant-1.6.5" ; Backing up existing lams installation call backupLams @@ -186,8 +190,6 @@ ; Updating lams-www.war call updateLamswww - ; Updating application.xml - call updateApplicationXML ; Updating the database to support version call updateCoreDatabase @@ -225,6 +227,18 @@ WriteRegStr HKLM "${REG_HEAD}" "language_pack" $VERSION_INT DetailPrint "LAMS Language Pack ${LANGUAGE_PACK_VERSION} install successfull" + + + Call WriteRegEntries + + SetOutPath $INSTDIR + File /a "..\build\lams-start.exe" + File /a "..\build\lams-stop.exe" + File /a "..\license.txt" + File /a "..\license-wrapper.txt" + File /a "..\readme.txt" + Call SetupStartMenu + WriteUninstaller "$INSTDIR\lams-uninstall.exe" ${endif} ################################################ ${endif} @@ -238,11 +252,11 @@ ${if} $IS_UPDATE == "0" DetailPrint "Setting up JBoss 4.0.2" SetOutPath $INSTDIR - File /a /r /x all /x minimal /x robyn /x log /x tmp /x work /x jsMath.war ${SOURCE_JBOSS_HOME} + File /a /r /x all /x minimal /x robyn /x log /x tmp /x work /x jsMath.war /x *.bak ${SOURCE_JBOSS_HOME} ; Configuring jboss.jar -; Copy jboss-cache.jar, jgroups.jar from server/all/lib to server/default/lib -copyfiles "$INSTDIR\jboss-4.0.2\server\all\lib\jboss-cache.jar" "$INSTDIR\jboss-4.0.2\server\default\lib" -copyfiles "$INSTDIR\jboss-4.0.2\server\all\lib\jgroups.jar" "$INSTDIR\jboss-4.0.2\server\default\lib" + ; Copy jboss-cache.jar, jgroups.jar from server/all/lib to server/default/lib + copyfiles "$INSTDIR\jboss-4.0.2\server\all\lib\jboss-cache.jar" "$INSTDIR\jboss-4.0.2\server\default\lib" + copyfiles "$INSTDIR\jboss-4.0.2\server\all\lib\jgroups.jar" "$INSTDIR\jboss-4.0.2\server\default\lib" ${endif} SectionEnd @@ -461,7 +475,7 @@ !insertmacro MUI_INSTALLOPTIONS_WRITE "lams_components.ini" "Field 1" "Text" "- JBoss 4.0.2" !insertmacro MUI_INSTALLOPTIONS_WRITE "lams_components.ini" "Field 2" "Text" "- LAMS ${VERSION} Core" !insertmacro MUI_INSTALLOPTIONS_WRITE "lams_components.ini" "Field 3" "Text" "- Install LAMS as a service" - !insertmacro MUI_HEADER_TEXT "LAMS 2.0.1 Components" "No installation of LAMS 2.0 was found on your computer. A full 2.0.1 installation required to run LAMS" + !insertmacro MUI_HEADER_TEXT "LAMS 2.0.1 Components" "Lams 2.0 is installed. You may update to 2.0.1" !insertmacro MUI_INSTALLOPTIONS_DISPLAY "lams_components.ini" ${else} !insertmacro MUI_INSTALLOPTIONS_WRITE "lams_components.ini" "Field 4" "Text" "LAMS ${VERSION} Update" @@ -718,6 +732,20 @@ Function PostFinal ; Checking to see if lams2.0 exists call checkRegistry + + # ${StrTok} "ResultVar" "String" "Separators" "ResultPart" "SkipEmptyParts" + ${StrTok} $0 ${__DATE__} "/" 2 1 + ${StrTok} $1 ${__DATE__} "/" 1 1 + ${StrTok} $2 ${__DATE__} "/" 0 1 + + ${StrTok} $3 "${__TIME__}" ":" 0 1 + ${StrTok} $4 "${__TIME__}" ":" 1 1 + + strcpy $TIMESTAMP "$0$1$2-$3$4" + MessageBox MB_OKCANCEL|MB_ICONQUESTION "Your installation of LAMS will be backed up at $INSTDIR-$TIMESTAMP.bak" IDOK continue IDCANCEL cancel + cancel: + Abort + continue: FunctionEnd ################################################################################ @@ -734,6 +762,11 @@ ; Backs up existing lams installation Function backupLams #copyfiles /r $INSTDIR "$INSTDIR + + + DetailPrint "Backing up lams installation at: $INSTDIR-$TIMESTAMP.bak. This may take several minutes" + copyfiles /SILENT $INSTDIR $INSTDIR-$TIMESTAMP.bak 95000 + FunctionEnd @@ -742,8 +775,7 @@ Function updateCoreJarsWars SetoutPath "$INSTDIR\jboss-4.0.2\server\default\deploy\lams.ear" File "..\assembly\lams.ear\*.*" - - createdirectory "$INSTDIR\update-logs" + createdirectory "$INSTDIR\update-logs" FunctionEnd ; Updating lams-central.war @@ -761,17 +793,11 @@ File "..\templates\news.html" FunctionEnd -; Updating application.xml -Function updateApplicationXML -FunctionEnd + ; Updating the database to support version Function updateCoreDatabase - # extract support files to write configuration - SetOutPath $INSTDIR - File /r "..\apache-ant-1.6.5" - StrCpy $0 '"$MYSQL_DIR\bin\mysql" -v $DB_NAME -e "update lams_configuration set config_value=$\'${SERVER_VERSION_NUMBER}$\' where config_key=$\'LearnerClientVersion$\' OR config_key=$\'ServerVersionNumber$\' OR config_key=$\'MonitorClientVersion$\' OR config_key=$\'AuthoringClientVersion$\'" -u$DB_USER -p$DB_PASS' DetailPrint $0 nsExec::ExecToStack $0 @@ -819,6 +845,34 @@ done: FunctionEnd + +; Updating application.xml +Function updateApplicationXML + iffileexists "$INSTDIR\jboss-4.0.2\server\default\deploy\lams.ear\ehcache-1.1.jar" fileExists continue + fileExists: + delete "$INSTDIR\jboss-4.0.2\server\default\deploy\lams.ear\ehcache-1.1.jar" + continue: + + + # Running the ant scripts to update web.xmls and manifests + strcpy $0 '"$INSTDIR\apache-ant-1.6.5\bin\ant.bat" -logfile "$INSTDIR\update-logs\ant-update-application-xml.log" -buildfile "$TEMP\lams\update-deploy-tools.xml" -D"prop.path=$TOOL_SIG" update-application-xml' + DetailPrint $0 + nsExec::ExecToStack $0 + Pop $0 ; return code, 0=success, error=fail + Pop $1 ; console output + ${if} $0 == "error" + ${orif} $0 == 1 + goto error + ${endif} + DetailPrint "Result: $1" + + goto done + error: + DetailPrint "Application.xml update failed" + MessageBox MB_OK|MB_ICONSTOP "Application.xml update failed $\r$\nError:$\r$\n$\r$\n$1" + Abort "Application.xml update failed" + done: +FunctionEnd ; Updating the deploy.xml of the tools to support this version using the tool deployer, called by create-deploy-package ant task ; Then deploys the tools using the tool deployer. Called by ant task deploy-tool @@ -841,6 +895,23 @@ SetOutPath "$TEMP\lams" File "..\templates\update-deploy-tools.xml" + ; Updating application.xml + call updateApplicationXML + + + /*# Exploding the lams-learning.war and lams-monitoring.war + strcpy $0 '$INSTDIR\apache-ant-1.6.5\bin\ant.bat -logfile $INSTDIR\update-logs\ant-explode-wars.log -buildfile $TEMP\lams\update-deploy-tools.xml -Dprop.path=$TEMP\lams\$TOOL_SIG explode-wars' + DetailPrint $0 + nsExec::ExecToStack $0 + Pop $0 ; return code, 0=success, error=fail + Pop $1 ; console output + ${if} $0 == "error" + ${orif} $0 == 1 + goto error + ${endif} + DetailPrint "Result: $1" + */ + # Creating all the tools, then deploying them strcpy $TOOL_SIG "lachat11" call runCreateDeployPackage @@ -886,7 +957,13 @@ call runCreateDeployPackage call deployTool - rmdir /r "$INSTDIR\apache-ant-1.6.5" + goto done + error: + DetailPrint "Problem compressing/expanding lams-monitoring.war and lams-learning.war" + MessageBox MB_OK|MB_ICONSTOP "Problem compressing/expanding lams-monitoring.war and lams-learning.war $\r$\nError:$\r$\n$\r$\n$1" + Abort "Problem compressing/expanding lams-monitoring.war and lams-learning.war" + done: + FunctionEnd # Running the ant scripts to create deploy.xml for the normal tools @@ -912,6 +989,7 @@ done: FunctionEnd + # generates a properties file for all tools Function generateToolProperties @@ -1004,91 +1082,91 @@ File "..\..\lams_tool_chat\build\lib\*.jar" File "..\..\lams_tool_chat\build\lib\*.war" SetoutPath "$TEMP\lams\lachat11\build\deploy\sql" - File "..\..\lams_tool_chat\build\deploy\sql\*.sql" + File /r "..\..\lams_tool_chat\build\deploy\sql\*" SetoutPath "$TEMP\lams\lachat11\build\deploy\language" File "..\..\lams_tool_chat\build\deploy\language\*.properties" SetoutPath "$TEMP\lams\lafrum11\build\deploy\" File "..\..\lams_tool_forum\build\lib\*.jar" File "..\..\lams_tool_forum\build\lib\*.war" SetoutPath "$TEMP\lams\lafrum11\build\deploy\sql" - File "..\..\lams_tool_forum\build\deploy\sql\*.sql" + File /r "..\..\lams_tool_forum\build\deploy\sql\*" SetoutPath "$TEMP\lams\lafrum11\build\deploy\language" File "..\..\lams_tool_forum\build\deploy\language\*.properties" SetoutPath "$TEMP\lams\lamc11\build\deploy\" File "..\..\lams_tool_lamc\build\lib\*.jar" File "..\..\lams_tool_lamc\build\lib\*.war" SetoutPath "$TEMP\lams\lamc11\build\deploy\sql" - File "..\..\lams_tool_lamc\build\deploy\sql\*.sql" + File /r "..\..\lams_tool_lamc\build\deploy\sql\*" SetoutPath "$TEMP\lams\lamc11\build\deploy\language" File "..\..\lams_tool_lamc\build\deploy\language\*.properties" SetoutPath "$TEMP\lams\laqa11\build\deploy\" File "..\..\lams_tool_laqa\build\lib\*.jar" File "..\..\lams_tool_laqa\build\lib\*.war" SetoutPath "$TEMP\lams\laqa11\build\deploy\sql" - File "..\..\lams_tool_laqa\build\deploy\sql\*.sql" + File /r "..\..\lams_tool_laqa\build\deploy\sql\*" SetoutPath "$TEMP\lams\laqa11\build\deploy\language" File "..\..\lams_tool_laqa\build\deploy\language\*.properties" SetoutPath "$TEMP\lams\larsrc11\build\deploy\" File "..\..\lams_tool_larsrc\build\lib\*.jar" File "..\..\lams_tool_larsrc\build\lib\*.war" SetoutPath "$TEMP\lams\larsrc11\build\deploy\sql" - File "..\..\lams_tool_larsrc\build\deploy\sql\*.sql" + File /r "..\..\lams_tool_larsrc\build\deploy\sql\*" SetoutPath "$TEMP\lams\larsrc11\build\deploy\language" File "..\..\lams_tool_larsrc\build\deploy\language\*.properties" SetoutPath "$TEMP\lams\lanb11\build\deploy\" File "..\..\lams_tool_nb\build\lib\*.jar" File "..\..\lams_tool_nb\build\lib\*.war" SetoutPath "$TEMP\lams\lanb11\build\deploy\sql" - File "..\..\lams_tool_nb\build\deploy\sql\*.sql" + File /r "..\..\lams_tool_nb\build\deploy\sql\*" SetoutPath "$TEMP\lams\lanb11\build\deploy\language" File "..\..\lams_tool_nb\build\deploy\language\*.properties" SetoutPath "$TEMP\lams\lantbk11\build\deploy\" File "..\..\lams_tool_notebook\build\lib\*.jar" File "..\..\lams_tool_notebook\build\lib\*.war" SetoutPath "$TEMP\lams\lantbk11\build\deploy\sql" - File "..\..\lams_tool_notebook\build\deploy\sql\*.sql" + File /r "..\..\lams_tool_notebook\build\deploy\sql\*" SetoutPath "$TEMP\lams\lantbk11\build\deploy\language" File "..\..\lams_tool_notebook\build\deploy\language\*.properties" SetoutPath "$TEMP\lams\lasbmt11\build\deploy\" File "..\..\lams_tool_sbmt\build\lib\*.jar" File "..\..\lams_tool_sbmt\build\lib\*.war" SetoutPath "$TEMP\lams\lasbmt11\build\deploy\sql" - File "..\..\lams_tool_sbmt\build\deploy\sql\*.sql" + File /r "..\..\lams_tool_sbmt\build\deploy\sql\*" SetoutPath "$TEMP\lams\lasbmt11\build\deploy\language" File "..\..\lams_tool_sbmt\build\deploy\language\*.properties" SetoutPath "$TEMP\lams\lascrb11\build\deploy\" File "..\..\lams_tool_scribe\build\lib\*.jar" File "..\..\lams_tool_scribe\build\lib\*.war" SetoutPath "$TEMP\lams\lascrb11\build\deploy\sql" - File "..\..\lams_tool_scribe\build\deploy\sql\*.sql" + File /r "..\..\lams_tool_scribe\build\deploy\sql\*" SetoutPath "$TEMP\lams\lascrb11\build\deploy\language" File "..\..\lams_tool_scribe\build\deploy\language\*.properties" SetoutPath "$TEMP\lams\lasurv11\build\deploy\" File "..\..\lams_tool_survey\build\lib\*.jar" File "..\..\lams_tool_survey\build\lib\*.war" SetoutPath "$TEMP\lams\lasurv11\build\deploy\sql" - File "..\..\lams_tool_survey\build\deploy\sql\*.sql" + File /r "..\..\lams_tool_survey\build\deploy\sql\*" SetoutPath "$TEMP\lams\lasurv11\build\deploy\language" File "..\..\lams_tool_survey\build\deploy\language\*.properties" SetoutPath "$TEMP\lams\lavote11\build\deploy\" File "..\..\lams_tool_vote\build\lib\*.jar" File "..\..\lams_tool_vote\build\lib\*.war" SetoutPath "$TEMP\lams\lavote11\build\deploy\sql" - File "..\..\lams_tool_vote\build\deploy\sql\*.sql" + File /r "..\..\lams_tool_vote\build\deploy\sql\*" SetoutPath "$TEMP\lams\lavote11\build\deploy\language" File "..\..\lams_tool_vote\build\deploy\language\*.properties" - + FunctionEnd # Deploying the updated tools @@ -1118,6 +1196,9 @@ ################################################################################ + + + ################################################################################ # CODE USED FOR INSTALLER # ################################################################################ @@ -1257,7 +1338,7 @@ FunctionEnd Function readRegistry - ;ReadRegStr $INSTDIR HKLM "${REG_HEAD}" "dir_inst" + ReadRegStr $INSTDIR HKLM "${REG_HEAD}" "dir_inst" ReadRegStr $DB_NAME HKLM "${REG_HEAD}" "db_name" ReadRegStr $DB_PASS HKLM "${REG_HEAD}" "db_pass" ReadRegStr $DB_USER HKLM "${REG_HEAD}" "db_user" @@ -1441,6 +1522,7 @@ WriteRegStr HKLM "${REG_HEAD}" "lams_domain" $LAMS_DOMAIN WriteRegStr HKLM "${REG_HEAD}" "lams_port" $LAMS_PORT WriteRegStr HKLM "${REG_HEAD}" "lams_locale" $LAMS_LOCALE + WriteRegStr HKLM "${REG_HEAD}" "language_pack" ${LANGUAGE_PACK_VERSION} WriteRegStr HKLM "${REG_HEAD}" "wildfire_domain" $WILDFIRE_DOMAIN WriteRegStr HKLM "${REG_HEAD}" "wildfire_user" $WILDFIRE_USER WriteRegStr HKLM "${REG_HEAD}" "wildfire_pass" $WILDFIRE_PASS @@ -1538,6 +1620,16 @@ DeleteRegKey HKLM "${REG_HEAD}" ${else} ; Do cleanup for failed update + rmdir /r "$INSTDIR\apache-ant-1.6.5" + RMDir /r "$INSTDIR\zip" + RMDir /r "$EXEDIR\zip" + RMDir /r "$EXEDIR\build" + rmdir /r "$TEMP\installer.properties" + rmdir /r "$TEMP\lams" + WriteRegStr HKLM "${REG_HEAD}" "language_pack" $OLD_VERSION + delete "$INSTDIR\updateLocales.sql" + delete "$INSTDIR\LanguagePack.xml" + ${endif} FunctionEnd @@ -1554,6 +1646,12 @@ ${else} ;cleanup for update successfull install #rmdir /r "$TEMP\lams\" + rmdir /r "$INSTDIR\apache-ant-1.6.5" + RMDir /r "$INSTDIR\zip" + RMDir /r "$EXEDIR\zip" + RMDir /r "$EXEDIR\build" + rmdir /r "$TEMP\installer.properties" + rmdir /r "$TEMP\lams" ${endif} FunctionEnd @@ -1651,32 +1749,32 @@ ;copying COMMON project language files setoutpath "$INSTDIR" detailprint "Extracting language files for lams_common" - file /a "..\..\lams_common\conf\language\*" + file /a "..\..\lams_common\conf\language\lams\*" ;copying ADMIN project language files setoutpath "$INSTDIR\admin" detailprint "Extracting language files for lams_admin" - file /a "..\..\lams_admin\conf\language\*" + file /a "..\..\lams_admin\conf\language\lams\*" ;copying CENTRAL project language files setoutpath "$INSTDIR\central" detailprint "Extracting language files for lams_central" - file /a "..\..\lams_central\conf\language\*" + file /a "..\..\lams_central\conf\language\lams\*" ;copying CONTENTREPOSITORY project language files setoutpath "$INSTDIR\contentrepository" detailprint "Extracting language files for lams_contentrepository" - file /a "..\..\lams_contentrepository\conf\language\*" + file /a "..\..\lams_contentrepository\conf\language\lams\*" ;copying LEARNING project language files setoutpath "$INSTDIR\learning" detailprint "Extracting language files for lams_learning" - file /a "..\..\lams_learning\conf\language\*" + file /a "..\..\lams_learning\conf\language\lams\*" ;copying MONITORING project language files setoutpath "$INSTDIR\monitoring" detailprint "Extracting language files for lams_monitoring" - file /a "..\..\lams_monitoring\conf\language\*" + file /a "..\..\lams_monitoring\conf\language\lams\*" FunctionEnd @@ -1722,7 +1820,7 @@ setoutpath "$INSTDIR\library\llid$R1" detailprint "Copying language files for chat and scribe" - file /a "..\..\lams_build\librarypackages\chatscribe\language\*" + file /a "..\..\lams_build\librarypackages\chatscribe\language\lams\*" ${loopuntil} $R0 == "0" @@ -1736,7 +1834,7 @@ setoutpath "$INSTDIR\library\llid$R1" detailprint "Copying language files for forum and scribe" - file /a "..\..\lams_build\librarypackages\forumscribe\language\*" + file /a "..\..\lams_build\librarypackages\forumscribe\language\lams\*" ${loopuntil} $R0 == "0" ; copy all the folders for llid Resource and Forum @@ -1750,7 +1848,7 @@ #MessageBox MB_OK|MB_ICONEXCLAMATION "Resource and Forum: $R1 $\nElements $R0" setoutpath "$INSTDIR\library\llid$R1" detailprint "Copying language files for resource and forum" - file /a "..\..\lams_build\librarypackages\shareresourcesforum\language\*" + file /a "..\..\lams_build\librarypackages\shareresourcesforum\language\lams\*" ${loopuntil} $R0 == "0" FunctionEnd Index: win_installer/templates/update-deploy-tools.xml =================================================================== diff -u -r3e0afea3eb6fc82e9bb97b1374c29caa67439d87 -r264a81e13f9851c2f44ecfdbbf6fbb35a10a02ce --- win_installer/templates/update-deploy-tools.xml (.../update-deploy-tools.xml) (revision 3e0afea3eb6fc82e9bb97b1374c29caa67439d87) +++ win_installer/templates/update-deploy-tools.xml (.../update-deploy-tools.xml) (revision 264a81e13f9851c2f44ecfdbbf6fbb35a10a02ce) @@ -28,7 +28,7 @@ - + Deploy packaqe for ${signature} created. + + Updating web.xml and MANIFEST.MF for lams-central.war, lams-monitor.war and lams-learning.war. + + + + + + + + + + + + Updating application.xml + + + + + + + + + + + + + + + + + + + @@ -89,6 +123,7 @@ + Index: win_installer/templates/update_lams_configuration.sql =================================================================== diff -u -r79395d11fc45977759fa4ca9b5c6d0400eb9311d -r264a81e13f9851c2f44ecfdbbf6fbb35a10a02ce --- win_installer/templates/update_lams_configuration.sql (.../update_lams_configuration.sql) (revision 79395d11fc45977759fa4ca9b5c6d0400eb9311d) +++ win_installer/templates/update_lams_configuration.sql (.../update_lams_configuration.sql) (revision 264a81e13f9851c2f44ecfdbbf6fbb35a10a02ce) @@ -11,4 +11,9 @@ update lams_configuration set config_value='@WILDFIRE_USER@' where config_key='XmppAdmin'; 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; \ No newline at end of file +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 login='@LAMS_USER@', password=sha1('@LAMS_PASS@') where login='test'; +update lams_user set login='@LAMS_USER@', password=sha1('@LAMS_PASS@') where login='test1'; +update lams_user set login='@LAMS_USER@', password=sha1('@LAMS_PASS@') where login='test2'; +update lams_user set login='@LAMS_USER@', password=sha1('@LAMS_PASS@') where login='test3'; +update lams_user set login='@LAMS_USER@', password=sha1('@LAMS_PASS@') where login='test4'; \ No newline at end of file