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