Index: unix_installer/upgrader-package/ant-scripts/update-lams.xml
===================================================================
diff -u -r8b9c3cf3a0178b6671e7b28e62b015d96ecb1308 -r51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c
--- unix_installer/upgrader-package/ant-scripts/update-lams.xml (.../update-lams.xml) (revision 8b9c3cf3a0178b6671e7b28e62b015d96ecb1308)
+++ unix_installer/upgrader-package/ant-scripts/update-lams.xml (.../update-lams.xml) (revision 51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c)
@@ -29,70 +29,28 @@
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Updating core database
-
-
-
Updating lams-www.war
@@ -181,10 +139,6 @@
-
@@ -205,23 +159,10 @@
Deploying new tools
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -240,18 +181,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: unix_installer/upgrader-package/build.xml
===================================================================
diff -u -rec5e801fb51ac3387b91e67b5f6d2d4b3ab7276c -r51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c
--- unix_installer/upgrader-package/build.xml (.../build.xml) (revision ec5e801fb51ac3387b91e67b5f6d2d4b3ab7276c)
+++ unix_installer/upgrader-package/build.xml (.../build.xml) (revision 51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c)
@@ -2,9 +2,9 @@
-
+
-
+
@@ -38,7 +38,7 @@
-
+
@@ -48,6 +48,11 @@
+
+
+
+
+
@@ -79,26 +84,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: unix_installer/upgrader-package/java/backup.java
===================================================================
diff -u -r53793681b6a75cc0e8cff5f665b7ee1b69008d52 -r51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c
--- unix_installer/upgrader-package/java/backup.java (.../backup.java) (revision 53793681b6a75cc0e8cff5f665b7ee1b69008d52)
+++ unix_installer/upgrader-package/java/backup.java (.../backup.java) (revision 51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c)
@@ -30,7 +30,7 @@
{
System.out.println("Copying files from " + jbossdir + "/ to " + backupdir + "/jboss-4.0.2/ ...");
copyFiles(jbossdir + "/", backupdir+"/jboss-4.0.2/");
- copyFiles(etcdir + "/", backupdir+"/ectlams2/");
+ copyFiles(etcdir + "/", backupdir+"/etc-lams2/");
copyFiles(repositoryDir + "/", backupdir+"/repository/");
System.out.println("Done.\n");
}
@@ -201,7 +201,7 @@
try
{
FileWriter outfile = new FileWriter("bin/lamsdump.sql");
- outfile.write(mysqldir+ "/mysqldump -u" +dbuser+ " -p" +dbpass+ " -h" +dbhost+ " -P" +dbport+
+ outfile.write(mysqldir+ "/mysqldump --hex-blob -u" +dbuser+ " -p" +dbpass+ " -h" +dbhost+ " -P" +dbport+
" " +dbname+ " > " +backupdir+ "/dump.sql");
outfile.close();
}
Index: unix_installer/upgrader-package/lams.properties
===================================================================
diff -u -r8b9c3cf3a0178b6671e7b28e62b015d96ecb1308 -r51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c
--- unix_installer/upgrader-package/lams.properties (.../lams.properties) (revision 8b9c3cf3a0178b6671e7b28e62b015d96ecb1308)
+++ unix_installer/upgrader-package/lams.properties (.../lams.properties) (revision 51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c)
@@ -122,9 +122,9 @@
SQL_JAR=mysql-connector-java-5.0.8-bin.jar
# The version of this LAMS updater
-LAMS_VERSION=2.3
-LAMS_SERVER_VERSION=2.3.0.200905220000
-LAMS_LANGUAGE_VERSION=2009-05-22
+LAMS_VERSION=2.3.5
+LAMS_SERVER_VERSION=2.3.5.201012150000
+LAMS_LANGUAGE_VERSION=2009-12-15
#########################################################################################
Index: unix_installer/upgrader-package/license
===================================================================
diff -u -rec5e801fb51ac3387b91e67b5f6d2d4b3ab7276c -r51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c
--- unix_installer/upgrader-package/license (.../license) (revision ec5e801fb51ac3387b91e67b5f6d2d4b3ab7276c)
+++ unix_installer/upgrader-package/license (.../license) (revision 51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c)
@@ -1,41 +1,47 @@
-LAMS 2.3 is released under the GPL license detailed below. This package
+LAMS 2.3.5 is released under the GPL license detailed below. This package
also includes other libraries/packages, whose respective licenses are
detailed below.
Library/Package License
--------------------------------------------------------------------------------
-antlr.jar Antlr 3 License
+aspirin.jar Apache License 2.0
+batik-1.7.ja Apache License 2.0
+dnsjava-2.0.6.jar BSD License
+wrapper.jar Silver Egg Techology License (see license-wrapper.txt)
+antlr.jar Antlr 3 License
axis-ant.jar Apache License 2.0
-axis.jar Apache License 2.0
+axis.jar Apache License 2.0
cglib-nodep-2.1_2.jar Apache License 2.0
cglib_jboss404GA.jar Apache License 2.0
commons-beanutils.jar Apache License 2.0
commons-codec-1.3.jar Apache License 2.0
commons-collections.jar Apache License 2.0
commons-digester.jar Apache License 2.0
-commons-discovery-0.2.jar Apache Software License 1.1
+commons-discovery-0.2.jar Apache Software License 1.1
commons-fileupload.jar Apache Software License 1.1
commons-lang-2.0.jar Apache Software License 1.1
commons-logging.jar Apache License 2.0
commons-validator.jar Apache License 2.0
-FCKeditor-2.3.jar CDL Closed Distribution License
+FCKeditor-2.3.jar CDL Closed Distribution License
gnujaxp.jar GNU General Public License
hibernate3.jar GNU General Public License
jakarta-oro.jar Apache Software License 1.1
-jaxrpc.jar GNU Lesser General Public Licence
+jaxrpc.jar CDDL (Common Development and
+ Distribution License 1.0)
+JBoss 4.0.2 GNU Lesser General Public Licence
jboss-cache.jar GNU Lesser General Public Licence
-jboss-common.jar GNU Lesser General Public Licence
+jboss-common.jar GNU Lesser General Public Licence
jboss-jmx.jar GNU Lesser General Public Licence
-jboss-system.jar GNU Lesser General Public Licence
-jcommon-1.0.0.jar GNU Lesser General Public Licence
-jdom.jar Jdom Jar License
-jfreechart-1.0.1.jar GNU Lesser General Public Licence
+jboss-system.jar GNU Lesser General Public Licence
+jcommon-1.0.0.jar GNU Lesser General Public Licence
+jdom.jar Jdom Jar License
+jfreechart-1.0.1.jar GNU Lesser General Public Licence
jgroups.jar GNU Lesser General Public Licence
jmock-2003-03-19.jar jMock Project License
-joda-time-0.98.jar Joda Software License 1.0
+joda-time-0.98.jar Joda Software License 1.0
jsMath Apache License 2.0
-jstl.jar JSTL License 1.1
-log4j-1.2.13.jar Apache Software License 1.1
+jstl.jar JSTL License 1.1
+log4j-1.2.13.jar Apache Software License 1.1
mysql-connector- (CDDL Common Development and
java-3.1.12-bin-jar Distribution License 1.0)
odmg-3.0.jar ODMG 2.0
@@ -44,32 +50,32 @@
quartz.jar Apache License 2.0
saaj.jar (CDDL Common Development and
Distribution License 1.0)
-smack.jar Apache License 2.0
+smack.jar Apache License 2.0
smackx.jar Apache License 2.0
-spring.jar Apache License 2.0
+spring.jar Apache License 2.0
standard.jar Apache License 2.0
struts-el.jar Apache License 2.0
-struts.jar Apache License 2.0
-wddx.jar GNU General Public License
-wsdl4j-1.5.1.jar CPL Common Public License 0.5
-xml-writer-0.2.jar XML-Write License
+struts.jar Apache License 2.0
+wddx.jar GNU General Public License
+wsdl4j-1.5.1.jar CPL Common Public License 0.5
+xml-writer-0.2.jar XML-Write License
xom-1.0.b3.jar GNU Lesser General Public License
xpp3-1.1.3.4d_b4.jar XPP3 License
xstream-1.1.jar xstream Licanse
-SHARE RECOURCES LIBRARY LICENSES
+SHARE RESOURCES LIBRARY LICENSES
castor-0.9.5.3-xml.jar Castor License
-jdom.jar Jdom Jar License
+jdom.jar Jdom Jar License
moonunitsrc.jar Reload License
reload-diva.jar Reload License
-reload-editor.jar Reload License
+reload-editor.jar Reload License
reload-jdom.jar Reload License
-reload-moonunit.jar Reload License
+reload-moonunit.jar Reload License
xercesImpl.jar Apache Software License 1.1
xml-apis.jar Apache Software License 1.1
jaxen-full.jar Jaxen Jar License (The Werken
Company)
-sax.jar Public Domain
+sax.jar Public Domain
saxpath.jar Jaxen Jar License (The Werken
Company)
--------------------------------------------------------------------------------
@@ -2600,4 +2606,4 @@
* .
*/
- ========================================================
+ ========================================================
\ No newline at end of file
Index: unix_installer/upgrader-package/readme
===================================================================
diff -u -rec5e801fb51ac3387b91e67b5f6d2d4b3ab7276c -r51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c
--- unix_installer/upgrader-package/readme (.../readme) (revision ec5e801fb51ac3387b91e67b5f6d2d4b3ab7276c)
+++ unix_installer/upgrader-package/readme (.../readme) (revision 51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c)
@@ -1,9 +1,9 @@
-LAMS 2.3 - Learning Activity Management System Upgrader
+LAMS 2.3.5 - Learning Activity Management System Upgrader
--------------------------------------------------------------------------------
-This is an upgrader package for LAMS 2.2 to LAMS 2.3. Please read this
+This is an upgrader package for LAMS 2.3.4 to LAMS 2.3.5. Please read this
document carefully before upgrading and make sure that you have a valid
-installation of LAMS 2.1 on your machine. Please also ensure that you have
+installation of LAMS 2.3.4 on your machine. Please also ensure that you have
read and understood the terms of the license agreement.
NOTE TO SYSADMINS: If you are doing an upgrade and your users report problems in
@@ -12,10 +12,6 @@
message "Congratulations, your content saved successfully!" but the close button
doesn't work, then please tell them to clear their cache.
-NOTE TO SYSADMINS: If you have installed the FCKEditor flvPlayer previous to
-running this update, you will need to re-install to the current version. Follow
-the instructions at http://wiki.lamsfoundation.org/display/lams/flvPlayer.
-
CONTENTS
========
@@ -31,13 +27,13 @@
1. Required Software
====================
-You will require some software to be installed and/or running for LAMS 2.3 to
+You will require some software to be installed and/or running for LAMS 2.3.5 to
install and run properly. These are listed below
-LAMS 2.0.4
+LAMS 2.3.4
JDK 1.5 or 1.6
JBOSS-4.0.2 (Must be 4.0.2, newer and older versions have problems running LAMS)
-MySql 5.0.x (Running)
+MySql 5.x (Running)
Wildfire (Running - Required if you want to use chat tools)
ANT - Included in this package
@@ -82,7 +78,7 @@
3. Languages and Locales
========================
-In LAMS 2.3 you can set the default language of your server to be one of many
+In LAMS 2.3.5 you can set the default language of your server to be one of many
languages, and more to come, see http://lamscommunity.org
Look out for UNIX language packs to add to your list of language locales
@@ -182,7 +178,7 @@
4) Dump the database by executing the following command. Fill in your own
backup directory
-/mysqldump -u -p > /dump.sql
+/mysqldump --hex-blob -u -p > /dump.sql
7. Web Resources
Index: unix_installer/upgrader-package/sql-scripts/setLamsConfiguration.sql
===================================================================
diff -u -r8b9c3cf3a0178b6671e7b28e62b015d96ecb1308 -r51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c
--- unix_installer/upgrader-package/sql-scripts/setLamsConfiguration.sql (.../setLamsConfiguration.sql) (revision 8b9c3cf3a0178b6671e7b28e62b015d96ecb1308)
+++ unix_installer/upgrader-package/sql-scripts/setLamsConfiguration.sql (.../setLamsConfiguration.sql) (revision 51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c)
@@ -1,6 +1,7 @@
-update lams_configuration set config_value='2.3' where config_key='Version';
-update lams_configuration set config_value='2.3.0.200905220000' where config_key='AuthoringClientVersion' or config_key='MonitorClientVersion' or config_key="LearnerClientVersion" or config_key='ServerVersionNumber';
-update lams_configuration set config_value='2009-05-22' where config_key='DictionaryDateCreated';
+-- Upgrade LAMS 2.3.5
+-- update lams_configuration set config_value='2.3' where config_key='Version';
+update lams_configuration set config_value='2.3.5.201012150000' where config_key='AuthoringClientVersion' or config_key='MonitorClientVersion' or config_key="LearnerClientVersion" or config_key='ServerVersionNumber';
+update lams_configuration set config_value='2010-12-15' where config_key='DictionaryDateCreated';
-- 2.2 only
-- update lams_learning_library set valid_flag=0 where title='Dimdim';
\ No newline at end of file
Index: unix_installer/upgrader-package/update-lams.sh
===================================================================
diff -u -r8b9c3cf3a0178b6671e7b28e62b015d96ecb1308 -r51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c
--- unix_installer/upgrader-package/update-lams.sh (.../update-lams.sh) (revision 8b9c3cf3a0178b6671e7b28e62b015d96ecb1308)
+++ unix_installer/upgrader-package/update-lams.sh (.../update-lams.sh) (revision 51bcf92abfae1ffa213a6f3df2f5e3d5862bf18c)
@@ -83,10 +83,10 @@
. ./lams.properties
# The version of this LAMS updater
-LAMS_VERSION=2.3
-LAMS_SERVER_VERSION=2.3.0.200905220000
-LAMS_LANGUAGE_VERSION=2009-05-22
-REQ_LAMS_VERSION=2.2
+LAMS_VERSION=2.3.5
+LAMS_SERVER_VERSION=2.3.5.201012150000
+LAMS_LANGUAGE_VERSION=2010-12-15
+REQ_LAMS_VERSION=2.3.4
# Checking that the lams.properties points to a lams installation
if [ ! -r "$JBOSS_DIR/server/default/deploy/lams.ear/lams.jar" ]
@@ -175,7 +175,7 @@
printf "Checking LAMS database...\n"
- $JAVA_HOME/bin/java -cp .:bin/:assembly/lams.ear/mysql-connector-java-5.0.8-bin.jar checkmysql "$DB_URL" "$DB_USER" "$DB_PASS" "$REQ_LAMS_VERSION"
+ $JAVA_HOME/bin/java -cp .:bin/:$JBOSS_DIR/server/default/deploy/lams.ear/mysql-connector-java-5.0.8-bin.jar checkmysql "$DB_URL" "$DB_USER" "$DB_PASS" "$REQ_LAMS_VERSION"
if [ "$?" -ne "0" ]
then
installfailed
@@ -184,48 +184,6 @@
}
-#getMysqlHost()
-#{
-# SQL_HOST=""
-# SQL_URL=""
-# continue=""
-# printf "Please enter the location of your MySql Host (Default: localhost)\n> "
-# read SQL_HOST
-# if [ -z "$SQL_HOST" ]
-# then
-# SQL_HOST=localhost
-# fi
-#
-# SQL_URL="jdbc:mysql://$SQL_HOST/$DB_NAME?characterEncoding=utf8&autoReconnect=true"
-#
-# printf "\nAll LAMS database update connections will be done through: \n$SQL_URL.\n"
-# printf "Is this correct? (y)es, (n)o, (q)uit.\n> "
-# read continue
-#
-# case $continue in
-# q)
-# printf "\nTo set up MySql on a separate server, follow the instructions in the readme.\n\n"
-# printf "LAMS update aborted by user.\n\n"
-# installexit
-# ;;
-# y)
-#
-# # append SQL_HOST and SQL_URL to lams.properties
-# echo "# Updater-generated properties, used instead of default localhost" >> lams.properties
-# echo "SQL_HOST=$SQL_HOST" >> lams.properties
-# echo "SQL_URL=jdbc:mysql://${SQL_HOST}/${DB_NAME}?characterEncoding=utf8&autoReconnect=true" >> lams.properties
-# printf "\n"
-# ;;
-# n)
-# printf "\n"
-# getMysqlHost
-# ;;
-# *)
-# printf "\nPlease enter your MySql host and then enter (y).\n"
-# getMysqlHost
-# ;;
-# esac
-#}
checklams()
{
@@ -291,27 +249,46 @@
printf "2) Backup $LAMS_DIR\n"
printf "3) Backup /etc/lams2\n"
printf "4) Dump the database by executing the following command. Fill in your own backup \ndirectory.\n"
- printf "> $sqldir/mysqldump -u$dbuser -p$dbpass $dbname > (backup dir)/dump.sql\n"
+ printf "> ${SQL_DIR}/mysqldump --hex-blob -u$DB_USER -p$DB_PASS $DB_NAME > (backup dir)/dump.sql\n"
installexit
;;
y)
-
-
- $JDK_DIR/bin/java -cp bin backup
+ DAY=`date +%d-%m-%Y`
+ BACKUP_DIR=${LAMS_DIR}/backup-${DAY}
+ printf "\nCreating directory: ${BACKUP_DIR} to store the backup \n"
+ mkdir -p ${BACKUP_DIR}
if [ "$?" -ne "0" ]
then
- echo "Update failed, Failed to backup LAMS."
+ echo "\nCan't create backup directory. Problem with permissions?"
installfailed
fi
- chmod 755 bin/lamsdump.sql
- bin/lamsdump.sql
+ printf "\n - Backing up JBoss... (this might take some minutes) "
+ cp -pr ${JBOSS_DIR} ${BACKUP_DIR}
if [ "$?" -ne "0" ]
then
- echo "Update failed, problem dumping database for backup."
+ echo "\nFailed to create backup for JBoss. Is LAMS still running? Make sure it's stopped before running upgrade or check that you are running the upgrade script as root."
installfailed
fi
+ printf "\n - Backing up LAMS Repository"
+ cp -pr ${LAMS_DIR}/repository ${BACKUP_DIR}
+ if [ "$?" -ne "0" ]
+ then
+ echo "\nFailed to create backup for LAMS Repository."
+ installfailed
+ fi
+
+ printf "\n - Backing up MySQL LAMS Database: $DB_NAME"
+ ${SQL_DIR}/mysqldump --hex-blob -u$DB_USER -p$DB_PASS $DB_NAME > ${BACKUP_DIR}/dump.sql
+ if [ "$?" -ne "0" ]
+ then
+ echo "\nFailed to backup the MySQL LAMS database. Check the user and password details."
+ installfailed
+ fi
+
+ printf "\nDone with backup. Visit ${BACKUP_DIR} if want to revert to it\n"
+
;;
n)
@@ -341,7 +318,7 @@
printf "2) Backup $LAMS_DIR\n"
printf "3) Backup /etc/lams2\n"
printf "4) Dump the database by executing the following command. Fill in your own backup \ndirectory.\n"
-printf "> $sqldir/mysqldump -u$DB_USER -p$DB_PASS $DB_NAME > (backup dir)/dump.sql\n"
+printf "> ${SQL_DIR}/mysqldump --hex-blob -u$DB_USER -p$DB_PASS $DB_NAME > (backup dir)/dump.sql\n"
printf "\n--------------------------------------------------------------------------------\n\n"
#getMysqlHost
@@ -350,10 +327,12 @@
backup
+printf "\nDeleting JBoss tmp and work folders....\n"
+rm -rf $JBOSS_DIR/server/default/deploy/tmp
+rm -rf $JBOSS_DIR/server/default/deploy/work
+
printf "\nUpdating lams.ear with new jars and wars...\n"
-cp -r assembly/lams.ear/*.jar $EAR_DIR > log/update-files.log
-cp -r assembly/lams.ear/*.war $EAR_DIR >> log/update-files.log
-cp -r assembly/lams-session.jar assembly/lams-valve.jar $DEFAULT_DIR/lib >> log/update-files.log
+cp -pvr assembly/lams.ear/* $EAR_DIR > log/update-files.log
printf "\nBeginning ant scripts, check log/install.log for install log. This may take a few minutes...\n"
ant/bin/ant -logfile log/install.log -buildfile ant-scripts/update-lams.xml update-lams
@@ -363,16 +342,6 @@
installfailed
fi
-# Slimming JBoss -- ONLY FOR 2.3 UPGRADE, REMOVE FOR NEXT RELEASE
-echo "Slimming JBoss"
-ant/bin/ant -buildfile ant-scripts/update-lams.xml -logfile log/slim-jboss.log slim-jboss
-if [ "$?" -ne "0" ]
- then
- echo "Install Failed. Problem while slimming jboss, check log/slim-jboss.log for details."
- installfailed
-fi
-
-
# Checking the log to see if there was any failures from the tool deployer (invoked in update-lams.xml)
failed=`grep FAILED log/*`
if [ "$failed" ]