Index: lams_build/lib/lams/lams-monitoring.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams-monitoring.jar,v
diff -u -r1.37 -r1.38
Binary files differ
Index: lams_common/db/model/lams_11.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/model/lams_11.clay,v
diff -u -r1.76 -r1.77
--- lams_common/db/model/lams_11.clay 22 Feb 2007 05:00:17 -0000 1.76
+++ lams_common/db/model/lams_11.clay 9 May 2007 01:14:31 -0000 1.77
@@ -627,6 +627,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1013,6 +1039,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1048,6 +1113,13 @@
+
+
+
+
+
+
+
@@ -2659,6 +2731,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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.91 -r1.92
--- lams_common/db/sql/create_lams_11_tables.sql 22 Feb 2007 05:00:16 -0000 1.91
+++ lams_common/db/sql/create_lams_11_tables.sql 9 May 2007 01:14:31 -0000 1.92
@@ -356,6 +356,9 @@
, 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)
+ , design_version INTEGER DEFAULT 1
, PRIMARY KEY (learning_design_id)
, INDEX (user_id)
, CONSTRAINT FK_lams_learning_design_3 FOREIGN KEY (user_id)
@@ -369,6 +372,9 @@
, 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;
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);
@@ -506,6 +512,8 @@
, library_activity_id BIGINT(20)
, language_file VARCHAR(255)
, system_tool_id BIGINT(20)
+ , read_only TINYINT DEFAULT 0
+ , initialised TINYINT DEFAULT 0
, PRIMARY KEY (activity_id)
, INDEX (learning_library_id)
, CONSTRAINT FK_lams_learning_activity_7 FOREIGN KEY (learning_library_id)
@@ -560,7 +568,9 @@
, end_date_time DATETIME
, schedule_end_date_time DATETIME
, previous_state_id INT(3)
- , learner_exportport_avail TINYINT(1)
+ , learner_exportport_avail TINYINT(1) DEFAULT 1
+ , locked_for_edit TINYINT DEFAULT 0
+ , version INTEGER DEFAULT 1
, PRIMARY KEY (lesson_id)
, INDEX (learning_design_id)
, CONSTRAINT FK_lams_lesson_1_1 FOREIGN KEY (learning_design_id)
Index: lams_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_unix_config_data.sql,v
diff -u -r1.2 -r1.3
--- lams_common/db/sql/insert_lams_unix_config_data.sql 23 Apr 2007 02:38:41 -0000 1.2
+++ lams_common/db/sql/insert_lams_unix_config_data.sql 9 May 2007 01:17:51 -0000 1.3
@@ -1,4 +1,5 @@
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 ('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');
@@ -30,4 +31,4 @@
insert into lams_configuration (config_key, config_value) values ('DefaultHTMLTheme','defaultHTML');
insert into lams_configuration (config_key, config_value) values ('AllowDirectLessonLaunch','false');
insert into lams_configuration (config_key, config_value) values ('LAMS_Community_enable','false');
-insert into lams_configuration (config_key, config_value) values ('AllowEditOnFly','true');
\ No newline at end of file
+insert into lams_configuration (config_key, config_value) values ('AllowLiveEdit','true');
\ No newline at end of file
Index: lams_common/db/sql/insert_rams_unix_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_rams_unix_config_data.sql,v
diff -u -r1.2 -r1.3
--- lams_common/db/sql/insert_rams_unix_config_data.sql 23 Apr 2007 02:38:41 -0000 1.2
+++ lams_common/db/sql/insert_rams_unix_config_data.sql 9 May 2007 01:17:51 -0000 1.3
@@ -1,11 +1,12 @@
-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://shaun.melcoe.mq.edu.au/rams/');
+insert into lams_configuration (config_key, config_value) values ('ServerURLContextPath','rams/');
insert into lams_configuration (config_key, config_value) values ('Version','1.0');
-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 ('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 ('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');
+insert into lams_configuration (config_key, config_value) values ('ContentRepositoryPath','/var/opt/rams/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');
@@ -14,10 +15,10 @@
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 ('AuthoringActivitiesColour', 'true');
-insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','1.0.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','1.0.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','1.0.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','1.0.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','0.8.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','0.8.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','0.8.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','0.8.@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','2007-04-23');
@@ -30,3 +31,4 @@
insert into lams_configuration (config_key, config_value) values ('DefaultHTMLTheme','ramsthemeHTML');
insert into lams_configuration (config_key, config_value) values ('AllowDirectLessonLaunch','false');
insert into lams_configuration (config_key, config_value) values ('LAMS_Community_enable','false');
+insert into lams_configuration (config_key, config_value) values ('AllowLiveEdit','true');
\ No newline at end of file
Index: lams_common/db/sql/insert_rams_windows_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_rams_windows_config_data.sql,v
diff -u -r1.2 -r1.3
--- lams_common/db/sql/insert_rams_windows_config_data.sql 23 Apr 2007 02:38:41 -0000 1.2
+++ lams_common/db/sql/insert_rams_windows_config_data.sql 9 May 2007 01:17:51 -0000 1.3
@@ -1,11 +1,12 @@
-insert into lams_configuration (config_key, config_value) values ('ServerURL','http://localhost:8080/lams/');
-insert into lams_configuration (config_key, config_value) values ('Version','1.0');
-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','C:/jboss-4.0.2/server/default/deploy/lams.ear');
+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','C:/rams/temp');
+insert into lams_configuration (config_key, config_value) values ('DumpDir','C:/rams/dump');
+insert into lams_configuration (config_key, config_value) values ('EARDir','C:/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','C:/lams/repository');
+insert into lams_configuration (config_key, config_value) values ('ContentRepositoryPath','C:/rams/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');
@@ -14,10 +15,10 @@
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 ('AuthoringActivitiesColour', 'true');
-insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','1.0.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','1.0.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','1.0.@datetimestamp@');
-insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','1.0.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','0.8.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','0.8.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','0.8.@datetimestamp@');
+insert into lams_configuration (config_key, config_value) values ('ServerVersionNumber','0.8.@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','2007-04-23');
@@ -29,4 +30,5 @@
insert into lams_configuration (config_key, config_value) values ('DefaultFlashTheme','rams');
insert into lams_configuration (config_key, config_value) values ('DefaultHTMLTheme','ramsthemeHTML');
insert into lams_configuration (config_key, config_value) values ('AllowDirectLessonLaunch','false');
-insert into lams_configuration (config_key, config_value) values ('LAMS_Community_enable','false');
\ No newline at end of file
+insert into lams_configuration (config_key, config_value) values ('LAMS_Community_enable','false');
+insert into lams_configuration (config_key, config_value) values ('AllowLiveEdit','true');
\ No newline at end of file
Index: lams_common/db/sql/insert_types_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_types_data.sql,v
diff -u -r1.63 -r1.64
--- lams_common/db/sql/insert_types_data.sql 7 Feb 2007 02:55:18 -0000 1.63
+++ lams_common/db/sql/insert_types_data.sql 9 May 2007 01:14:31 -0000 1.64
@@ -75,6 +75,7 @@
INSERT INTO lams_learning_activity_type VALUES (6, 'PARALLEL');
INSERT INTO lams_learning_activity_type VALUES (7, 'OPTIONS');
INSERT INTO lams_learning_activity_type VALUES (8, 'SEQUENCE');
+INSERT INTO lams_learning_activity_type VALUES (9, 'GATE_SYSTEM');
INSERT INTO lams_gate_activity_level VALUES (1, 'LEARNER');
INSERT INTO lams_gate_activity_level VALUES (2, 'GROUP');
@@ -165,6 +166,14 @@
'monitoring/gateExportPortfolio?mode=teacher', 'monitoring/gate.do?method=viewGate',
'monitoring/gate.do?method=viewGate', now() );
+INSERT INTO lams_system_tool (system_tool_id, learning_activity_type_id, tool_display_name, description,
+ learner_url, learner_preview_url, learner_progress_url, export_pfolio_learner_url,
+ export_pfolio_class_url, monitor_url, contribute_url, create_date_time)
+VALUES (5, 9, 'System Gate', 'Gate: Opens under system control.',
+ 'learning/gate.do?method=knockGate', 'learning/gate.do?method=knockGate', null, null,
+ 'monitoring/gateExportPortfolio?mode=teacher', 'monitoring/gate.do?method=viewGate',
+ 'monitoring/gate.do?method=viewGate', now() );
+
-- Supported Locales
INSERT INTO lams_supported_locale (locale_id, language_iso_code, country_iso_code, description, direction)
VALUES (1, 'en', 'AU', 'English (Australia)', 'LTR');
Index: lams_common/db/sql/updatescripts/alter_203_editonfly.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/updatescripts/Attic/alter_203_editonfly.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_common/db/sql/updatescripts/alter_203_editonfly.sql 9 May 2007 01:14:32 -0000 1.1
@@ -0,0 +1,20 @@
+alter table lams_learning_activity
+ADD COLUMN read_only TINYINT DEFAULT 0
+,ADD COLUMN initialised TINYINT DEFAULT 0;
+
+alter table lams_learning_design
+ADD COLUMN edit_override_lock TINYINT DEFAULT 0
+,ADD COLUMN edit_override_user_id BIGINT(20)
+,ADD CONSTRAINT FK_lams_learning_design_7 FOREIGN KEY (edit_override_user_id)
+ REFERENCES lams_user (user_id);
+
+alter table lams_lesson
+ADD COLUMN locked_for_edit TINYINT DEFAULT 0
+,ADD COLUMN version INTEGER DEFAULT 1;
+
+UPDATE lams_learning_activity
+SET read_only = 1
+WHERE learning_design_id IN (SELECT learning_design_id FROM lams_learning_design WHERE copy_type_id IN (2,3))
+
+insert into lams_configuration (config_key, config_value) values ('AllowLiveEdit','true');
+insert into lams_configuration (config_key, config_value) values ('ServerURLContextPath','lams/');