Index: lams_common/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/build.xml,v
diff -u -r1.52 -r1.53
--- lams_common/build.xml	24 Sep 2006 02:38:05 -0000	1.52
+++ lams_common/build.xml	16 Oct 2006 07:26:35 -0000	1.53
@@ -282,8 +282,18 @@
 	<!-- =================================================================== -->
 	<!-- Clean and rebuild the database. Also cleans out content repository  -->
 	<!-- =================================================================== -->
-	<target name="rebuild-db"
+	<target name="rebuild-db" depends="preparedirs"
 		description="rebuild LAMS database and clean out content repository. Mysql has to be running first">
+		<tstamp/>
+		<copy overwrite="yes" todir="${build}">
+			<fileset dir="${db.scripts}/">
+				<include name="${lamsconf.table.sql}" />
+			</fileset>
+	        <filterset>
+	            <filter token="datetimestamp" value="${DSTAMP}${TSTAMP}"/>
+	        </filterset>
+		</copy>
+
 		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
 				password="${db.password}" encoding="${db.encoding}">
 			<classpath>
@@ -296,14 +306,13 @@
 			<transaction src="${db.scripts}/create_integration_tables.sql"/>
 			<transaction src="${db.scripts}/insert_users.sql"/> 
 			<transaction src="${db.scripts}/insert_types_data.sql"/>
+			<transaction src="${build}/${lamsconf.table.sql}"/>
 			<!-- Create Quartz table --> 
 	    	<transaction src="${db.scripts}/create_quartz_table.sql"/>
 			<!-- Create tables for Core Notebook Service -->
 			<transaction src="${db.scripts}/create_notebook_tables.sql"/>
-			
-			<!-- Test the scripts for translations
-            <transaction src="${db.scripts}/shaun/all.sql"/>
-            -->
+			<!-- Test the scripts for translations -->
+            <!-- <transaction src="${db.scripts}/shaun/all.sql"/> -->
 		</sql>
 		
 		<delete dir="${contentrepository.directory}"/>
Index: lams_common/db/model/lams_11.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/model/lams_11.clay,v
diff -u -r1.67 -r1.68
--- lams_common/db/model/lams_11.clay	6 Sep 2006 01:37:13 -0000	1.67
+++ lams_common/db/model/lams_11.clay	16 Oct 2006 07:25:23 -0000	1.68
@@ -1563,8 +1563,8 @@
 <column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="created_by" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
-<variant type-name-pattern="BIGINT"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
+<variant type-name-pattern="BIGINT"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
@@ -4007,8 +4007,8 @@
 <column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="user_id" remarks="User for whom this node was created">
 <column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
-<variant type-name-pattern="BIGINT"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
+<variant type-name-pattern="BIGINT"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
@@ -4269,7 +4269,7 @@
 </table>
 <table alias="" name="lams_log_event" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="1519" y="1837"/>
+<table-figure-bounds height="-1" width="-1" x="1540" y="1764"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="log_event_id" remarks="">
 <column-description></column-description>
@@ -4355,7 +4355,7 @@
 </table>
 <table alias="" name="lams_log_event_type" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="1516" y="1704"/>
+<table-figure-bounds height="-1" width="-1" x="1533" y="1612"/>
 <column-list>
 <column alias="" auto-increment="false" column-size="5" decimal-digits="0" default-value="" mandatory="true" name="log_event_type_id" remarks="">
 <column-description></column-description>
@@ -5187,6 +5187,33 @@
 <foreign-key-list/>
 <index-list/>
 </table>
+<table alias="" name="lams_configuration" remarks="">
+<table-description>General server configuration parameters</table-description>
+<table-figure-bounds height="90" width="224" x="1541" y="1956"/>
+<column-list>
+<column alias="" auto-increment="false" column-size="30" decimal-digits="0" default-value="" mandatory="true" name="config_key" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="config_value" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+</column-list>
+<primary-key alias="" name="PK_LAMS_CONFIGURATION" remarks="">
+<primary-key-description></primary-key-description>
+<primary-key-column name="config_key"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list/>
+<index-list/>
+</table>
 </table-list>
 </schema>
 </schema-list>
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v
diff -u -r1.82 -r1.83
--- lams_common/db/sql/create_lams_11_tables.sql	6 Sep 2006 01:37:13 -0000	1.82
+++ lams_common/db/sql/create_lams_11_tables.sql	16 Oct 2006 07:25:23 -0000	1.83
@@ -860,4 +860,11 @@
      , PRIMARY KEY (id)
 )TYPE=InnoDB;
 
+CREATE TABLE lams_configuration (
+       config_key VARCHAR(30) NOT NULL
+     , config_value VARCHAR(255)
+     , PRIMARY KEY (config_key)
+);
+
+
  
