Index: lams_build/.cvsignore
===================================================================
diff -u -rce672e981bbeed1c7f0604ced460e1f595af4094 -r0fe1d551dedcd1a3c8e95e373ebde505214e7381
--- lams_build/.cvsignore	(.../.cvsignore)	(revision ce672e981bbeed1c7f0604ced460e1f595af4094)
+++ lams_build/.cvsignore	(.../.cvsignore)	(revision 0fe1d551dedcd1a3c8e95e373ebde505214e7381)
@@ -1 +1,2 @@
-assembly
\ No newline at end of file
+assembly
+build.properties
Index: lams_build/build.xml
===================================================================
diff -u -r73963b896de9269e9c4e5a5c229159588eb18c75 -r0fe1d551dedcd1a3c8e95e373ebde505214e7381
--- lams_build/build.xml	(.../build.xml)	(revision 73963b896de9269e9c4e5a5c229159588eb18c75)
+++ lams_build/build.xml	(.../build.xml)	(revision 0fe1d551dedcd1a3c8e95e373ebde505214e7381)
@@ -5,6 +5,7 @@
 	<!-- Import properties from the shared and o/s specific files -->
 	<property file="common.properties" />
 	<property file="shared.properties" />
+	<property file="build.properties"/>
 	<property file="${osPropertiesName}.properties" />
 	
 	
Index: lams_build/build_base.xml
===================================================================
diff -u -ra4b680f9e319f4444e78efde6cf9f047f94be47d -r0fe1d551dedcd1a3c8e95e373ebde505214e7381
--- lams_build/build_base.xml	(.../build_base.xml)	(revision a4b680f9e319f4444e78efde6cf9f047f94be47d)
+++ lams_build/build_base.xml	(.../build_base.xml)	(revision 0fe1d551dedcd1a3c8e95e373ebde505214e7381)
@@ -13,6 +13,7 @@
 	 <property file="build.properties" />
 	 <!-- Import common property files; base dir for this is the current file -->
 	 <property file="${base.dir}/common.properties"/>
+	 <property file="${base.dir}/build.properties"/>
 	 <property file="${base.dir}/${osPropertiesName}.properties"/>
  
 	
Index: lams_build/common.properties
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r0fe1d551dedcd1a3c8e95e373ebde505214e7381
--- lams_build/common.properties	(.../common.properties)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_build/common.properties	(.../common.properties)	(revision 0fe1d551dedcd1a3c8e95e373ebde505214e7381)
@@ -76,6 +76,7 @@
 
 # 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
 
 # To build LAMS using standalone MySQL server, use properties below
Index: lams_build/unix.properties
===================================================================
diff -u -r532468b83582c03fdaa89c2265e73acfc17c0af0 -r0fe1d551dedcd1a3c8e95e373ebde505214e7381
--- lams_build/unix.properties	(.../unix.properties)	(revision 532468b83582c03fdaa89c2265e73acfc17c0af0)
+++ lams_build/unix.properties	(.../unix.properties)	(revision 0fe1d551dedcd1a3c8e95e373ebde505214e7381)
@@ -21,19 +21,29 @@
 # 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.
+#
+# Instead of changing contentrepository.base and jboss.home 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
+# and its entries will take precendence over ones here
+# because entries defined later are ignored.
+# 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.directory=/var/opt/${conf.application}/repository
+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.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
+j2eelibs=${jboss.home}/common/lib
\ No newline at end of file
Index: lams_build/windows.properties
===================================================================
diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -r0fe1d551dedcd1a3c8e95e373ebde505214e7381
--- lams_build/windows.properties	(.../windows.properties)	(revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077)
+++ lams_build/windows.properties	(.../windows.properties)	(revision 0fe1d551dedcd1a3c8e95e373ebde505214e7381)
@@ -19,19 +19,29 @@
 
 # Properties needed to run master-build. 
 # These are OS dependent properties, configured for windows
+#
+# Instead of changing contentrepository.base and jboss.home 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
+# and its entries will take precendence over ones here
+# because entries defined later are ignored.
+# 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.directory=C:/${conf.application}/repository
+contentrepository.base=C:/${conf.application}
+contentrepository.directory=${contentrepository.base}/repository
 
 #JBoss deploy directory (Windows)
-jboss.home=D:/jboss-5/
+jboss.home=D:/Praca/Australia/jboss-5-jdk6/
 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.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
\ No newline at end of file
Index: lams_common/build.xml
===================================================================
diff -u -r16671a4b734fd33aa83ffdaddba82a4830f32b72 -r0fe1d551dedcd1a3c8e95e373ebde505214e7381
--- lams_common/build.xml	(.../build.xml)	(revision 16671a4b734fd33aa83ffdaddba82a4830f32b72)
+++ lams_common/build.xml	(.../build.xml)	(revision 0fe1d551dedcd1a3c8e95e373ebde505214e7381)
@@ -85,8 +85,12 @@
                 <include name="create_lams_11_db.sql" />
 			</fileset>
 	        <filterset>
