Index: TestHarness4LAMS2/build.xml =================================================================== diff -u -rab797fdb1d9f3757da90c49fcebd80dcee7612b1 -r088dbcf441a1443c55042ca298850077bdee7028 --- TestHarness4LAMS2/build.xml (.../build.xml) (revision ab797fdb1d9f3757da90c49fcebd80dcee7612b1) +++ TestHarness4LAMS2/build.xml (.../build.xml) (revision 088dbcf441a1443c55042ca298850077bdee7028) @@ -7,16 +7,16 @@ - - + + - + @@ -26,9 +26,9 @@ - + - + Index: lams_build/build.xml =================================================================== diff -u -r53c8b3bb88b99845e5698fb419110b4064f332c3 -r088dbcf441a1443c55042ca298850077bdee7028 --- lams_build/build.xml (.../build.xml) (revision 53c8b3bb88b99845e5698fb419110b4064f332c3) +++ lams_build/build.xml (.../build.xml) (revision 088dbcf441a1443c55042ca298850077bdee7028) @@ -4,7 +4,6 @@ - @@ -38,57 +37,57 @@ ${ant.project.name}: Removing cache and build folders - - - + + + ${ant.project.name}: Creating build dir structure - + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -97,89 +96,89 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MANUALLY COPY TAGS TO UNLISTED PROJECTS: Kaltura and other public and private tools Copying embedded MySQL drivers to library dir, if available - + - + Building LAMS core projects - - - - - - - - + + + + + + + + Copying LAMS core projects' JARs to lams_build/lib/lams - - - - - - - + + + + + + + ${ant.project.name}: Copying libraries - - + + @@ -207,47 +206,47 @@ - - - - - - - - - - - + + + + + + + + + + + Copying lams-central.war - - + + Expanding lams-www.war - Copying language files - - - - - - - - + + + + + + + + Copying EAR configuration files - + - - + + @@ -256,8 +255,8 @@ - - + + @@ -266,9 +265,9 @@ Deploying EAR - - - + + + @@ -277,49 +276,49 @@ description="Deploys EAR file to the win_installer directory."> Deploying EAR to Windows Installer dir - - + + Deploying minimal set of Tools - - + + Deploying Tools - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -331,20 +330,20 @@ - + - + - + - - + + @@ -370,7 +369,7 @@ - + @@ -387,7 +386,7 @@ dbPassword="${db.password}" dbUsername="${db.username}" dbDriverUrl="${db.url.build}" - dbDriverClass="${db.driver}" + dbDriverClass="com.mysql.jdbc.Driver" /> Deploying language files @@ -429,64 +428,76 @@ ${ant.project.name}: Deploying additional JARs and configuration files - - + + + - + - - + + + + + + + + + + + + + - + - - + + - + - - + + - - + + - - + + - - + + - - + + @@ -502,8 +513,8 @@ - - + + @@ -533,8 +544,8 @@ - - + + @@ -552,34 +563,34 @@ - - + + - - + + - - + + - - + + - + @@ -588,7 +599,7 @@ - + @@ -597,7 +608,7 @@ - + @@ -634,7 +645,7 @@ - + @@ -643,18 +654,18 @@ - - - - + + + + + tofile="${jboss.home}server/default/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml"/> + tofile="${jboss.home}server/default/deployers/jbossweb.deployer/web.xml"/> - + @@ -681,7 +692,7 @@ - + @@ -697,11 +708,11 @@ - + - + @@ -762,7 +773,7 @@ - + Index: lams_build/build_base.xml =================================================================== diff -u -r55650cc19c4e12b1c5c293646d7fe9ccf5f57f92 -r088dbcf441a1443c55042ca298850077bdee7028 --- lams_build/build_base.xml (.../build_base.xml) (revision 55650cc19c4e12b1c5c293646d7fe9ccf5f57f92) +++ lams_build/build_base.xml (.../build_base.xml) (revision 088dbcf441a1443c55042ca298850077bdee7028) @@ -18,16 +18,16 @@ - + - + - + - + @@ -38,7 +38,7 @@ - + @@ -97,25 +97,25 @@ ${ant.project.name}: Removing cache and build folders - - - + + + ${ant.project.name}: Creating build dir structure - - - - - - + + + + + + ${ant.project.name}: Copying tags from Central - - + @@ -126,13 +126,13 @@ - + encoding="utf8"> - + @@ -147,18 +147,18 @@ ${ant.project.name}: Compiling Java sources + destdir="${basedir}/build/classes/java"> ${ant.project.name}: Copying additional non-Java sources - + @@ -185,21 +185,21 @@ --> ${ant.project.name}: Building XML files using XDoclet - + - + Overwriting generated code with custom files for ${ant.project.name}, if exist - - + + @@ -218,15 +218,15 @@ ${ant.project.name}: Building Hibernate XML files using XDoclet - + ${ant.project.name}: Copying static Hibernate XML files - - + + @@ -240,8 +240,8 @@ ${ant.project.name}: Copying language files to build dir - - + + @@ -251,7 +251,7 @@ ${ant.project.name}: Preparing manifest - + @@ -266,9 +266,9 @@ ${ant.project.name}: Building JAR - - + + @@ -277,10 +277,10 @@ depends="_build-webdoclet, _build-manifest, _copy-language, _jsp-plaincopy, _jsp-precompile"> ${ant.project.name}: Building WAR - - + + @@ -296,17 +296,17 @@ ${ant.project.name}: Deploying JAR - + ${ant.project.name}: Deploying WAR - + Copying language files for ${ant.project.name}, if exist - - + + @@ -316,8 +316,8 @@ - - + + @@ -330,12 +330,12 @@ ${ant.project.name}: Enable module in EAR config files - - - + ${ant.project.name}: Renaming existing WAR - + ${ant.project.name}: Exploding WAR to folder - + ${ant.project.name}: Removing temporary WAR - + @@ -364,7 +364,7 @@ Overwriting deployed ${ant.project.name} web files with source files - + @@ -374,10 +374,10 @@ ${ant.project.name}: Removing WAR folder - + Removing temporary WAR for ${ant.project.name}, if exists - + @@ -393,7 +393,7 @@ ${ant.project.name}: Copying web files for building - + @@ -410,10 +410,10 @@ - + - + @@ -425,9 +425,9 @@ ${ant.project.name}: Generating Java source files from JSP pages - ${ant.project.name}: Compiling JSP classes - - - + + @@ -458,8 +458,8 @@ ${ant.project.name}: Copying compiled and remaining web resources - - + + @@ -475,7 +475,7 @@ ${ant.project.name}: Copying additional libraries - + @@ -491,8 +491,8 @@ Copying web resources - - + + @@ -508,7 +508,7 @@ ${ant.project.name}: Copying additional libraries - + Index: lams_build/build_tools_base.xml =================================================================== diff -u -rcb69f2265bc2857b84eb7c06039b1c14658cce86 -r088dbcf441a1443c55042ca298850077bdee7028 --- lams_build/build_tools_base.xml (.../build_tools_base.xml) (revision cb69f2265bc2857b84eb7c06039b1c14658cce86) +++ lams_build/build_tools_base.xml (.../build_tools_base.xml) (revision 088dbcf441a1443c55042ca298850077bdee7028) @@ -14,7 +14,7 @@ - + @@ -71,12 +71,12 @@ ${ant.project.name}: Preparing Hibernate connection configuration - - + + - + @@ -85,13 +85,13 @@ ${ant.project.name}: Running schema export for all hbm.xml files in build dir - + @@ -116,14 +116,14 @@ ${ant.project.name}: Creating deployment package ${ant.project.name}: Copying additional libraries and scripts for deployment - - + + ${ant.project.name}: Copying Tool SQL files - + @@ -132,7 +132,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -152,16 +152,16 @@ ${ant.project.name}: Copying Tool language files - - + + ${ant.project.name}: Copying Tool JAR and WAR - - + + @@ -174,33 +174,33 @@ ${ant.project.name}: Preparing Deployment Properties file - + @@ -213,7 +213,7 @@ Deploying ${ant.project.name} package - + Index: lams_build/common.properties =================================================================== diff -u -re59bc835a5ec91886980d67af70c0f05a0f7ae73 -r088dbcf441a1443c55042ca298850077bdee7028 --- lams_build/common.properties (.../common.properties) (revision e59bc835a5ec91886980d67af70c0f05a0f7ae73) +++ lams_build/common.properties (.../common.properties) (revision 088dbcf441a1443c55042ca298850077bdee7028) @@ -17,16 +17,19 @@ # # http://www.gnu.org/licenses/gpl.txt -# project-wide properties -project=LAMS -project.version=2.1 - -conf.application=lams - # which o/s related property file do you want? valid values "windows" or "unix" osPropertiesName=windows -# ---- Tool information ---- +# To precompile JSP pages uncomment the property below +# jsp.precompile=anyvalue + +# these properties sometimes get altered in project's own properties file +src.java.dir=${basedir}/src/java +conf.web.dir=${basedir}/web +conf.dir=${basedir}/conf + +#======== TOOL PROPERTIES ========= + # Some properties come from Tool private build.properties file # They can also be overriden in that file, like in EAdventure Tool name=lams_tool_${signature} @@ -46,36 +49,20 @@ tool.build.sql.create=create_lams_tool_${tool.short.name}.sql tool.build.sql.drop=drop_lams_tool_${tool.short.name}.sql -# ---- END Tool information ---- +#======== END TOOL PROPERTIES ========= -# Directory where third party jars reside. -sharedlib=../lams_build/lib - -#deploy tool directory -deploy.tool.dir=../lams_build/deploy-tool - -#deploy tool directory -tag.web.dir=../lams_central/web/WEB-INF - - -#=========DATABASE PROPERTIES========== -db.driver.dir=${sharedlib}/mysql/ -db.driver=com.mysql.jdbc.Driver -db.name=${conf.application} -db.encoding=utf8 +#======== DATABASE PROPERTIES ========= +db.name=lams db.username=lams db.password=lamsdemo -db.scripts=${basedir}/db/sql -db.schema= -db.catalog= # db scripts -lamsconf.table.sql=insert_${conf.application}_${osPropertiesName}_config_data.sql +db.scripts=${basedir}/db/sql +lamsconf.table.sql=insert_lams_${osPropertiesName}_config_data.sql # Basedir of embedded MySQL server. This is also the place where data is stored. # Set it if you use MXJ for running and/or building LAMS. -# It should be ${contentrepository.base}/database but properties files import order does not allow it. -db.location=C:/${conf.application}/database +db.location=C:/lams/database # To build LAMS using standalone MySQL server, use properties below db.url.build=jdbc:mysql://localhost:3306/${db.name}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useUnicode=true @@ -94,60 +81,4 @@ # To run LAMS using embedded MySQL server, use properties below #db.url.run=jdbc:mysql:mxj://localhost:13306/${db.name} -#======END OF DATABASE PROPERTIES======= - -#xdoclet version number -xdoclet.version=1.2.3 - -#configuration files -conf.dir=${basedir}/conf -conf.xdoclet.dir=${conf.dir}/xdoclet -conf.middlegen.dir=${conf.dir}/middlegen -##Hibernate -conf.hibernate.dir=${conf.dir}/hibernate -conf.hibernate.mapping.dir=${conf.hibernate.dir}/mappings - -##WEB -conf.web.dir=${basedir}/web -conf.webinf.dir=${conf.web.dir}/WEB-INF -conf.struts.dir=${conf.webinf.dir}/struts - -##Language Files -# conf.language.dir is the directory containing all the language files for all the tools, learning, monitoring, etc. -conf.language.dir=${conf.dir}/language/${conf.application} - -# Build directory -build=${basedir}/build -build.classes.java=${build}/classes/java -build.lib=${build}/lib -build.report=${build}/report -build.web=${build}/web -build.deploy=${build}/deploy -build.deploy.sql=${build.deploy}/sql -build.deploy.language=${build.deploy}/language -build.sql=${build}/sql -build.war=${build}/war -build.war.assembly=${build.war}/assembly - -# Source directory under the current root -src.dir=${basedir}/src -src.java.dir=${src.dir}/java - -#JBoss deploy directory - see OS dependent properties file - -#middlegen properties -middlegen = ${conf.dir}/middlegen -middlegen.gui = true - -#web application properties -sessiontimeout=120 - -# are we generating the tool deploy packages for an upgrader. Normally this is false -generate.for.installers=false - -# Selenium properties -selenium.server.port=5555 - -# To precompile JSP pages uncomment the property below -# jsp.precompile=anyvalue - +#======== END DATABASE PROPERTIES ========= \ No newline at end of file Index: lams_build/unix.properties =================================================================== diff -u -rf964c1062c52d93be83ace1aa252b45deff63d5e -r088dbcf441a1443c55042ca298850077bdee7028 --- lams_build/unix.properties (.../unix.properties) (revision f964c1062c52d93be83ace1aa252b45deff63d5e) +++ lams_build/unix.properties (.../unix.properties) (revision 088dbcf441a1443c55042ca298850077bdee7028) @@ -17,12 +17,11 @@ # # http://www.gnu.org/licenses/gpl.txt -# Properties needed to run master-build. -# These are OS dependent properties, configured for various flavours -# of *nix. Named unix.properties for convenience - linuxunix.properties -# would have looked odd, as does otheros.properties. +# Properties needed to build LAMS. +# These are OS dependent properties, configured for various flavours of *nix. +# Named unix.properties for convenience. # -# Instead of changing contentrepository.base and jboss.home here +# Instead of changing properties here # you can create a new file build.properties for just two of them. # That file is added to .cvsignore, so you will not be asked to commit it. # That file is imported just before current file @@ -31,21 +30,7 @@ # If build.properties is missing or, in some projects, is not imported before ${osPropertiesName}.properties # entries will be taken from current file. -conf=${basedir}/conf/unix -conf.jboss=${conf}/jboss +contentrepository.base=/var/opt/lams -contentrepository.base=/var/opt/${conf.application} -contentrepository.directory=${contentrepository.base}/repository - #JBoss deploy directory (Unix) -jboss.home=/usr/local/jboss-5.1/ -jboss.server=${jboss.home}server/ -jboss.server.instance=${jboss.server}default -jboss.server.instance.lib=${jboss.server.instance}/lib -jboss.ear.deploy=${jboss.server.instance}/deploy -jboss.ear.deployers=${jboss.server.instance}/deployers -jboss.deploy=${jboss.ear.deploy}/${conf.application}.ear - -j2eelibs=${jboss.home}/common/lib -jbosslibs=${jboss.home}/lib -jbossweblibs=${jboss.ear.deploy}/jbossweb.sar \ No newline at end of file +jboss.home=/usr/local/jboss-5.1/ \ No newline at end of file Index: lams_build/windows.properties =================================================================== diff -u -r5cc32acff39143d84260e320d6e151b4463a164a -r088dbcf441a1443c55042ca298850077bdee7028 --- lams_build/windows.properties (.../windows.properties) (revision 5cc32acff39143d84260e320d6e151b4463a164a) +++ lams_build/windows.properties (.../windows.properties) (revision 088dbcf441a1443c55042ca298850077bdee7028) @@ -17,10 +17,10 @@ # # http://www.gnu.org/licenses/gpl.txt -# Properties needed to run master-build. -# These are OS dependent properties, configured for windows +# Properties needed to build LAMS. +# These are OS dependent properties, configured for windows. # -# Instead of changing contentrepository.base and jboss.home here +# Instead of changing properties here # you can create a new file build.properties for just two of them. # That file is added to .cvsignore, so you will not be asked to commit it. # That file is imported just before current file @@ -29,21 +29,7 @@ # If build.properties is missing or, in some projects, is not imported before ${osPropertiesName}.properties # entries will be taken from current file. -conf=${basedir}/conf/windows -conf.jboss=${conf}/jboss +contentrepository.base=C:/lams -contentrepository.base=C:/${conf.application} -contentrepository.directory=${contentrepository.base}/repository - #JBoss deploy directory (Windows) -jboss.home=D:/jboss-5/ -jboss.server=${jboss.home}server/ -jboss.server.instance=${jboss.server}default -jboss.server.instance.lib=${jboss.server.instance}/lib -jboss.ear.deploy=${jboss.server.instance}/deploy -jboss.ear.deployers=${jboss.server.instance}/deployers -jboss.deploy=${jboss.ear.deploy}/${conf.application}.ear - -j2eelibs=${jboss.home}/common/lib -jbosslibs=${jboss.home}/lib -jbossweblibs=${jboss.ear.deploy}/jbossweb.sar \ No newline at end of file +jboss.home=D:/jboss-5/ \ No newline at end of file Index: lams_central/build.xml =================================================================== diff -u -r3a95b6e5a65bc77a5f4a3a9a011e452aebf30a3f -r088dbcf441a1443c55042ca298850077bdee7028 --- lams_central/build.xml (.../build.xml) (revision 3a95b6e5a65bc77a5f4a3a9a011e452aebf30a3f) +++ lams_central/build.xml (.../build.xml) (revision 088dbcf441a1443c55042ca298850077bdee7028) @@ -5,30 +5,28 @@ - - - + Copying Pedagogical Planner files - + ${ant.project.name}: Copying favicon from conf to assembly - - + + ${ant.project.name}: Copying Flash files from conf to assembly - - + + @@ -40,16 +38,16 @@ ${ant.project.name}: Building exploded WAR - - + + - + - - + + @@ -59,27 +57,27 @@ Removing cached files - - + + ${ant.project.name}: Deploying exploded WAR - - + + ${ant.project.name}: Copying language files - - + + Building LAMS Tag Library using XDoclet - + Index: lams_common/build.xml =================================================================== diff -u -rff01a6c237cefc4a5186889bf46041152cfc37ae -r088dbcf441a1443c55042ca298850077bdee7028 --- lams_common/build.xml (.../build.xml) (revision ff01a6c237cefc4a5186889bf46041152cfc37ae) +++ lams_common/build.xml (.../build.xml) (revision 088dbcf441a1443c55042ca298850077bdee7028) @@ -2,7 +2,7 @@ - + ${ant.project.name}: Building main JAR - - + + ${ant.project.name}: Building Session JAR - - + + ${ant.project.name}: Building Valve JAR - - + + @@ -73,8 +73,8 @@ Deploying library JARs - - + + @@ -87,7 +87,7 @@ Rebuilding LAMS database - + @@ -98,28 +98,28 @@ - + Executing SQL scripts - + encoding="utf8"> - + - + - + - + Index: lams_tool_deploy/build.xml =================================================================== diff -u -rab797fdb1d9f3757da90c49fcebd80dcee7612b1 -r088dbcf441a1443c55042ca298850077bdee7028 --- lams_tool_deploy/build.xml (.../build.xml) (revision ab797fdb1d9f3757da90c49fcebd80dcee7612b1) +++ lams_tool_deploy/build.xml (.../build.xml) (revision 088dbcf441a1443c55042ca298850077bdee7028) @@ -8,7 +8,7 @@ - + @@ -19,16 +19,16 @@ - + - + - + @@ -39,8 +39,8 @@ ${ant.project.name}: Creating build dir structure - - + + @@ -49,19 +49,19 @@ ${ant.project.name}: Compiling Java sources ${ant.project.name}: Copying additional non-Java sources - + @@ -73,12 +73,12 @@ ${ant.project.name}: Building JAR - + - + \ No newline at end of file Index: lams_tool_pixlr/build.xml =================================================================== diff -u -re59bc835a5ec91886980d67af70c0f05a0f7ae73 -r088dbcf441a1443c55042ca298850077bdee7028 --- lams_tool_pixlr/build.xml (.../build.xml) (revision e59bc835a5ec91886980d67af70c0f05a0f7ae73) +++ lams_tool_pixlr/build.xml (.../build.xml) (revision 088dbcf441a1443c55042ca298850077bdee7028) @@ -8,8 +8,8 @@ description="Build Tool archives and run deployment. Do not run on a production environment."> - - + + Index: lams_www/build.xml =================================================================== diff -u -rf8b1d5b522b710444cc28100c5cabdff832a7eff -r088dbcf441a1443c55042ca298850077bdee7028 --- lams_www/build.xml (.../build.xml) (revision f8b1d5b522b710444cc28100c5cabdff832a7eff) +++ lams_www/build.xml (.../build.xml) (revision 088dbcf441a1443c55042ca298850077bdee7028) @@ -8,20 +8,20 @@ ${ant.project.name}: Copying additional resources for WAR - - + + - - + + - - + + @@ -33,10 +33,10 @@ _jsp-plaincopy, _jsp-precompile"> ${ant.project.name}: Building WAR - - + +