\ No newline at end of file
Index: lams_common/db/sql/insert_unix_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_unix_config_data.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/db/sql/insert_unix_config_data.sql	16 Oct 2006 07:25:23 -0000	1.1
@@ -0,0 +1,31 @@
+insert into lams_configuration (config_key, config_value) values ('ServerURL','http://shaun.melcoe.mq.edu.au/lams/');
+insert into lams_configuration (config_key, config_value) values ('Version','2.0 RC1');
+insert into lams_configuration (config_key, config_value) values ('LamsHome','/var/opt/lams');
+insert into lams_configuration (config_key, config_value) values ('TempDir','/var/opt/lams/temp');
+insert into lams_configuration (config_key, config_value) values ('DumpDir','/var/opt/lams/dump');
+insert into lams_configuration (config_key, config_value) values ('EARDir','/usr/local/jboss-4.0.2/server/default/deploy/lams.ear');
+insert into lams_configuration (config_key, config_value) values ('SMTPServer','mail.lib.mq.edu.au');
+insert into lams_configuration (config_key, config_value) values ('LamsSupportEmail','lams_support@melcoe.mq.edu.au');
+insert into lams_configuration (config_key, config_value) values ('ContentRepositoryPath','/var/opt/lams/repository');
+insert into lams_configuration (config_key, config_value) values ('UploadFileMaxSize','1048576');
+insert into lams_configuration (config_key, config_value) values ('UploadLargeFileMaxSize','10485760');
+insert into lams_configuration (config_key, config_value) values ('UploadFileMaxMemorySize','4096');
+insert into lams_configuration (config_key, config_value) values ('FileManagerDir','/usr/local/jboss-4.0.2/server/default/deploy/upload.war');
+insert into lams_configuration (config_key, config_value) values ('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs');
+insert into lams_configuration (config_key, config_value) values ('UserInactiveTimeout','86400');
+insert into lams_configuration (config_key, config_value) values ('UseCacheDebugListener','false');
+insert into lams_configuration (config_key, config_value) values ('CleanupPreviewOlderThanDays','7');
+insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','2.0.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','2.0.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','2.0.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','2.0.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('ServerLanguage','en_AU');
+insert into lams_configuration (config_key, config_value) values ('ServerPageDirection','LTR');
+insert into lams_configuration (config_key, config_value) values ('DictionaryDateCreated','2006-01-02');
+insert into lams_configuration (config_key, config_value) values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/');
+insert into lams_configuration (config_key, config_value) values ('XmppDomain','shaun.melcoe.mq.edu.au');
+insert into lams_configuration (config_key, config_value) values ('XmppConference','conference.shaun.melcoe.mq.edu.au');
+insert into lams_configuration (config_key, config_value) values ('XmppAdmin','admin');
+insert into lams_configuration (config_key, config_value) values ('XmppPassword','wildfire');
+insert into lams_configuration (config_key, config_value) values ('DefaultFlashTheme','default');
+insert into lams_configuration (config_key, config_value) values ('DefaultHTMLTheme','defaultHTML');
\ No newline at end of file
Index: lams_common/db/sql/insert_windows_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_windows_config_data.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/db/sql/insert_windows_config_data.sql	16 Oct 2006 07:25:23 -0000	1.1
@@ -0,0 +1,31 @@
+insert into lams_configuration (config_key, config_value) values ('ServerURL','http://localhost:8080/lams/');
+insert into lams_configuration (config_key, config_value) values ('Version','2.0 RC1');
+insert into lams_configuration (config_key, config_value) values ('LamsHome','C:\lams');
+insert into lams_configuration (config_key, config_value) values ('TempDir','C:\lams\temp');
+insert into lams_configuration (config_key, config_value) values ('DumpDir','C:\lams\dump');
+insert into lams_configuration (config_key, config_value) values ('EARDir','d:/jboss-4.0.2/server/default/deploy/lams.ear');
+insert into lams_configuration (config_key, config_value) values ('SMTPServer','mail.lib.mq.edu.au');
+insert into lams_configuration (config_key, config_value) values ('LamsSupportEmail','lams_support@melcoe.mq.edu.au');
+insert into lams_configuration (config_key, config_value) values ('ContentRepositoryPath','C:\lams\repository');
+insert into lams_configuration (config_key, config_value) values ('UploadFileMaxSize','1048576');
+insert into lams_configuration (config_key, config_value) values ('UploadLargeFileMaxSize','10485760');
+insert into lams_configuration (config_key, config_value) values ('UploadFileMaxMemorySize','4096');
+insert into lams_configuration (config_key, config_value) values ('FileManagerDir','d:/jboss-4.0.2/server/default/deploy/upload.war');
+insert into lams_configuration (config_key, config_value) values ('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs');
+insert into lams_configuration (config_key, config_value) values ('UserInactiveTimeout','86400');
+insert into lams_configuration (config_key, config_value) values ('UseCacheDebugListener','false');
+insert into lams_configuration (config_key, config_value) values ('CleanupPreviewOlderThanDays','7');
+insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','2.0.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','2.0.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','2.0.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','2.0.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('ServerLanguage','en_AU');
+insert into lams_configuration (config_key, config_value) values ('ServerPageDirection','LTR');
+insert into lams_configuration (config_key, config_value) values ('DictionaryDateCreated','2006-01-02');
+insert into lams_configuration (config_key, config_value) values ('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/');
+insert into lams_configuration (config_key, config_value) values ('XmppDomain','shaun.melcoe.mq.edu.au');
+insert into lams_configuration (config_key, config_value) values ('XmppConference','conference.shaun.melcoe.mq.edu.au');
+insert into lams_configuration (config_key, config_value) values ('XmppAdmin','admin');
+insert into lams_configuration (config_key, config_value) values ('XmppPassword','wildfire');
+insert into lams_configuration (config_key, config_value) values ('DefaultFlashTheme','default');
+insert into lams_configuration (config_key, config_value) values ('DefaultHTMLTheme','defaultHTML');