Index: debian_installer/build.properties
===================================================================
diff -u -rbae6cea7eb46a03b052335fead84b0a9723ec7ff -rce7e814be3ddb3a279e7bc06e3b3e0ce5b4fbae8
--- debian_installer/build.properties (.../build.properties) (revision bae6cea7eb46a03b052335fead84b0a9723ec7ff)
+++ debian_installer/build.properties (.../build.properties) (revision ce7e814be3ddb3a279e7bc06e3b3e0ce5b4fbae8)
@@ -1,3 +1,4 @@
version=2.3.0
build_dir=build/lams2-${version}
-lams_build=/home/jliew/lams_build
+projects_dir=/home/jliew
+lams_build=${projects_dir}/lams_build
Index: debian_installer/build.xml
===================================================================
diff -u -rbae6cea7eb46a03b052335fead84b0a9723ec7ff -rce7e814be3ddb3a279e7bc06e3b3e0ce5b4fbae8
--- debian_installer/build.xml (.../build.xml) (revision bae6cea7eb46a03b052335fead84b0a9723ec7ff)
+++ debian_installer/build.xml (.../build.xml) (revision ce7e814be3ddb3a279e7bc06e3b3e0ce5b4fbae8)
@@ -12,11 +12,12 @@
-
-
-
-
-
+
+
+
+
+
+
@@ -61,7 +62,13 @@
-
+
+
+
+
+
+
+
@@ -76,7 +83,218 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: debian_installer/lams2/debian/lams2.install
===================================================================
diff -u -r4fabe05a8702229c06ceee3f2a2d3a5580fe8302 -rce7e814be3ddb3a279e7bc06e3b3e0ce5b4fbae8
--- debian_installer/lams2/debian/lams2.install (.../lams2.install) (revision 4fabe05a8702229c06ceee3f2a2d3a5580fe8302)
+++ debian_installer/lams2/debian/lams2.install (.../lams2.install) (revision ce7e814be3ddb3a279e7bc06e3b3e0ce5b4fbae8)
@@ -27,3 +27,9 @@
lams_tool_gmap /usr/share/lams2/
lams_tool_spreadsheet /usr/share/lams2/
lams_tool_wiki /usr/share/lams2/
+2.2.0to2.3.0.sql /usr/share/lams2/
+lams_tool_assessment /usr/share/lams2/
+lams_tool_images /usr/share/lams2/
+lams_tool_mindmap /usr/share/lams2/
+lams_tool_pixlr /usr/share/lams2/
+lams_tool_videorecorder /usr/share/lams2/
Index: debian_installer/lams2/debian/postinst
===================================================================
diff -u -rbae6cea7eb46a03b052335fead84b0a9723ec7ff -rce7e814be3ddb3a279e7bc06e3b3e0ce5b4fbae8
--- debian_installer/lams2/debian/postinst (.../postinst) (revision bae6cea7eb46a03b052335fead84b0a9723ec7ff)
+++ debian_installer/lams2/debian/postinst (.../postinst) (revision ce7e814be3ddb3a279e7bc06e3b3e0ce5b4fbae8)
@@ -18,26 +18,47 @@
# the debian-policy package
update220to230 () {
+ # Update 2.2.0 database to 2.3
+ if [ "$db_root_pass" != "" ] ; then
+ mysql $db_name < /usr/share/lams2/2.2.0to2.3.0.sql -u root -p$db_root_pass || true
+ else
+ mysql $db_name < /usr/share/lams2/2.2.0to2.3.0.sql -u root || true
+ fi
+
# Add assessment tool, new in 2.3
cd /usr/share/lams2/lams_tool_assessment/
sed -i -e "s/\(\).*\(\?.*\)\(<\/dbDriverUrl>\)/\1jdbc:mysql:\/\/localhost:3306\/$db_name\2\3/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbUsername>\)/\1$db_user\2/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbPassword>\)/\1$db_pass\2/" deploy.xml
- ./deploy.sh > /dev/null || true
+ ./deploy.sh || true
+ # Add images tool, new in 2.3
+ cd /usr/share/lams2/lams_tool_images/
+ sed -i -e "s/\(\).*\(\?.*\)\(<\/dbDriverUrl>\)/\1jdbc:mysql:\/\/localhost:3306\/$db_name\2\3/" deploy.xml
+ sed -i -e "s/\(\).*\(<\/dbUsername>\)/\1$db_user\2/" deploy.xml
+ sed -i -e "s/\(\).*\(<\/dbPassword>\)/\1$db_pass\2/" deploy.xml
+ ./deploy.sh || true
+
# Add mindmap tool, new in 2.3
cd /usr/share/lams2/lams_tool_mindmap/
sed -i -e "s/\(\).*\(\?.*\)\(<\/dbDriverUrl>\)/\1jdbc:mysql:\/\/localhost:3306\/$db_name\2\3/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbUsername>\)/\1$db_user\2/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbPassword>\)/\1$db_pass\2/" deploy.xml
- ./deploy.sh > /dev/null || true
+ ./deploy.sh || true
# Add pixlr tool, new in 2.3
cd /usr/share/lams2/lams_tool_pixlr/
sed -i -e "s/\(\).*\(\?.*\)\(<\/dbDriverUrl>\)/\1jdbc:mysql:\/\/localhost:3306\/$db_name\2\3/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbUsername>\)/\1$db_user\2/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbPassword>\)/\1$db_pass\2/" deploy.xml
- ./deploy.sh > /dev/null || true
+ ./deploy.sh || true
+
+ # Add videorecorder tool, new in 2.3
+ cd /usr/share/lams2/lams_tool_videorecorder/
+ sed -i -e "s/\(\).*\(\?.*\)\(<\/dbDriverUrl>\)/\1jdbc:mysql:\/\/localhost:3306\/$db_name\2\3/" deploy.xml
+ sed -i -e "s/\(\).*\(<\/dbUsername>\)/\1$db_user\2/" deploy.xml
+ sed -i -e "s/\(\).*\(<\/dbPassword>\)/\1$db_pass\2/" deploy.xml
+ ./deploy.sh || true
}
configure220 () {
@@ -62,35 +83,35 @@
sed -i -e "s/\(\).*\(\?.*\)\(<\/dbDriverUrl>\)/\1jdbc:mysql:\/\/localhost:3306\/$db_name\2\3/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbUsername>\)/\1$db_user\2/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbPassword>\)/\1$db_pass\2/" deploy.xml
- ./deploy.sh > /dev/null || true
+ ./deploy.sh || true
# Add dimdim tool, new in 2.2 (disabled in 2.1.1to2.2.0.sql however)
cd /usr/share/lams2/lams_tool_dimdim/
sed -i -e "s/\(\).*\(\?.*\)\(<\/dbDriverUrl>\)/\1jdbc:mysql:\/\/localhost:3306\/$db_name\2\3/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbUsername>\)/\1$db_user\2/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbPassword>\)/\1$db_pass\2/" deploy.xml
- ./deploy.sh > /dev/null || true
+ ./deploy.sh || true
# Add gmap tool, new in 2.2
cd /usr/share/lams2/lams_tool_gmap/
sed -i -e "s/\(\).*\(\?.*\)\(<\/dbDriverUrl>\)/\1jdbc:mysql:\/\/localhost:3306\/$db_name\2\3/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbUsername>\)/\1$db_user\2/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbPassword>\)/\1$db_pass\2/" deploy.xml
- ./deploy.sh > /dev/null || true
+ ./deploy.sh || true
# Add spreadsheet tool, new in 2.2
cd /usr/share/lams2/lams_tool_spreadsheet/
sed -i -e "s/\(\).*\(\?.*\)\(<\/dbDriverUrl>\)/\1jdbc:mysql:\/\/localhost:3306\/$db_name\2\3/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbUsername>\)/\1$db_user\2/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbPassword>\)/\1$db_pass\2/" deploy.xml
- ./deploy.sh > /dev/null || true
+ ./deploy.sh || true
# Add wiki tool, new in 2.2
cd /usr/share/lams2/lams_tool_wiki/
sed -i -e "s/\(\).*\(\?.*\)\(<\/dbDriverUrl>\)/\1jdbc:mysql:\/\/localhost:3306\/$db_name\2\3/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbUsername>\)/\1$db_user\2/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbPassword>\)/\1$db_pass\2/" deploy.xml
- ./deploy.sh > /dev/null || true
+ ./deploy.sh || true
}
update21rc1to210 () {
@@ -106,7 +127,7 @@
sed -i -e "s/\(\).*\(\?.*\)\(<\/dbDriverUrl>\)/\1jdbc:mysql:\/\/localhost:3306\/$db_name\2\3/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbUsername>\)/\1$db_user\2/" deploy.xml
sed -i -e "s/\(\).*\(<\/dbPassword>\)/\1$db_pass\2/" deploy.xml
- ./deploy.sh > /dev/null || true
+ ./deploy.sh || true
}
update210to211 () {
@@ -173,19 +194,22 @@
case "$2" in
2.2.0*)
update;
+ update220to230;
;;
2.1.1*)
update;
update211to220;
configure220;
+ update220to230;
;;
2.1.0*)
update;
update210to211;
update211to220;
configure220;
+ update220to230;
;;
2.1rc1*)
@@ -194,6 +218,7 @@
update210to211;
update211to220;
configure220;
+ update220to230;
;;
*)
@@ -368,6 +393,12 @@
rm -rf /usr/share/lams2/lams_tool_spreadsheet
rm -rf /usr/share/lams2/lams_tool_wiki
rm -rf /usr/share/lams2/repository
+ rm -f /usr/share/lams2/2.2.0to2.3.0.sql
+ rm -rf /usr/share/lams2/lams_tool_assessment
+ rm -rf /usr/share/lams2/lams_tool_images
+ rm -rf /usr/share/lams2/lams_tool_mindmap
+ rm -rf /usr/share/lams2/lams_tool_pixlr
+ rm -rf /usr/share/lams2/lams_tool_videorecorder
# Delete default ROOT.war/index.html (replaced with redirecting index.jsp)
rm -f /usr/share/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/index.html