Index: win_installer/installer/conf/log4j.xml =================================================================== diff -u -r388ec3500ab44f8bbd700dee150266ddf40ca53e -r5000c6090f45e738aae9d7833ce57ad523d4b0e1 --- win_installer/installer/conf/log4j.xml (.../log4j.xml) (revision 388ec3500ab44f8bbd700dee150266ddf40ca53e) +++ win_installer/installer/conf/log4j.xml (.../log4j.xml) (revision 5000c6090f45e738aae9d7833ce57ad523d4b0e1) @@ -160,7 +160,7 @@ - + @@ -190,6 +190,12 @@ + + + + + + Index: win_installer/installer/conf/news.html =================================================================== diff -u -r388ec3500ab44f8bbd700dee150266ddf40ca53e -r5000c6090f45e738aae9d7833ce57ad523d4b0e1 --- win_installer/installer/conf/news.html (.../news.html) (revision 388ec3500ab44f8bbd700dee150266ddf40ca53e) +++ win_installer/installer/conf/news.html (.../news.html) (revision 5000c6090f45e738aae9d7833ce57ad523d4b0e1) @@ -1,9 +1,21 @@

Latest News & Updates

-
    -
  • -

    Welcome to LAMS 2.1!

    -

    - News is on its way! -

    -
    • -
+
    +
  • +

    Welcome to LAMS 2.1 RC1!

    +

    This is a pre-release version of LAMS designed give you a chance to play with Branching. Read about the + changes on the 2.1 RC1 release page.
    + + If you want to learn more about LAMS, + join the LAMS Community where teachers and developers + share their experiences and ideas on the usage of LAMS.
    + + Found a bug or want to comment on the new features? + Let us know about it. + The bugs we already know about are listed in our + Issues + Tracker. Also have a look at the LAMS Roadmap for upcoming features.
    + + LAMS is currently being translated to 25 languages by more than 50 volunteers. + Want to help out?

    +
    • +
