Index: lams_common/db/model/lams_11.clay
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r6f022e925fa8e14482740383077202fc56a843a6
--- lams_common/db/model/lams_11.clay	(.../lams_11.clay)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_common/db/model/lams_11.clay	(.../lams_11.clay)	(revision 6f022e925fa8e14482740383077202fc56a843a6)
@@ -2858,11 +2858,11 @@
 <variant type-name-pattern="TINYINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="true" name="waiting_flag" remarks="">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="waiting_flag" remarks="">
 <column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT">
 <variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r6f022e925fa8e14482740383077202fc56a843a6
--- lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision 6f022e925fa8e14482740383077202fc56a843a6)
@@ -608,7 +608,7 @@
      , user_id BIGINT(20) NOT NULL
      , lesson_id BIGINT(20) NOT NULL
      , lesson_completed_flag TINYINT(1) NOT NULL DEFAULT 0
-     , waiting_flag TINYINT(1) NOT NULL
+     , waiting_flag TINYINT NOT NULL
      , start_date_time DATETIME NOT NULL
      , finish_date_time DATETIME
      , current_activity_id BIGINT(20)
Index: lams_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r6f022e925fa8e14482740383077202fc56a843a6
--- lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision 6f022e925fa8e14482740383077202fc56a843a6)
@@ -1,9 +1,9 @@
-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 ('ServerURL','http://localhost:8080/lams/');
 insert into lams_configuration (config_key, config_value) values ('ServerURLContextPath','lams/');
 insert into lams_configuration (config_key, config_value) values ('Version','2.0.2');
 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 ('EARDir','/Users/fiona/development/jboss-4.0.2/server/default/deploy/lams.ear');
 insert into lams_configuration (config_key, config_value) values ('SMTPServer','');
 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');
Index: lams_common/db/sql/insert_rams_unix_config_data.sql
===================================================================
diff -u -r62294e2b2dba048e4669c1ed51d900b260138d55 -r6f022e925fa8e14482740383077202fc56a843a6
--- lams_common/db/sql/insert_rams_unix_config_data.sql	(.../insert_rams_unix_config_data.sql)	(revision 62294e2b2dba048e4669c1ed51d900b260138d55)
+++ lams_common/db/sql/insert_rams_unix_config_data.sql	(.../insert_rams_unix_config_data.sql)	(revision 6f022e925fa8e14482740383077202fc56a843a6)
@@ -1,9 +1,9 @@
-insert into lams_configuration (config_key, config_value) values ('ServerURL','http://shaun.melcoe.mq.edu.au/rams/');
+insert into lams_configuration (config_key, config_value) values ('ServerURL','http://localhost:8080/rams/');
 insert into lams_configuration (config_key, config_value) values ('ServerURLContextPath','rams/');
 insert into lams_configuration (config_key, config_value) values ('Version','1.0 Beta');
 insert into lams_configuration (config_key, config_value) values ('TempDir','/var/opt/rams/temp');
 insert into lams_configuration (config_key, config_value) values ('DumpDir','/var/opt/rams/dump');
-insert into lams_configuration (config_key, config_value) values ('EARDir','/usr/local/jboss-4.0.2/server/default/deploy/rams.ear');
+insert into lams_configuration (config_key, config_value) values ('EARDir','/Users/fiona/development/jboss-4.0.2/server/default/deploy/rams.ear');
 insert into lams_configuration (config_key, config_value) values ('SMTPServer','');
 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/rams/repository');
Fisheye: Tag 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f refers to a dead (removed) revision in file `lams_common/db/sql/lams_11.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/db/sql/lams_learning_design.sql
===================================================================
diff -u
--- lams_common/db/sql/lams_learning_design.sql	(revision 0)
+++ lams_common/db/sql/lams_learning_design.sql	(revision 6f022e925fa8e14482740383077202fc56a843a6)
@@ -0,0 +1,48 @@
+CREATE TABLE lams_learning_design (
+       edit_override_user_id BIGINT(20) NOT NULL AUTO_INCREMENT
+     , learning_design_ui_id INT(11)
+     , description TEXT
+     , title VARCHAR(255)
+     , first_activity_id BIGINT(20)
+     , max_id INT(11)
+     , valid_design_flag TINYINT(4) NOT NULL
+     , read_only_flag TINYINT(4) NOT NULL
+     , date_read_only DATETIME
+     , user_id BIGINT(20) NOT NULL
+     , help_text TEXT
+     , online_instructions TEXT
+     , offline_instructions TEXT
+     , copy_type_id TINYINT(4) NOT NULL
+     , create_date_time DATETIME NOT NULL
+     , version VARCHAR(56)
+     , original_learning_design_id BIGINT(20)
+     , workspace_folder_id BIGINT(20)
+     , duration BIGINT(38)
+     , license_id BIGINT(20)
+     , license_text TEXT
+     , last_modified_date_time DATETIME
+     , content_folder_id VARCHAR(32)
+     , edit_override_lock TINYINT DEFAULT 0
+     , edit_override_user_id BIGINT(20)
+     , PRIMARY KEY (edit_override_user_id)
+     , INDEX (user_id)
+     , CONSTRAINT FK_lams_learning_design_3 FOREIGN KEY (user_id)
+                  REFERENCES lams_user (user_id)
+     , INDEX (workspace_folder_id)
+     , CONSTRAINT FK_lams_learning_design_4 FOREIGN KEY (workspace_folder_id)
+                  REFERENCES lams_workspace_folder (workspace_folder_id)
+     , INDEX (license_id)
+     , CONSTRAINT FK_lams_learning_design_5 FOREIGN KEY (license_id)
+                  REFERENCES lams_license (license_id)
+     , INDEX (copy_type_id)
+     , CONSTRAINT FK_lams_learning_design_6 FOREIGN KEY (copy_type_id)
+                  REFERENCES lams_copy_type (copy_type_id)
+     , INDEX (edit_override_user_id)
+     , CONSTRAINT FK_lams_learning_design_7 FOREIGN KEY (edit_override_user_id)
+                  REFERENCES lams_user (user_id)
+)TYPE=InnoDB;
+ALTER TABLE lams_learning_design MODIFY COLUMN edit_override_lock TINYINT DEFAULT 0
+      COMMENT '1 when edit on fly in progress. edit_override_user_id should be set.';
+CREATE INDEX idx_design_parent_id ON lams_learning_design (original_learning_design_id ASC);
+CREATE INDEX idx_design_first_act ON lams_learning_design (first_activity_id ASC);
+
Index: lams_common/db/sql/updatescripts/alter_203_learner_progress.sql
===================================================================
diff -u
--- lams_common/db/sql/updatescripts/alter_203_learner_progress.sql	(revision 0)
+++ lams_common/db/sql/updatescripts/alter_203_learner_progress.sql	(revision 6f022e925fa8e14482740383077202fc56a843a6)
@@ -0,0 +1,7 @@
+-- Script to be run for LAMS 2.0.3 release, on LAMS 2.0.2 tables.
+-- Change waiting_flag as we want it to be a ternary value, rather than a boolean
+
+ALTER TABLE lams_learner_progress
+MODIFY COLUMN waiting_flag TINYINT;
+
+COMMIT;