-	            <filter token="datetimestamp" value="${DSTAMP}${TSTAMP}"/>
-                    <filter token="dbname" value="${db.name}"/>
+	            <filter token="datetimestamp" value="${DSTAMP}${TSTAMP}" />
+                <filter token="dbname" value="${db.name}" />
+	        	<filter token="contentrepository.directory" value="${contentrepository.directory}" />
+                <filter token="temp.directory" value="${contentrepository.base}/temp" />
+                <filter token="dump.directory" value="${contentrepository.base}/dump" />
+	        	<filter token="ear.directory" value="${jboss.deploy}" />
 	        </filterset>
 		</copy>
 		
Index: lams_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
diff -u -r0d0d27e4286e4cd960528c281ea74102889b45e7 -r0fe1d551dedcd1a3c8e95e373ebde505214e7381
--- lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision 0d0d27e4286e4cd960528c281ea74102889b45e7)
+++ lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision 0fe1d551dedcd1a3c8e95e373ebde505214e7381)
@@ -1,5 +1,5 @@
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('ServerURL','http://137.111.246.19:8080/lams/', 'config.server.url', 'config.header.system', 'STRING', 1);
+values ('ServerURL','http://localhost:8080/lams/', 'config.server.url', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('ServerURLContextPath','lams/', 'config.server.url.context.path', 'config.header.system', 'STRING', 1);
@@ -8,13 +8,13 @@
 values ('Version','2.4', 'config.version', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('TempDir','/var/opt/lams/temp', 'config.temp.dir', 'config.header.system', 'STRING', 1);
+values ('TempDir','@temp.directory@', 'config.temp.dir', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('DumpDir','/var/opt/lams/dump', 'config.dump.dir', 'config.header.system', 'STRING', 1);
+values ('DumpDir','@dump.directory@', 'config.dump.dir', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('EARDir','/usr/local/jboss-5.1/server/default/deploy/lams.ear/', 'config.ear.dir', 'config.header.system', 'STRING', 1);
+values ('EARDir','@ear.directory@', 'config.ear.dir', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
 values ('EnableServerRegistration', 'false', 'config.server2server.registration.enable', 'config.header.system', 'BOOLEAN', 1);
@@ -29,7 +29,7 @@
 values ('LamsSupportEmail','', 'config.lams.support.email', 'config.header.email', 'STRING', 0);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('ContentRepositoryPath','/var/opt/lams/repository', 'config.content.repository.path', 'config.header.uploads', 'STRING', 1);
+values ('ContentRepositoryPath','@contentrepository.directory@', 'config.content.repository.path', 'config.header.uploads', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('UploadFileMaxSize','1048576', 'config.upload.file.max.size', 'config.header.uploads', 'LONG', 1);
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
diff -u -r0d0d27e4286e4cd960528c281ea74102889b45e7 -r0fe1d551dedcd1a3c8e95e373ebde505214e7381
--- lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision 0d0d27e4286e4cd960528c281ea74102889b45e7)
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision 0fe1d551dedcd1a3c8e95e373ebde505214e7381)
@@ -8,13 +8,13 @@
 values ('Version','2.4', 'config.version', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('TempDir','C:/lams/temp', 'config.temp.dir', 'config.header.system', 'STRING', 1);
+values ('TempDir','@temp.directory@', 'config.temp.dir', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('DumpDir','C:/lams/dump', 'config.dump.dir', 'config.header.system', 'STRING', 1);
+values ('DumpDir','@dump.directory@', 'config.dump.dir', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('EARDir','D:/jboss-5/server/default/deploy/lams.ear', 'config.ear.dir', 'config.header.system', 'STRING', 1);
+values ('EARDir','@ear.directory@', 'config.ear.dir', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('InternalSMTPServer','true', 'config.use.internal.smtp.server', 'config.header.email', 'BOOLEAN', 0);
@@ -26,7 +26,7 @@
 values ('LamsSupportEmail','', 'config.lams.support.email', 'config.header.email', 'STRING', 0);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('ContentRepositoryPath','C:/lams/repository', 'config.content.repository.path', 'config.header.uploads', 'STRING', 1);
+values ('ContentRepositoryPath','@contentrepository.directory@', 'config.content.repository.path', 'config.header.uploads', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('UploadFileMaxSize','1048576', 'config.upload.file.max.size', 'config.header.uploads', 'LONG', 1);
@@ -274,20 +274,20 @@
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('ProfilePartialEditEnable','true', 'config.profile.partial.edit.enable', 'config.header.features', 'BOOLEAN', 1);
 
-insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('KalturaServer','http://www.kaltura.com', 'config.kaltura.server', 'config.header.kaltura', 'STRING', 0);
 
-insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('KalturaPartnerId','1073272', 'config.kaltura.partner.id', 'config.header.kaltura', 'STRING', 0);
 
-insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('KalturaSubPartnerId','107327200', 'config.kaltura.sub.partner.id', 'config.header.kaltura', 'STRING', 0);
 
-insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('KalturaUserSecret','f6b13f7e128e081b5cc9bb9664fd8717', 'config.kaltura.user.secret', 'config.header.kaltura', 'STRING', 0);
 
-insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('KalturaKCWUiConfId','1000741', 'config.kaltura.kcw.uiconfid', 'config.header.kaltura', 'STRING', 0);
 
-insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('KalturaKDPUiConfId','6308762', 'config.kaltura.kdp.uiconfid', 'config.header.kaltura', 'STRING', 0);