Index: debian_installer/.cvsignore
===================================================================
RCS file: /usr/local/cvsroot/debian_installer/.cvsignore,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ debian_installer/.cvsignore 7 May 2009 17:49:27 -0000 1.1
@@ -0,0 +1 @@
+build
Index: debian_installer/README
===================================================================
RCS file: /usr/local/cvsroot/debian_installer/README,v
diff -u -r1.5 -r1.6
--- debian_installer/README 6 Jan 2009 02:47:37 -0000 1.5
+++ debian_installer/README 7 May 2009 17:47:42 -0000 1.6
@@ -8,7 +8,7 @@
-------------
* a Debian or Debian based system
* packages:
- * dh_make
+ * dh-make
* dpkg-dev
* debconf
* debhelper
@@ -41,20 +41,21 @@
2. set lams_build to 'unix', and the path to your jboss folder
3. create the lams database and lams/lamsdemo user with access to it
4. do a full build (ant rebuild-db; ant assemble-ear; ant deploy-ear;
- ant deploy-tools; ant copyfiles)
+ ant deploy-tools; ant copyfiles); include dimdim tool and any others
+ that should be included but are not in the main build
5. cd /path/to/packaging/
6. mkdir lams2-2.1rc1 (adjust the version as necessary)
7. cd lams2-2.1rc1
8. cp -pr /path/to/jboss-4.0.2/server/default/deploy/lams.ear/ .
9. cp -pr /path/to/lams_build/conf/unix/jboss/ .
-10. mysqldump lams > lams.sql -u root -p
-11. copy index.jsp and lams2.cnf from this cvs project into the current directory
-12. dh_make --createorig
-13. rm -rf debian
-14. copy the debian folder from this cvs project into the current directory
-15. sudo dpkg-buildpackage -S -sa (add '-kxxxxxxxx' if you have a gpg key to sign
+10. mysqldump lams > lams.sql -u root -p
+11. update debian/files, debian/changelog and debian/postinst and others if
+ necessary
+12. copy index.jsp, lams2.cnf and other packaged files from this cvs project
+ into the current directory
+13. sudo dpkg-buildpackage -S -sa (add '-kxxxxxxxx' if you have a gpg key to sign
it) - this will create a source package in the parent folder
-16. sudo dpkg-buildpackage -b (add '-kxxxxxxxx' if you want to sign it) - this
+14. sudo dpkg-buildpackage -b (add '-kxxxxxxxx' if you want to sign it) - this
will create the binary .deb in the parent folder
Index: debian_installer/build.properties
===================================================================
RCS file: /usr/local/cvsroot/debian_installer/build.properties,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ debian_installer/build.properties 7 May 2009 17:49:27 -0000 1.1
@@ -0,0 +1,3 @@
+version=2.3.0
+build_dir=build/lams2-${version}
+lams_build=/home/jliew/lams_build
Index: debian_installer/build.xml
===================================================================
RCS file: /usr/local/cvsroot/debian_installer/build.xml,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ debian_installer/build.xml 7 May 2009 17:49:27 -0000 1.1
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: debian_installer/lams2/debian/changelog
===================================================================
RCS file: /usr/local/cvsroot/debian_installer/lams2/debian/changelog,v
diff -u -r1.3 -r1.4
--- debian_installer/lams2/debian/changelog 4 Dec 2008 02:18:23 -0000 1.3
+++ debian_installer/lams2/debian/changelog 7 May 2009 17:47:43 -0000 1.4
@@ -1,3 +1,9 @@
+lams2 (2.3.0-1) unstable; urgency=low
+
+ * update to 2.3
+
+ -- LAMS Development Team Thu, 07 May 2009 14:32:00 +0200
+
lams2 (2.2.0-1) unstable; urgency=low
* update to 2.2
Index: debian_installer/lams2/debian/files
===================================================================
RCS file: /usr/local/cvsroot/debian_installer/lams2/debian/files,v
diff -u -r1.2 -r1.3
--- debian_installer/lams2/debian/files 4 Dec 2008 02:18:23 -0000 1.2
+++ debian_installer/lams2/debian/files 7 May 2009 17:47:43 -0000 1.3
@@ -1 +1 @@
-lams2_2.2.0-1_all.deb contrib/web extra
+lams2_2.3.0-1_all.deb contrib/web extra
Index: debian_installer/lams2/debian/postinst
===================================================================
RCS file: /usr/local/cvsroot/debian_installer/lams2/debian/postinst,v
diff -u -r1.4 -r1.5
--- debian_installer/lams2/debian/postinst 4 Dec 2008 02:18:23 -0000 1.4
+++ debian_installer/lams2/debian/postinst 7 May 2009 17:47:43 -0000 1.5
@@ -17,6 +17,29 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
+update220to230 () {
+ # 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
+
+ # 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
+
+ # 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
+}
+
configure220 () {
# Configure 2.2 tools; need to run after above tools have been deployed
if [ "$db_root_pass" != "" ] ; then
@@ -148,11 +171,16 @@
sed -i -e "s/port=\"8080\"/port=\"$server_port\"/" server.xml
case "$2" in
+ 2.2.0*)
+ update;
+ ;;
+
2.1.1*)
update;
update211to220;
configure220;
;;
+
2.1.0*)
update;
update210to211;