Index: unix_installer/installer-package/.cvsignore =================================================================== RCS file: /usr/local/cvsroot/unix_installer/installer-package/.cvsignore,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ unix_installer/installer-package/.cvsignore 13 Mar 2008 05:58:55 -0000 1.1 @@ -0,0 +1,5 @@ +*.swp +build +build/* +assembly +assembly/* \ No newline at end of file Index: unix_installer/installer-package/build.xml =================================================================== RCS file: /usr/local/cvsroot/unix_installer/installer-package/build.xml,v diff -u -r1.2 -r1.3 --- unix_installer/installer-package/build.xml 11 Jul 2007 01:46:40 -0000 1.2 +++ unix_installer/installer-package/build.xml 13 Mar 2008 05:58:55 -0000 1.3 @@ -1,9 +1,9 @@ - + - - + + @@ -64,10 +64,23 @@ + + @@ -79,3 +92,4 @@ + Index: unix_installer/installer-package/install-lams.sh =================================================================== RCS file: /usr/local/cvsroot/unix_installer/installer-package/install-lams.sh,v diff -u -r1.7 -r1.8 Binary files differ Index: unix_installer/installer-package/lams.properties =================================================================== RCS file: /usr/local/cvsroot/unix_installer/installer-package/lams.properties,v diff -u -r1.2 -r1.3 --- unix_installer/installer-package/lams.properties 25 Jun 2007 05:30:10 -0000 1.2 +++ unix_installer/installer-package/lams.properties 13 Mar 2008 05:58:55 -0000 1.3 @@ -1,4 +1,4 @@ -# Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +# Copyright (C) 2008 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 @@ -37,8 +37,8 @@ # Database name, username and password for your LAMS database -DB_NAME=lams -DB_USER=lams +DB_NAME=lams2 +DB_USER=lamsuser DB_PASS=lamsdemo @@ -71,7 +71,7 @@ JBOSS_DIR=/usr/local/jboss-4.0.2 # The directory that contains your JDK. (Must be 1.5 or higher) -JDK_DIR=/usr/bin/java/jdk1.6.0_01/ +JDK_DIR=/usr/bin/java/jdk1.5.0_11/ # The location of your mysql executable (Must be 5.0 or higher) SQL_DIR=/usr/bin Index: unix_installer/installer-package/license =================================================================== RCS file: /usr/local/cvsroot/unix_installer/installer-package/license,v diff -u -r1.2 -r1.3 Binary files differ Index: unix_installer/installer-package/readme =================================================================== RCS file: /usr/local/cvsroot/unix_installer/installer-package/readme,v diff -u -r1.3 -r1.4 Binary files differ Index: unix_installer/installer-package/ant-scripts/.configure-deploy.xml.swp =================================================================== RCS file: /usr/local/cvsroot/unix_installer/installer-package/ant-scripts/Attic/.configure-deploy.xml.swp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ unix_installer/installer-package/ant-scripts/.configure-deploy.xml.swp 13 Mar 2008 05:58:56 -0000 1.1 @@ -0,0 +1,16 @@ +b0VIM 7.0��Fj�Qorootlfoxton~root/2.1-Beta/unix_installer/installer-package/ant-scripts/configure-deploy.xmlutf-8 +U3210#"! Utp�Yad �Y�����,���d$� +� +~ +t +r +g +f + +� { Y 1  � � � � � y x O -   � +� +z +D +4 +* +� � � � } |  �����V. ������E�����Z:+!���d@���������UTJ;�����@? \ No newline at end of file Index: unix_installer/installer-package/ant-scripts/configure-deploy.xml =================================================================== RCS file: /usr/local/cvsroot/unix_installer/installer-package/ant-scripts/configure-deploy.xml,v diff -u -r1.2 -r1.3 --- unix_installer/installer-package/ant-scripts/configure-deploy.xml 28 Jun 2007 00:37:03 -0000 1.2 +++ unix_installer/installer-package/ant-scripts/configure-deploy.xml 13 Mar 2008 05:58:56 -0000 1.3 @@ -30,15 +30,6 @@ - - - - - - - - - Index: unix_installer/installer-package/ant-scripts/version.properties =================================================================== RCS file: /usr/local/cvsroot/unix_installer/installer-package/ant-scripts/version.properties,v diff -u -r1.2 -r1.3 --- unix_installer/installer-package/ant-scripts/version.properties 28 Jun 2007 00:37:03 -0000 1.2 +++ unix_installer/installer-package/ant-scripts/version.properties 13 Mar 2008 05:58:56 -0000 1.3 @@ -1,5 +1,5 @@ # Version identifiers for this installer -LAMS_VERSION=2.0.4 -SERVER_VERSION=2.0.4.200706211047 -LANG_VERSION=2007-06-01 +LAMS_VERSION=2.1-RC1 +SERVER_VERSION=2.0.100.200803121637 +LANG_VERSION=2008-03-12 Index: unix_installer/installer-package/conf/j2ee/application.xml =================================================================== RCS file: /usr/local/cvsroot/unix_installer/installer-package/conf/j2ee/application.xml,v diff -u -r1.1 -r1.2 --- unix_installer/installer-package/conf/j2ee/application.xml 10 May 2007 04:29:37 -0000 1.1 +++ unix_installer/installer-package/conf/j2ee/application.xml 13 Mar 2008 05:58:55 -0000 1.2 @@ -1,9 +1,7 @@ - - - + LAMS - Learning Activty Management System + Learning Activity Management System @@ -112,6 +110,9 @@ commons-fileupload.jar + commons-io-1.4.jar + + commons-lang-2.0.jar @@ -224,15 +225,4 @@ - - + lams-tool-lafrum11.war/lams/tool/lafrum11lams-tool-lanb11.war/lams/tool/lanb11lams-tool-laqa11.war/lams/tool/laqa11lams-tool-lasbmt11.war/lams/tool/lasbmt11lams-tool-lachat11.war/lams/tool/lachat11lams-tool-larsrc11.war/lams/tool/larsrc11lams-tool-lavote11.war/lams/tool/lavote11lams-tool-lantbk11.war/lams/tool/lantbk11lams-tool-lasurv11.war/lams/tool/lasurv11lams-tool-lascrb11.war/lams/tool/lascrb11lams-tool-lamc11.war/lams/tool/lamc11 \ No newline at end of file Index: unix_installer/installer-package/conf/unix/jboss/.log4j.xml.swp =================================================================== RCS file: /usr/local/cvsroot/unix_installer/installer-package/conf/unix/jboss/Attic/.log4j.xml.swp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ unix_installer/installer-package/conf/unix/jboss/.log4j.xml.swp 13 Mar 2008 05:58:56 -0000 1.1 @@ -0,0 +1,39 @@ +b0VIM 7.1�q�G���?danorion~dan/LAMS_2.1_RC/unix_installer/installer-package/conf/unix/jboss/log4j.xml +3210#"! Utp�[����U\����p�����B!ad �[���W�j� +� +� +� +Z +U +T + + +� � y x J � � d ;   � +� +� +� +J +B +A + +� { z * �����{+��pB��kXJDC���{1���S�����yxF��xXIBA��� --> --> --> | owebsite: http://jakarta.apache.org/log4j | For more configuration infromation and examples see the Jakarta Log4jad��B����qn!����wSD@� +� +� +� +� +f +B +3 +/ +, +% +$ +# + +� � � � � j _ ^ ? � � � u , � +� +� +Z +Y +$ +� � � � � _ P .  ������� --> org.jboss.ha categories to a cluster.log file. --> \ No newline at end of file Index: unix_installer/installer-package/conf/unix/jboss/log4j.xml =================================================================== RCS file: /usr/local/cvsroot/unix_installer/installer-package/conf/unix/jboss/log4j.xml,v diff -u -r1.3 -r1.4 --- unix_installer/installer-package/conf/unix/jboss/log4j.xml 25 Jun 2007 05:30:10 -0000 1.3 +++ unix_installer/installer-package/conf/unix/jboss/log4j.xml 13 Mar 2008 05:58:56 -0000 1.4 @@ -36,10 +36,10 @@ - + @@ -53,7 +53,7 @@ - + --> @@ -69,7 +69,7 @@ - + @@ -96,7 +96,7 @@ - + --> @@ -154,7 +154,7 @@ - + @@ -166,15 +166,15 @@ - + - + @@ -185,7 +185,7 @@ - + @@ -195,6 +195,12 @@ + + + + + + @@ -218,7 +224,7 @@ - + Index: unix_installer/installer-package/conf/unix/jboss/login-config.xml =================================================================== RCS file: /usr/local/cvsroot/unix_installer/installer-package/conf/unix/jboss/login-config.xml,v diff -u -r1.3 -r1.4 --- unix_installer/installer-package/conf/unix/jboss/login-config.xml 25 Jun 2007 05:30:10 -0000 1.3 +++ unix_installer/installer-package/conf/unix/jboss/login-config.xml 13 Mar 2008 05:58:56 -0000 1.4 @@ -150,13 +150,13 @@ - + - - java:/MySqlDS + + java:/jdbc/lams-ds select password from lams_user where login=? - SELECT DISTINCT r.name,'Roles' FROM + 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) @@ -166,14 +166,6 @@ - - - - @confdir@/lamsauthentication.xml - - - - Index: unix_installer/installer-package/database/lams.dump =================================================================== RCS file: /usr/local/cvsroot/unix_installer/installer-package/database/Attic/lams.dump,v diff -u -r1.2 -r1.3 Binary files differ