Index: win_installer/README =================================================================== diff -u -r5ec0e11f5cf2c7a7fad2294c11416120182deda8 -rc592a3c5755a484352aa1a3ac019e2d997cee560 --- win_installer/README (.../README) (revision 5ec0e11f5cf2c7a7fad2294c11416120182deda8) +++ win_installer/README (.../README) (revision c592a3c5755a484352aa1a3ac019e2d997cee560) @@ -8,12 +8,10 @@ to install the NSIS compiler) Steps to build installer -1. Build LAMS as usual. If using an alternate location for JBOSS_HOME and - LAMS_CONF, specify these at the top of src/installer.nsi +1. Build LAMS as usual. If using an alternate location for JBOSS_HOME, specify + at the top of src/installer.nsi 2. Check out jsMath and run the build-war ant target (needed for - step 6) + step 5) 3. Run the dump-db and compile-java targets in the main build.xml file 4. Compile src/lams-start.nsi and src/lams-stop.nsi -5. Open your C:\lamsconf\lams.xml, and copy the flash client date/timestamps - into templates/lams.xml -6. Compile src/installer.nsi. +5. Compile src/installer.nsi. Index: win_installer/src/build.xml =================================================================== diff -u -rce62da8c797dd3f95cb9160151e2128c32525800 -rc592a3c5755a484352aa1a3ac019e2d997cee560 --- win_installer/src/build.xml (.../build.xml) (revision ce62da8c797dd3f95cb9160151e2128c32525800) +++ win_installer/src/build.xml (.../build.xml) (revision c592a3c5755a484352aa1a3ac019e2d997cee560) @@ -5,9 +5,9 @@ - + - + @@ -66,6 +66,22 @@ + + + + + + + + + + + + + + + + @@ -76,6 +92,7 @@ password="${DB_PASS}" encoding="utf8"> + Index: win_installer/src/installer.nsi =================================================================== diff -u -rce62da8c797dd3f95cb9160151e2128c32525800 -rc592a3c5755a484352aa1a3ac019e2d997cee560 --- win_installer/src/installer.nsi (.../installer.nsi) (revision ce62da8c797dd3f95cb9160151e2128c32525800) +++ win_installer/src/installer.nsi (.../installer.nsi) (revision c592a3c5755a484352aa1a3ac019e2d997cee560) @@ -23,11 +23,12 @@ /* $$Id$$ */ /* - * TODO: uninstaller option to keep database/lams.xml/repository + * TODO: uninstaller option to keep database/repository * TODO: detect if db exists and has data, ask whether to use or import fresh db * TODO: custom lams admin user LI-27 * TODO: desktop icons, readme? * TODO: transaction isolation + * TODO: checkbox to start lams on finish page */ # includes @@ -42,7 +43,6 @@ # constants !define VERSION "2.0 RC1" !define SOURCE_JBOSS_HOME "D:\jboss-4.0.2" ; location of jboss where lams was deployed -!define SOURCE_LAMS_CONF "C:\lamsconf" ; location of lamsconf where lamsconf was deployed !define REG_HEAD "Software\LAMS Foundation\LAMSv2" # installer settings @@ -182,7 +182,6 @@ Var LAMS_PORT Var LAMS_LOCALE Var LAMS_REPOSITORY -Var LAMS_CONF Var LAMS_USER Var LAMS_PASS Var WILDFIRE_DOMAIN @@ -211,10 +210,6 @@ CreateDirectory "$INSTDIR\dump" CreateDirectory "$LAMS_REPOSITORY" - SetOutPath $LAMS_CONF - File /a ${SOURCE_LAMS_CONF}\*.dtd - File /a ${SOURCE_LAMS_CONF}\authentication.xml - # Log mode is set to INFO in this template SetOutPath "$INSTDIR\jboss-4.0.2\server\default\conf" File /a "..\templates\log4j.xml" @@ -255,7 +250,6 @@ SectionGroup /e "Optional" Section /o "jsMath (compressed)" jsmathc SetOutPath "$INSTDIR\jboss-4.0.2\server\default\deploy" - ;File /a /r "${SOURCE_JBOSS_HOME}\server\default\deploy\jsMath.war" File /a /r "..\..\jsmath\build\lib\jsMath.war" SectionEnd @@ -303,7 +297,7 @@ # Abort install if already installed ReadRegStr $0 HKLM "${REG_HEAD}" "version" ${If} $0 != "" - MessageBox MB_OK|MB_ICONSTOP "LAMS $0 is installed. Please uninstall before continuing." + MessageBox MB_OK|MB_ICONSTOP "LAMS $0 is already installed. Please uninstall before continuing." Abort ${EndIf} @@ -446,7 +440,6 @@ Call CheckJava !insertmacro MUI_INSTALLOPTIONS_WRITE "lams.ini" "Field 2" "State" "$JDK_DIR" !insertmacro MUI_INSTALLOPTIONS_WRITE "lams.ini" "Field 4" "State" "$INSTDIR\repository" - !insertmacro MUI_INSTALLOPTIONS_WRITE "lams.ini" "Field 6" "State" "C:\lamsconf" !insertmacro MUI_HEADER_TEXT "Setting Up LAMS (2/4)" "Configure the LAMS Server. If unsure, use the defaults." !insertmacro MUI_INSTALLOPTIONS_DISPLAY "lams.ini" FunctionEnd @@ -455,7 +448,6 @@ Function PostLAMSConfig !insertmacro MUI_INSTALLOPTIONS_READ $JDK_DIR "lams.ini" "Field 2" "State" !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_REPOSITORY "lams.ini" "Field 4" "State" - !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_CONF "lams.ini" "Field 6" "State" # check java version using given dir nsExec::ExecToStack '$JDK_DIR\bin\javac -version' @@ -513,12 +505,14 @@ File /r "..\apache-ant-1.6.5" SetOutPath $TEMP File "build.xml" - File "..\templates\lams.xml" File "..\templates\mysql-ds.xml" File "..\templates\server.xml" File "..\templates\run.bat" File "..\templates\wrapper.conf" File "..\templates\index.html" + File "..\templates\lamsauthentication.xml" + File "..\templates\update_lams_configuration.sql" + File "..\templates\login-config.xml" # create installer.properties ClearErrors @@ -532,13 +526,7 @@ Call StrSlash Pop $2 FileWrite $0 "TEMP=$2$\r$\n" - - Push $LAMS_CONF - Push "\" - Call StrSlash - Pop $2 - FileWrite $0 "LAMS_CONF=$2$\r$\n" - + Push $INSTDIR Push "\" Call StrSlash @@ -586,7 +574,7 @@ # for debugging purposes CopyFiles "$TEMP\installer.properties" $INSTDIR - # use Ant to copy configuration to destination LAMS_CONF + # use Ant to write config to files FileOpen $0 "$INSTDIR\apache-ant-1.6.5\bin\newAnt.bat" w IfErrors 0 +2 goto error @@ -737,7 +725,6 @@ WriteRegStr HKLM "${REG_HEAD}" "dir_mysql" $MYSQL_DIR WriteRegStr HKLM "${REG_HEAD}" "dir_inst" $INSTDIR WriteRegStr HKLM "${REG_HEAD}" "dir_repository" $LAMS_REPOSITORY - WriteRegStr HKLM "${REG_HEAD}" "dir_conf" $LAMS_CONF WriteRegStr HKLM "${REG_HEAD}" "version" "${VERSION}" WriteRegStr HKLM "${REG_HEAD}" "db_name" $DB_NAME WriteRegStr HKLM "${REG_HEAD}" "db_user" $DB_USER @@ -764,7 +751,6 @@ # cleanup functions Function RemoveTempFiles Delete "$TEMP\LocalPortScanner.class" - Delete "$TEMP\lams.xml" Delete "$TEMP\mysql-ds.xml" Delete "$TEMP\server.xml" Delete "$TEMP\run.bat" @@ -774,12 +760,15 @@ Delete "$TEMP\installer.properties" Delete "$INSTDIR\wrapper.conf" Delete "$TEMP\index.html" + Delete "$TEMP\lamsauthentication.xml" + Delete "$TEMP\update_lams_configuration.sql" + Delete "$TEMP\login-config.xml" + Delete "$INSTDIR\update_lams_configuration.sql" FunctionEnd Function .onInstFailed Call RemoveTempFiles RMDir /r $INSTDIR - RMDir /r $LAMS_CONF FunctionEnd Function .onInstSuccess Index: win_installer/src/lams.ini =================================================================== diff -u -rc2832ebbcc1c3cb9109667f969a3c305291b0b78 -rc592a3c5755a484352aa1a3ac019e2d997cee560 --- win_installer/src/lams.ini (.../lams.ini) (revision c2832ebbcc1c3cb9109667f969a3c305291b0b78) +++ win_installer/src/lams.ini (.../lams.ini) (revision c592a3c5755a484352aa1a3ac019e2d997cee560) @@ -1,5 +1,5 @@ [Settings] -NumFields=8 +NumFields=6 [Field 1] Type=GroupBox @@ -43,24 +43,6 @@ Text=Content repository directory... [Field 6] -Type=DirRequest -Left=165 -Top=76 -Right=-7 -Bottom=89 -State= -MinLen=1 -Flags=DISABLED - -[Field 7] -Type=Label -Left=165 -Top=65 -Right=293 -Bottom=74 -Text=Configuration file directory... - -[Field 8] Type=Link Left=7 Top=117 Fisheye: Tag c592a3c5755a484352aa1a3ac019e2d997cee560 refers to a dead (removed) revision in file `win_installer/templates/lams.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: win_installer/templates/lamsauthentication.xml =================================================================== diff -u --- win_installer/templates/lamsauthentication.xml (revision 0) +++ win_installer/templates/lamsauthentication.xml (revision c592a3c5755a484352aa1a3ac019e2d997cee560) @@ -0,0 +1,77 @@ + + + + + + + com.sun.jndi.ldap.LdapCtxFactory + ldap://mams.melcoe.mq.edu.au:636 + simple + ssl + uid= + ,ou=mams,dc=melcoe,dc=mq,dc=edu,dc=au + java:/MySqlDS + select password from lams_user where login=? + + SELECT DISTINCT r.name,'Roles' FROM + lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id) + LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id) + LEFT OUTER JOIN lams_role r USING (role_id) + WHERE u.login=? + + D:/MQLdapTrustStore + webauth + + + + + java:/jdbc/lams-ds + select password from lams_user where login=? + + SELECT DISTINCT r.name,'Roles' FROM + lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id) + LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id) + LEFT OUTER JOIN lams_role r USING (role_id) + WHERE u.login=? + + + + + WEBAUTH_USER + https://array00.melcoe.mq.edu.au/webauth.html + dummy + java:/MySqlDS + + SELECT DISTINCT r.name,'Roles' FROM + lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id) + LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id) + LEFT OUTER JOIN lams_role r USING (role_id) + WHERE u.login=? + + + + + + ldap://mams.melcoe.mq.edu.au:636 + ssl + + MQLdapTrustStore + simple + cn=admin,dc=melcoe,dc=mq,dc=edu,dc=au + KingKong + ou=mams,dc=melcoe,dc=mq,dc=edu,dc=au + + login=uid,firstName=givenName,lastName=sn,email=mail + com.sun.jndi.ldap.LdapCtxFactory + java:/MySqlDS + select password from lams_user where login=? + + SELECT DISTINCT r.name,'Roles' FROM + lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id) + LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id) + LEFT OUTER JOIN lams_role r USING (role_id) + WHERE u.login=? + + + + Index: win_installer/templates/login-config.xml =================================================================== diff -u --- win_installer/templates/login-config.xml (revision 0) +++ win_installer/templates/login-config.xml (revision c592a3c5755a484352aa1a3ac019e2d997cee560) @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + guest + java:/DefaultDS + SELECT PASSWD FROM JMS_USERS WHERE USERID=? + SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=? + + + + + + + + + + + sa + sa + + jboss.jca:service=LocalTxCM,name=DefaultDS + + + + + + + + guest + guest + guest + jboss.jca:service=TxCM,name=JmsXA + + + + + + + + + props/jmx-console-users.properties + props/jmx-console-roles.properties + + + + + + + + + web-console-users.properties + web-console-roles.properties + + + + + + + + + anonymous + + + + + + + + + + + + + + + + java:/MySqlDS + select password from lams_user where login=? + + SELECT DISTINCT r.name,'Roles' FROM + lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id) + LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id) + LEFT OUTER JOIN lams_role r USING (role_id) + WHERE u.login=? + + + + + + + + + @confdir@/lamsauthentication.xml + + + + + + Index: win_installer/templates/update_lams_configuration.sql =================================================================== diff -u --- win_installer/templates/update_lams_configuration.sql (revision 0) +++ win_installer/templates/update_lams_configuration.sql (revision c592a3c5755a484352aa1a3ac019e2d997cee560) @@ -0,0 +1,12 @@ +update lams_configuration set config_value='@URL@' where config_key='ServerURL'; +update lams_configuration set config_value='@INSTDIR@' where config_key='LamsHome'; +update lams_configuration set config_value='@TEMPDIR@' where config_key='TempDir'; +update lams_configuration set config_value='@DUMPDIR@' where config_key='DumpDir'; +update lams_configuration set config_value='@EARDIR@' where config_key='EARDir'; +update lams_configuration set config_value='@REPOSITORYDIR@' where config_key='ContentRepositoryPath'; +update lams_configuration set config_value='@LOCALE@' where config_key='ServerLanguage'; +update lams_configuration set config_value='@LOCALE_DIRECTION@' where config_key='ServerPageDirection'; +update lams_configuration set config_value='@WILDFIRE_DOMAIN@' where config_key='XmppDomain'; +update lams_configuration set config_value='@WILDFIRE_CONFERENCE@' where config_key='XmppConference'; +update lams_configuration set config_value='@WILDFIRE_USER@' where config_key='XmppAdmin'; +update lams_configuration set config_value='@WILDFIRE_PASS@' where config_key='XmppPassword';