Index: lams_build/common.properties
===================================================================
diff -u -r958ff334a0e0eefe817c84e80d6d87551ab43243 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_build/common.properties	(.../common.properties)	(revision 958ff334a0e0eefe817c84e80d6d87551ab43243)
+++ lams_build/common.properties	(.../common.properties)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -42,21 +42,44 @@
 #deploy tool directory
 tag.web.dir=../lams_central/web/WEB-INF
 
-#database access
-db.name=${conf.application}
+
+#=========DATABASE PROPERTIES==========
+db.driver.dir=${sharedlib}/mysql/
 db.driver=com.mysql.jdbc.Driver
-db.url=jdbc:mysql://localhost/${db.name}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useUnicode=true
+db.name=${conf.application}
 db.encoding=utf8
 db.username=lams
 db.password=lamsdemo
-db.driver.jar=${sharedlib}/mysql/mysql-connector-java-5.0.8-bin.jar
 db.scripts=${basedir}/db/sql
 db.schema=
 db.catalog=
-
 # db scripts
 lamsconf.table.sql=insert_${conf.application}_${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.
+db.location=C:/${conf.application}/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
+db.url.init.build=${db.url.build}
+
+# To build LAMS using embedded MySQL server, use properties below
+# If you build LAMS this way, you will also need to run it using the embedded server.
+# db.config.build configuration is a replacement for my.ini and it's optional. If left blank, server defaults will be used.
+#db.config.build=&server.skip-external-locking&server.key_buffer_size=16K&server.max_allowed_packet=1M&server.table_open_cache=4&server.sort_buffer_size=64K&server.read_buffer_size=256K&server.read_rnd_buffer_size=257K&server.net_buffer_length=2K&server.thread_stack=128K
+#db.url.build=jdbc:mysql:mxj://localhost:13306/${db.name}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useUnicode=true&server.basedir=${db.location}${db.config.build}
+#db.url.init.build=${db.url.build}&server.initialize-user=true&createDatabaseIfNotExist=true
+
+# To run LAMS using standalone MySQL server, use properties below
+db.url.run=jdbc:mysql://localhost:3306/${db.name}
+
+# 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