\ No newline at end of file Index: win_installer/installer/license.txt =================================================================== diff -u -rd6f5035a737c68aebdb0f27324a6af99f9326346 -r5000c6090f45e738aae9d7833ce57ad523d4b0e1 --- win_installer/installer/license.txt (.../license.txt) (revision d6f5035a737c68aebdb0f27324a6af99f9326346) +++ win_installer/installer/license.txt (.../license.txt) (revision 5000c6090f45e738aae9d7833ce57ad523d4b0e1) @@ -1,4 +1,4 @@ -LAMS 2.1 Beta is released under the GPL license detailed below. This package +LAMS 2.1 RC1 is released under the GPL license detailed below. This package also includes other libraries/packages, whose respective licenses are detailed below. Index: win_installer/installer/readme.txt =================================================================== diff -u -r388ec3500ab44f8bbd700dee150266ddf40ca53e -r5000c6090f45e738aae9d7833ce57ad523d4b0e1 --- win_installer/installer/readme.txt (.../readme.txt) (revision 388ec3500ab44f8bbd700dee150266ddf40ca53e) +++ win_installer/installer/readme.txt (.../readme.txt) (revision 5000c6090f45e738aae9d7833ce57ad523d4b0e1) @@ -1,7 +1,7 @@ -LAMS 2.1 Beta - Learning Activity Management System +LAMS 2.1 RC1 - Learning Activity Management System ---------------------------------------------- -This is a pre-packaged copy of LAMS 2.1 Beta for Windows 2000, XP, or 2003. +This is a pre-packaged copy of LAMS 2.1 RC1 for Windows 2000, XP, or 2003. It is designed for LAMS users to explore the new Branching and Optional Sequences features. We would love some feedback on things you like, things you don't like, or suggestions for improvements in the wording or icons on Index: win_installer/installer/src/installer.nsi =================================================================== diff -u -rd6f5035a737c68aebdb0f27324a6af99f9326346 -r5000c6090f45e738aae9d7833ce57ad523d4b0e1 --- win_installer/installer/src/installer.nsi (.../installer.nsi) (revision d6f5035a737c68aebdb0f27324a6af99f9326346) +++ win_installer/installer/src/installer.nsi (.../installer.nsi) (revision 5000c6090f45e738aae9d7833ce57ad523d4b0e1) @@ -1,5 +1,5 @@ /**************************************************************** - * Copyright (C) 2006 LAMS Foundation (http://lamsfoundation.org) + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ * @@ -20,9 +20,7 @@ * **************************************************************** */ -/* $$Id$$ */ - # includes !include "TextFunc.nsh" !include "includes\Functions.nsh" @@ -36,12 +34,11 @@ !insertmacro LineFind # constants -!define VERSION "2.1 Beta" -;!define PREVIOUS_VERSION "2.0.2" -!define LANGUAGE_PACK_VERSION "2007-12-17" -!define LANGUAGE_PACK_VERSION_INT "20071217" -!define DATE_TIME_STAMP "200712201000" -!define SERVER_VERSION_NUMBER "2.0.99.200712181312" +!define VERSION "2.1 RC1" +!define LANGUAGE_PACK_VERSION "2008-03-15" +!define LANGUAGE_PACK_VERSION_INT "20080315" +!define DATE_TIME_STAMP "200803151000" +!define SERVER_VERSION_NUMBER "2.0.99.200803121303" !define BASE_VERSION "2.0" !define SOURCE_JBOSS_HOME "D:\jboss-4.0.2" ; location of jboss where lams was deployed !define REG_HEAD "Software\LAMS Foundation\LAMSv2" @@ -54,7 +51,7 @@ Name "LAMS ${VERSION}" ;BrandingText "LAMS ${VERSION} -- built on ${__TIMESTAMP__}" BrandingText "LAMS ${VERSION} -- built on ${__DATE__} ${__TIME__}" -OutFile "${BUILD}\LAMS-2.1-beta.exe" +OutFile "${BUILD}\LAMS-2.1-RC1.exe" InstallDir "C:\lams" InstallDirRegKey HKLM "${REG_HEAD}" "" LicenseForceSelection radiobuttons "I Agree" "I Do Not Agree" @@ -67,7 +64,7 @@ # set welcome page !define MUI_WELCOMEPAGE_TITLE "LAMS ${VERSION} Install Wizard" !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of LAMS ${VERSION}.\r\n\r\n\ - LAMS 2.1 Beta has been released for users to explore the new Branching features coming in LAMS 2.1.\r\n\r\n\ + LAMS 2.1 RC1 has been released for users to explore the new Branching features coming in LAMS 2.1.\r\n\r\n\ Do NOT use this installer to set up production server for LAMS.\r\n\r\n\ You cannot use this installer to upgrade an existing copy of LAMS 2.0.\r\n\r\n\ Please ensure you have a copy of MySQL 5.x installed and running, and Java JDK version 1.5.x. or 1.6.x\r\n\r\n\ @@ -177,6 +174,7 @@ SectionIn RO 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 /x *.bak ${SOURCE_JBOSS_HOME} ; Copy jboss-cache.jar, jgroups.jar from server/all/lib to server/default/lib Index: win_installer/installer/src/lams-start.nsi =================================================================== diff -u --- win_installer/installer/src/lams-start.nsi (revision 0) +++ win_installer/installer/src/lams-start.nsi (revision 5000c6090f45e738aae9d7833ce57ad523d4b0e1) @@ -0,0 +1,79 @@ +/**************************************************************** + * Copyright (C) 2006 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $$Id$$ */ + +!include "MUI.nsh" +!include "LogicLib.nsh" +!include "includes\Functions.nsh" + +!define REG_HEAD "Software\LAMS Foundation\LAMSv2" + +Name "Start LAMS" +OutFile "..\..\build\lams-start.exe" +!define MUI_ICON "..\..\graphics\favicon.ico" +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_LANGUAGE "English" + +Function .onInit + SetSilent silent +FunctionEnd + +Section + ReadRegStr $9 HKLM "${REG_HEAD}" "db_user" + ReadRegStr $8 HKLM "${REG_HEAD}" "db_pass" + ReadRegStr $7 HKLM "${REG_HEAD}" "dir_inst" + ReadRegStr $6 HKLM "${REG_HEAD}" "dir_mysql" + + # check mysql password, mysql server status + StrLen $0 $8 + ${If} $0 == 0 + nsExec::ExecToStack '$6\bin\mysqladmin ping -u $9' + ${Else} + nsExec::ExecToStack '$6\bin\mysqladmin ping -u $9 -p$8' + ${EndIf} + Pop $0 + Pop $1 + # check mysql password is correct + ${StrStr} $2 $1 "Access denied" + ${If} $2 != "" + ; mysql password somehow changed - prompt user to update registry entry + ${EndIf} + # check mysql is running + ${StrStr} $2 $1 "mysqld is alive" + ${If} $2 == "" + MessageBox MB_OK|MB_ICONEXCLAMATION "MySQL does not appear to be running - please make sure it is running before starting LAMS." + Abort + ${EndIf} + + nsExec::ExecToStack 'sc start LAMSv2' + Pop $0 + Pop $1 + ${StrStr} $2 $1 "START_PENDING" + ${If} $2 == "" + MessageBox MB_OK|MB_ICONSTOP "Could not start LAMSv2 service: $\r$\n$1" + ${Else} + MessageBox MB_OK "Started LAMSv2 service. Please wait a minute or two while LAMS starts up." + ExecShell "open" '"$7\index.html"' + ${EndIf} +SectionEnd + Index: win_installer/installer/src/lams-stop.nsi =================================================================== diff -u --- win_installer/installer/src/lams-stop.nsi (revision 0) +++ win_installer/installer/src/lams-stop.nsi (revision 5000c6090f45e738aae9d7833ce57ad523d4b0e1) @@ -0,0 +1,43 @@ +/**************************************************************** + * Copyright (C) 2006 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $$Id$$ */ + +!include "MUI.nsh" +!include "LogicLib.nsh" + +Name "Start LAMS" +OutFile "..\..\build\lams-stop.exe" +!define MUI_ICON "..\..\graphics\favicon.ico" +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_LANGUAGE "English" + +Function .onInit + SetSilent silent +FunctionEnd + +Section + nsExec::ExecToStack 'sc stop LAMSv2' + Pop $0 + Pop $1 + MessageBox MB_OK "Stopped LAMSv2 service." +SectionEnd \ No newline at end of file Index: win_installer/installer/templates/index.html =================================================================== diff -u -r388ec3500ab44f8bbd700dee150266ddf40ca53e -r5000c6090f45e738aae9d7833ce57ad523d4b0e1 --- win_installer/installer/templates/index.html (.../index.html) (revision 388ec3500ab44f8bbd700dee150266ddf40ca53e) +++ win_installer/installer/templates/index.html (.../index.html) (revision 5000c6090f45e738aae9d7833ce57ad523d4b0e1) @@ -50,7 +50,7 @@