@@ -4968,6 +4947,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r250486f86b66ac04cece0001879c3dc39c96ed98 -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 250486f86b66ac04cece0001879c3dc39c96ed98)
+++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -158,7 +158,6 @@
workspace_folder_id BIGINT(20) NOT NULL AUTO_INCREMENT
, parent_folder_id BIGINT(20)
, name VARCHAR(64) NOT NULL
- , workspace_id BIGINT(20) NOT NULL
, user_id BIGINT(20) NOT NULL
, create_date_time DATETIME NOT NULL
, last_modified_date_time DATETIME
@@ -174,18 +173,29 @@
CREATE TABLE lams_workspace (
workspace_id BIGINT(20) NOT NULL AUTO_INCREMENT
- , root_folder_id BIGINT(20)
+ , default_fld_id BIGINT(20)
, def_run_seq_fld_id BIGINT(20)
, name VARCHAR(255)
, PRIMARY KEY (workspace_id)
- , INDEX (root_folder_id)
- , CONSTRAINT FK_lams_workspace_1 FOREIGN KEY (root_folder_id)
- REFERENCES lams_workspace_folder (workspace_folder_id) ON DELETE NO ACTION ON UPDATE NO ACTION
, INDEX (def_run_seq_fld_id)
- , CONSTRAINT FK_wkspce_default_run FOREIGN KEY (def_run_seq_fld_id)
+ , CONSTRAINT FK_lams_workspace_1 FOREIGN KEY (def_run_seq_fld_id)
REFERENCES lams_workspace_folder (workspace_folder_id)
+ , INDEX (default_fld_id)
+ , CONSTRAINT FK_lams_workspace_2 FOREIGN KEY (default_fld_id)
+ REFERENCES lams_workspace_folder (workspace_folder_id)
)TYPE=InnoDB;
+CREATE TABLE lams_workspace_workspace_folder (
+ workspace_id BIGINT(20) NOT NULL
+ , workspace_folder_id BIGINT(20) NOT NULL
+ , INDEX (workspace_id)
+ , CONSTRAINT FK_lams_workspace_workspace_folder_1 FOREIGN KEY (workspace_id)
+ REFERENCES lams_workspace (workspace_id)
+ , INDEX (workspace_folder_id)
+ , CONSTRAINT FK_lams_workspace_workspace_folder_2 FOREIGN KEY (workspace_folder_id)
+ REFERENCES lams_workspace_folder (workspace_folder_id)
+)TYPE=InnoDB;
+
CREATE TABLE lams_organisation (
organisation_id BIGINT(20) NOT NULL AUTO_INCREMENT
, name VARCHAR(250) NOT NULL
Index: lams_common/db/sql/insert_users.sql
===================================================================
diff -u -r0a5b7d7ed6f549400c3179f6756c5466e84564f1 -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/insert_users.sql (.../insert_users.sql) (revision 0a5b7d7ed6f549400c3179f6756c5466e84564f1)
+++ lams_common/db/sql/insert_users.sql (.../insert_users.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -17,45 +17,56 @@
INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag) VALUES (3, "aqua", "JSP theme", null, 1);
-insert into lams_workspace (workspace_id, root_folder_id, name) values(1,1,'ROOT');
-insert into lams_workspace (workspace_id, root_folder_id, name, def_run_seq_fld_id) values(2,2,'Developers Playpen',22);
-insert into lams_workspace (workspace_id, root_folder_id, name, def_run_seq_fld_id) values(3,3,'MATH111',23);
-insert into lams_workspace (workspace_id, root_folder_id, name) values(4,4,'Mary Morgan');
-insert into lams_workspace (workspace_id, root_folder_id, name) values(5,5,'One Test');
-insert into lams_workspace (workspace_id, root_folder_id, name) values(6,6,'Two Test');
-insert into lams_workspace (workspace_id, root_folder_id, name) values(7,7,'Three Test');
-insert into lams_workspace (workspace_id, root_folder_id, name) values(8,8,'Four Test');
+insert into lams_workspace (workspace_id, name, default_fld_id) values(1,'ROOT',1);
+insert into lams_workspace (workspace_id, name, default_fld_id, def_run_seq_fld_id) values(2,'Developers Playpen',2,22);
+insert into lams_workspace (workspace_id, name, default_fld_id, def_run_seq_fld_id) values(3,'MATH111',3,23);
+insert into lams_workspace (workspace_id, name, default_fld_id) values(4,'Mary Morgan',4);
+insert into lams_workspace (workspace_id, name, default_fld_id) values(5,'One Test',5);
+insert into lams_workspace (workspace_id, name, default_fld_id) values(6,'Two Test',6);
+insert into lams_workspace (workspace_id, name, default_fld_id) values(7,'Three Test',7);
+insert into lams_workspace (workspace_id, name, default_fld_id) values(8,'Four Test',8);
-insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(1,null,'ROOT',1,1,'20041223','20041223',1);
+insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(1,null,'ROOT',1,'20041223','20041223',1);
-insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(2,1,'Developers Playpen',2,1,'20041223','20041223',1);
+insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(2,1,'Developers Playpen',1,'20041223','20041223',1);
-insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(22,2,'Lesson Sequence Folder',2,1,'20041223','20041223',2);
+insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(22,2,'Lesson Sequence Folder',1,'20041223','20041223',2);
-insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(3,1,'MATH111',3,1,'20041223','20041223',1);
+insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(3,1,'MATH111',1,'20041223','20041223',1);
-insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(23,3,'Lesson Sequence Folder',3,1,'20041223','20041223',2);
+insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(23,3,'Lesson Sequence Folder',1,'20041223','20041223',2);
-insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(4,null,'Mary Morgan Folder',4,4,'20041223','20041223',1);
+insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(4,null,'Mary Morgan Folder',4,'20041223','20041223',1);
-insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(5,null,'One Test Workspace',5,5,'20041223','20041223',1);
+insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(5,null,'One Test Workspace',5,'20041223','20041223',1);
-insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(6,null,'Two Test Workspace',6,6,'20041223','20041223',1);
+insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(6,null,'Two Test Workspace',6,'20041223','20041223',1);
-insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(7,null,'Three Test Workspace',7,7,'20041223','20041223',1);
+insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(7,null,'Three Test Workspace',7,'20041223','20041223',1);
-insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(8,null,'Four Test Workspace',8,8,'20041223','20041223',1);
+insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(8,null,'Four Test Workspace',8,'20041223','20041223',1);
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (1,1);
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (2,2);
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (2,22);
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (3,3);
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (3,23);
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (4,4);
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (5,5);
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (6,6);
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (7,7);
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (8,8);
+
INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, workspace_id, locale_language, locale_country, organisation_state_id)
VALUES (1, 'Root', null, 'Root Organisation',null,1,NOW(),1,'en','AU',1);
INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, workspace_id, locale_language, locale_country, organisation_state_id)
Fisheye: Tag 9d473d63560850216620882e4d4ad27bf5e2d487 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/shaun/lams_user_bulgarian.sql
===================================================================
diff -u -r019539a3c81dc79e95929d91aeb122fc47379b8e -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/shaun/lams_user_bulgarian.sql (.../lams_user_bulgarian.sql) (revision 019539a3c81dc79e95929d91aeb122fc47379b8e)
+++ lams_common/db/sql/shaun/lams_user_bulgarian.sql (.../lams_user_bulgarian.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -1,9 +1,10 @@
SET FOREIGN_KEY_CHECKS=0;
-- need a new workspace_id and the name changes for each user.
-insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(11,null,'Bulgarian Workspace',11,11,now(),now(),1);
-insert into lams_workspace (workspace_id, root_folder_id, name) values (11,11,'Bulgarian Test');
+insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(11,null,'Bulgarian Workspace',11,now(),now(),1);
+insert into lams_workspace (workspace_id, default_fld_id, name) values (11,11,'Bulgarian Test');
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (11,11);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_language,locale_country)
values(11,'bulgarian','bulgarian','Dr','Bulgarian','Test','11','Bulgarian Ave',null,'Sofia',null,'Bulgaria','0211111111','0211111112','0411111111','0211111113','bulgarian@xx.os',0,'20041223',1,11,1,3,'bg',null);
Index: lams_common/db/sql/shaun/lams_user_chinese.sql
===================================================================
diff -u -r019539a3c81dc79e95929d91aeb122fc47379b8e -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/shaun/lams_user_chinese.sql (.../lams_user_chinese.sql) (revision 019539a3c81dc79e95929d91aeb122fc47379b8e)
+++ lams_common/db/sql/shaun/lams_user_chinese.sql (.../lams_user_chinese.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -1,9 +1,10 @@
SET FOREIGN_KEY_CHECKS=0;
-- need a new workspace_id and the name changes for each user.
-insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(12,null,'Chinese Workspace',12,12,now(),now(),1);
-insert into lams_workspace (workspace_id, root_folder_id, name) values (12,12,'Chinese Test');
+insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(12,null,'Chinese Workspace',12,now(),now(),1);
+insert into lams_workspace (workspace_id, default_fld_id, name) values (12,12,'Chinese Test');
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (12,12);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_language,locale_country)
values(12,'chinese','chinese','Dr','Chinese','Test','12','Chinese Ave',null,'Beijing',null,'China','0211111111','0211111112','0411111111','0211111113','chinese@xx.os',0,'20041223',1,12,1,3,'zh',null);
Index: lams_common/db/sql/shaun/lams_user_french.sql
===================================================================
diff -u -r019539a3c81dc79e95929d91aeb122fc47379b8e -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/shaun/lams_user_french.sql (.../lams_user_french.sql) (revision 019539a3c81dc79e95929d91aeb122fc47379b8e)
+++ lams_common/db/sql/shaun/lams_user_french.sql (.../lams_user_french.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -1,9 +1,10 @@
SET FOREIGN_KEY_CHECKS=0;
-- need a new workspace_id and the name changes for each user.
-insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(10,null,'French Workspace',10,10,now(),now(),1);
-insert into lams_workspace (workspace_id, root_folder_id, name) values (10,10,'French Test');
+insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(10,null,'French Workspace',10,now(),now(),1);
+insert into lams_workspace (workspace_id, default_fld_id, name) values (10,10,'French Test');
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (10,10);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_language,locale_country)
values(10,'french','french','Dr','French','Test','10','French Ave',null,'Paris',null,'France','0211111111','0211111112','0411111111','0211111113','french@xx.os',0,'20041223',1,10,1,3,'fr',null);
Index: lams_common/db/sql/shaun/lams_user_german.sql
===================================================================
diff -u -r019539a3c81dc79e95929d91aeb122fc47379b8e -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/shaun/lams_user_german.sql (.../lams_user_german.sql) (revision 019539a3c81dc79e95929d91aeb122fc47379b8e)
+++ lams_common/db/sql/shaun/lams_user_german.sql (.../lams_user_german.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -1,9 +1,10 @@
SET FOREIGN_KEY_CHECKS=0;
-- need a new workspace_id and the name changes for each user.
-insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(13,null,'German Workspace',13,13, now(),now(),1);
-insert into lams_workspace (workspace_id, root_folder_id, name) values (13,13,'German Test');
+insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(13,null,'German Workspace',13,now(),now(),1);
+insert into lams_workspace (workspace_id, default_fld_id, name) values (13,13,'German Test');
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (13,13);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_language,locale_country)
values(13,'german','german','Dr','German','Test','13', 'German Ave',null,'Berlin',null,'Germany','0211111111','0211111112','0411111111','0211111113','german@xx.os',0,'20041223',1,13,1,3,'de',null);
Index: lams_common/db/sql/shaun/lams_user_hungarian.sql
===================================================================
diff -u -r019539a3c81dc79e95929d91aeb122fc47379b8e -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/shaun/lams_user_hungarian.sql (.../lams_user_hungarian.sql) (revision 019539a3c81dc79e95929d91aeb122fc47379b8e)
+++ lams_common/db/sql/shaun/lams_user_hungarian.sql (.../lams_user_hungarian.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -1,9 +1,10 @@
SET FOREIGN_KEY_CHECKS=0;
-- need a new workspace_id and the name changes for each user.
-insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(21,null,'Hungarian Workspace',21,21, now(),now(),1);
-insert into lams_workspace (workspace_id, root_folder_id, name) values (21,21,'Hungarian Test');
+insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(21,null,'Hungarian Workspace',21,now(),now(),1);
+insert into lams_workspace (workspace_id, default_fld_id, name) values (21,21,'Hungarian Test');
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (21,21);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_language,locale_country)
values(21,'hungarian','hungarian','Dr','Hungarian','Test','21', 'Hungarian Ave',null,'Bukarest',null,'Hungry','0211111111','0211111112','0411111111','0211111113','hungarian@xx.os',0,'20041223',1,21,1,3,'hu',null);
@@ -20,4 +21,4 @@
INSERT INTO lams_user_organisation_role (user_organisation_role_id, user_organisation_id, role_id) VALUES (135,55,5);
INSERT INTO lams_user_organisation_role (user_organisation_role_id, user_organisation_id, role_id) VALUES (136,55,6);
-SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
+SET FOREIGN_KEY_CHECKS=1;
Index: lams_common/db/sql/shaun/lams_user_italian.sql
===================================================================
diff -u -r019539a3c81dc79e95929d91aeb122fc47379b8e -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/shaun/lams_user_italian.sql (.../lams_user_italian.sql) (revision 019539a3c81dc79e95929d91aeb122fc47379b8e)
+++ lams_common/db/sql/shaun/lams_user_italian.sql (.../lams_user_italian.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -1,9 +1,10 @@
SET FOREIGN_KEY_CHECKS=0;
-- need a new workspace_id and the name changes for each user.
-insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(16,null,'Italian Workspace',16,16, now(),now(),1);
-insert into lams_workspace (workspace_id, root_folder_id, name) values (16,16,'Italian Test');
+insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(16,null,'Italian Workspace',16,now(),now(),1);
+insert into lams_workspace (workspace_id, default_fld_id, name) values (16,16,'Italian Test');
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (16,16);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_language,locale_country)
values(16,'italian','italian','Dr','Italian','Test','16', 'Italian Ave',null,'Rome',null,'Italy','0211111111','0211111112','0411111111','0211111113','italian@xx.os',0,'20041223',1,16,1,3,'it',null);
Index: lams_common/db/sql/shaun/lams_user_korean.sql
===================================================================
diff -u -r019539a3c81dc79e95929d91aeb122fc47379b8e -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/shaun/lams_user_korean.sql (.../lams_user_korean.sql) (revision 019539a3c81dc79e95929d91aeb122fc47379b8e)
+++ lams_common/db/sql/shaun/lams_user_korean.sql (.../lams_user_korean.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -1,9 +1,10 @@
SET FOREIGN_KEY_CHECKS=0;
-- need a new workspace_id and the name changes for each user.
-insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(18,null,'Korean Workspace',18,18, now(),now(),1);
-insert into lams_workspace (workspace_id, root_folder_id, name) values (18,18,'Korean Test');
+insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(18,null,'Korean Workspace',18, now(),now(),1);
+insert into lams_workspace (workspace_id, default_fld_id, name) values (18,18,'Korean Test');
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (18,18);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_language,locale_country)
values(18,'korean','korean','Dr','Korean','Test','18', 'Korean Ave',null,'Seoul',null,'Korea','0211111111','0211111112','0411111111','0211111113','korean@xx.os',0,'20041223',1,18,1,3,'ko',null);
Index: lams_common/db/sql/shaun/lams_user_maori.sql
===================================================================
diff -u -r019539a3c81dc79e95929d91aeb122fc47379b8e -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/shaun/lams_user_maori.sql (.../lams_user_maori.sql) (revision 019539a3c81dc79e95929d91aeb122fc47379b8e)
+++ lams_common/db/sql/shaun/lams_user_maori.sql (.../lams_user_maori.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -1,9 +1,10 @@
SET FOREIGN_KEY_CHECKS=0;
-- need a new workspace_id and the name changes for each user.
-insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(20,null,'Maori Workspace',20,20, now(),now(),1);
-insert into lams_workspace (workspace_id, root_folder_id, name) values (20,20,'Maori Test');
+insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(20,null,'Maori Workspace',20,now(),now(),1);
+insert into lams_workspace (workspace_id, default_fld_id, name) values (20,20,'Maori Test');
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (20,20);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_language,locale_country)
values(20,'maori','maori','Dr','Maori','Test','20', 'Maori Ave',null,'Auckland',null,'New Zealand','0211111111','0211111112','0411111111','0211111113','maori@xx.os',0,'20041223',1,20,1,3,'mi','nz');
Index: lams_common/db/sql/shaun/lams_user_norwegian.sql
===================================================================
diff -u -r019539a3c81dc79e95929d91aeb122fc47379b8e -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/shaun/lams_user_norwegian.sql (.../lams_user_norwegian.sql) (revision 019539a3c81dc79e95929d91aeb122fc47379b8e)
+++ lams_common/db/sql/shaun/lams_user_norwegian.sql (.../lams_user_norwegian.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -1,9 +1,10 @@
SET FOREIGN_KEY_CHECKS=0;
-- need a new workspace_id and the name changes for each user.
-insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(14,null,'Norwegian Workspace',14,14, now(),now(),1);
-insert into lams_workspace (workspace_id, root_folder_id, name) values (14,14,'Norwegian Test');
+insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(14,null,'Norwegian Workspace',14,now(),now(),1);
+insert into lams_workspace (workspace_id, default_fld_id, name) values (14,14,'Norwegian Test');
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (14,14);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_language,locale_country)
values(14,'norwegian','norwegian','Dr','Norwegian','Test','14', 'Norwegian Ave',null,'Oslo',null,'Norway','0211111111','0211111112','0411111111','0211111113','norwegian@xx.os',0,'20041223',1,14,1,3,'no',null);
Index: lams_common/db/sql/shaun/lams_user_polish.sql
===================================================================
diff -u -r019539a3c81dc79e95929d91aeb122fc47379b8e -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/shaun/lams_user_polish.sql (.../lams_user_polish.sql) (revision 019539a3c81dc79e95929d91aeb122fc47379b8e)
+++ lams_common/db/sql/shaun/lams_user_polish.sql (.../lams_user_polish.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -1,9 +1,10 @@
SET FOREIGN_KEY_CHECKS=0;
-- need a new workspace_id and the name changes for each user.
-insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(17,null,'Polish Workspace',17,17, now(),now(),1);
-insert into lams_workspace (workspace_id, root_folder_id, name) values (17,17,'Polish Test');
+insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(17,null,'Polish Workspace',17,now(),now(),1);
+insert into lams_workspace (workspace_id, default_fld_id, name) values (17,17,'Polish Test');
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (17,17);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_language,locale_country)
values(17,'polish','polish','Dr','Polish','Test','17', 'Polish Ave',null,'Warsaw',null,'Poland','0211111111','0211111112','0411111111','0211111113','polish@xx.os',0,'20041223',1,17,1,3,'pl',null);
Index: lams_common/db/sql/shaun/lams_user_portbr.sql
===================================================================
diff -u -r019539a3c81dc79e95929d91aeb122fc47379b8e -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/shaun/lams_user_portbr.sql (.../lams_user_portbr.sql) (revision 019539a3c81dc79e95929d91aeb122fc47379b8e)
+++ lams_common/db/sql/shaun/lams_user_portbr.sql (.../lams_user_portbr.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -1,9 +1,10 @@
SET FOREIGN_KEY_CHECKS=0;
-- need a new workspace_id and the name changes for each user.
-insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(15,null,'Portuguese Workspace',15,15, now(),now(),1);
-insert into lams_workspace (workspace_id, root_folder_id, name) values (15,15,'Portuguese Test');
+insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(15,null,'Portuguese Workspace',15,now(),now(),1);
+insert into lams_workspace (workspace_id, default_fld_id, name) values (15,15,'Portuguese Test');
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (15,15);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_language,locale_country)
values(15,'portuguese','portuguese','Dr','Portuguese','Test','15', 'Portuguese Ave',null,'Brasilia',null,'Brazil','0211111111','0211111112','0411111111','0211111113','portuguese@xx.os',0,'20041223',1,15,1,3,'pt','br');
Index: lams_common/db/sql/shaun/lams_user_spanish.sql
===================================================================
diff -u -r019539a3c81dc79e95929d91aeb122fc47379b8e -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/shaun/lams_user_spanish.sql (.../lams_user_spanish.sql) (revision 019539a3c81dc79e95929d91aeb122fc47379b8e)
+++ lams_common/db/sql/shaun/lams_user_spanish.sql (.../lams_user_spanish.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -1,9 +1,10 @@
SET FOREIGN_KEY_CHECKS=0;
-- need a new workspace_id and the name changes for each user.
-insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(19,null,'Spanish Workspace',19,19, now(),now(),1);
-insert into lams_workspace (workspace_id, root_folder_id, name) values (19,19,'Spanish Test');
+insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(19,null,'Spanish Workspace',19,now(),now(),1);
+insert into lams_workspace (workspace_id, default_fld_id, name) values (19,19,'Spanish Test');
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (19,19);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_language,locale_country)
values(19,'spanish','spanish','Dr','Spanish','Test','19', 'Spanish Ave',null,'Madrid',null,'Spain','0211111111','0211111112','0411111111','0211111113','spanish@xx.os',0,'20041223',1,19,1,3,'es',null);
Index: lams_common/db/sql/shaun/lams_user_swedish.sql
===================================================================
diff -u -rc0668a550d7d31e3312555e8ac807f36f86b8d5c -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/db/sql/shaun/lams_user_swedish.sql (.../lams_user_swedish.sql) (revision c0668a550d7d31e3312555e8ac807f36f86b8d5c)
+++ lams_common/db/sql/shaun/lams_user_swedish.sql (.../lams_user_swedish.sql) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -1,9 +1,10 @@
SET FOREIGN_KEY_CHECKS=0;
-- need a new workspace_id and the name changes for each user.
-insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
-values(9,null,'Swedish Workspace',9,9,now(),now(),1);
-insert into lams_workspace (workspace_id, root_folder_id, name) values (9,9,'Swedish Test');
+insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(9,null,'Swedish Workspace',9,now(),now(),1);
+insert into lams_workspace (workspace_id, default_fld_id, name) values (9,9,'Swedish Test');
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (9,9);
insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_language,locale_country)
values(9,'swedish','swedish','Dr','Sweden','Test','9','Swedish Ave',null,'Stockholm',null,'Sweden','0211111111','0211111112','0411111111','0211111113','swedish@xx.os',0,'20041223',1,9,1,3,'sv',null);
Index: lams_common/db/sql/shaun/lams_user_thai.sql
===================================================================
diff -u
--- lams_common/db/sql/shaun/lams_user_thai.sql (revision 0)
+++ lams_common/db/sql/shaun/lams_user_thai.sql (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -0,0 +1,24 @@
+SET FOREIGN_KEY_CHECKS=0;
+
+-- need a new workspace_id and the name changes for each user.
+insert into lams_workspace_folder(workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
+values(24,null,'Thai Workspace',24,now(),now(),1);
+insert into lams_workspace (workspace_id, default_fld_id, name) values (24,24,'Thai Test');
+insert into lams_workspace_workspace_folder (workspace_id, workspace_folder_id) values (24,24);
+
+insert into lams_user(user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,city,state,country,day_phone,evening_phone,mobile_phone,fax,email,disabled_flag,create_date,authentication_method_id,workspace_id, flash_theme_id,html_theme_id,locale_language,locale_country)
+values(24,'thai','thai','Dr','Thai','Test','24', 'Thai Ave',null,'Bangkok',null,'Thailand','0211111111','0211111112','0411111111','0211111113','thai@xx.os',0,'20041223',1,24,1,3,'th',null);
+
+-- need a new user_organisation_id for each row, user_id must match user_id created in the lams_user
+-- belongs to course Playpen, Class Everybody
+INSERT INTO lams_user_organisation (user_organisation_id, organisation_id, user_id) VALUES (56, 2, 24);
+INSERT INTO lams_user_organisation (user_organisation_id, organisation_id, user_id) VALUES (57, 3, 24);
+
+-- need a new user_organisation_role_id for each row, use the same role_ids (3,5,6) for author, learner, teacher
+INSERT INTO lams_user_organisation_role (user_organisation_role_id, user_organisation_id, role_id) VALUES (137,56,3);
+INSERT INTO lams_user_organisation_role (user_organisation_role_id, user_organisation_id, role_id) VALUES (138,56,5);
+INSERT INTO lams_user_organisation_role (user_organisation_role_id, user_organisation_id, role_id) VALUES (139,56,6);
+INSERT INTO lams_user_organisation_role (user_organisation_role_id, user_organisation_id, role_id) VALUES (140,57,5);
+INSERT INTO lams_user_organisation_role (user_organisation_role_id, user_organisation_id, role_id) VALUES (141,57,6);
+
+SET FOREIGN_KEY_CHECKS=1;
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r41d952fd0b939d2d4248dbcd9bc20bcdd52a04b5 -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 41d952fd0b939d2d4248dbcd9bc20bcdd52a04b5)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -82,6 +82,7 @@
singleton="false"
>
@@ -63,10 +71,26 @@
*/
public class UserManagementService implements IUserManagementService {
- private Logger log = Logger.getLogger(UserManagementService.class);
+ private Logger log = Logger.getLogger(UserManagementService.class);
+ private static final String SEQUENCES_FOLDER_NAME_KEY = "runsequences.folder.name";
private IBaseDAO baseDAO;
+ protected MessageService messageService;
+ /**
+ * Set i18n MessageService
+ */
+ public void setMessageService(MessageService messageService) {
+ this.messageService = messageService;
+ }
+
+ /**
+ * Get i18n MessageService
+ */
+ public MessageService getMessageService() {
+ return this.messageService;
+ }
+
public void setBaseDAO(IBaseDAO baseDAO){
this.baseDAO = baseDAO;
}
@@ -353,12 +377,62 @@
if(user.getUserId()==null){//new User
Workspace workspace = new Workspace(user.getFullName());
save(workspace);
- WorkspaceFolder folder = new WorkspaceFolder(workspace.getName(),workspace.getWorkspaceId(),user.getUserId(),new Date(),new Date(),WorkspaceFolder.NORMAL);
+ WorkspaceFolder folder = new WorkspaceFolder(workspace.getName(),user.getUserId(),new Date(),new Date(),WorkspaceFolder.NORMAL);
save(folder);
- workspace.setRootFolder(folder);
+ if ( workspace.getFolders() == null )
+ workspace.setFolders(new HashSet());
+ workspace.getFolders().add(folder);
user.setWorkspace(workspace);
}
return user;
}
+ public Organisation saveOrganisation( Organisation organisation, Integer userID )
+ {
+
+ if ( organisation.getOrganisationId() == null ) {
+ Date createDateTime = new Date();
+ organisation.setCreateDate(createDateTime);
+
+ if(organisation.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.COURSE_TYPE)){
+ Workspace workspace = createWorkspaceForOrganisation(organisation.getName(), userID, createDateTime);
+ organisation.setWorkspace(workspace);
+ }
+ }
+
+ save(organisation);
+ return organisation;
+ }
+
+ public Workspace createWorkspaceForOrganisation(String workspaceName, Integer userID, Date createDateTime ) {
+
+ // this method is public so it can be accessed from the junit test
+
+ WorkspaceFolder workspaceFolder = new WorkspaceFolder(workspaceName,userID, createDateTime, createDateTime, WorkspaceFolder.NORMAL);
+ save(workspaceFolder);
+
+ String description = messageService.getMessage(SEQUENCES_FOLDER_NAME_KEY, new Object[] {workspaceName});
+ if ( description != null && description.startsWith("???") ) {
+ log.warn("Problem in the language file - can't find an entry for "+SEQUENCES_FOLDER_NAME_KEY+
+ ". Creating folder as \"run sequences\" ");
+ description = "run sequences";
+ }
+ WorkspaceFolder workspaceFolder2 = new WorkspaceFolder(description,userID, createDateTime, createDateTime, WorkspaceFolder.RUN_SEQUENCES);
+ workspaceFolder2.setParentWorkspaceFolder(workspaceFolder);
+ save(workspaceFolder2);
+
+ Workspace workspace = new Workspace(workspaceName);
+ if ( workspace.getFolders() == null )
+ workspace.setFolders(new HashSet());
+
+ workspace.getFolders().add(workspaceFolder);
+ workspace.setDefaultFolder(workspaceFolder);
+ workspace.getFolders().add(workspaceFolder2);
+ workspace.setDefaultRunSequencesFolder(workspaceFolder2);
+
+ save(workspace);
+
+ return workspace;
+ }
+
}
Index: lams_common/test/java/log4j.properties
===================================================================
diff -u -r4eec331f9f942c1e14a5511bfad81fb618cf12d4 -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/test/java/log4j.properties (.../log4j.properties) (revision 4eec331f9f942c1e14a5511bfad81fb618cf12d4)
+++ lams_common/test/java/log4j.properties (.../log4j.properties) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -1,4 +1,4 @@
-log4j.rootLogger=ERROR,stdout
+log4j.rootLogger=DEBUG,stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d %5p (%F:%L) - %m%n
\ No newline at end of file
Index: lams_common/test/java/org/lamsfoundation/lams/test/AbstractCommonTestCase.java
===================================================================
diff -u -r8d7fbb9d04178c47476596b238655bf8ce2214ca -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/test/java/org/lamsfoundation/lams/test/AbstractCommonTestCase.java (.../AbstractCommonTestCase.java) (revision 8d7fbb9d04178c47476596b238655bf8ce2214ca)
+++ lams_common/test/java/org/lamsfoundation/lams/test/AbstractCommonTestCase.java (.../AbstractCommonTestCase.java) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -44,7 +44,8 @@
protected String[] getContextConfigLocation() {
return new String[] {"org/lamsfoundation/lams/localApplicationContext.xml",
- "org/lamsfoundation/lams/lesson/lessonApplicationContext.xml"};
+ "org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
+ "org/lamsfoundation/lams/toolApplicationContext.xml"};
}
/**
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java
===================================================================
diff -u -r1cf7c0417373748f7caa618ee9645f440717c9ed -r8a4d69bf6159f6bcd910eb930d77016e255619e9
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java (.../TestUserManagementService.java) (revision 1cf7c0417373748f7caa618ee9645f440717c9ed)
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java (.../TestUserManagementService.java) (revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
@@ -24,6 +24,7 @@
package org.lamsfoundation.lams.usermanagement;
import java.util.Date;
+import java.util.HashSet;
import org.lamsfoundation.lams.dao.IBaseDAO;
import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
@@ -51,35 +52,18 @@
}
public void testCreateWorkspace(){
-
- Workspace workspace = new Workspace(WORKSPACE_NAME);
- userManagementService.save(workspace);
- Integer workspaceId = workspace.getWorkspaceId();
+ Long now = new Long(System.currentTimeMillis());
+ String name = WORKSPACE_NAME + now.toString();
+ Workspace workspace = userManagementService.createWorkspaceForOrganisation(name, MMM_USER_ID, new Date());
- // set up the root folder
- WorkspaceFolder rootWorkspaceFolder = new WorkspaceFolder(workspace.getName(),workspace.getWorkspaceId(),
- MMM_USER_ID, new Date(), new Date(), WorkspaceFolder.NORMAL);
- userManagementService.save(rootWorkspaceFolder);
- workspace.setRootFolder(rootWorkspaceFolder);
-
- // set up the default workspace folder, under the root folder
- String sequenceFolderName = workspace.getName()+"_Sequences";
- WorkspaceFolder defRunSequencesFolder = new WorkspaceFolder(sequenceFolderName,workspace.getWorkspaceId(),
- MMM_USER_ID,new Date(), new Date(), WorkspaceFolder.RUN_SEQUENCES);
- userManagementService.save(defRunSequencesFolder);
- workspace.setDefaultRunSequencesFolder(defRunSequencesFolder);
- userManagementService.save(workspace);
-
// is it all okay in the db? Not 100% test as this just checks what Hibernate has, not what the db has.
- Workspace retrievedWorkspace = (Workspace) baseDAO.find(Workspace.class, workspaceId);
- assertNotNull("Retrieved saved workspace id="+workspaceId, retrievedWorkspace);
- assertEquals("Workspace name as expected "+WORKSPACE_NAME, WORKSPACE_NAME, retrievedWorkspace.getName());
- assertNotNull("Root folder exists",retrievedWorkspace.getRootFolder());
- assertEquals("Root folder has expected id "+rootWorkspaceFolder.getWorkspaceFolderId(), rootWorkspaceFolder.getWorkspaceFolderId(), retrievedWorkspace.getRootFolder().getWorkspaceFolderId());
+ Workspace retrievedWorkspace = (Workspace) baseDAO.find(Workspace.class, workspace.getWorkspaceId());
+ assertNotNull("Retrieved saved workspace id="+workspace.getWorkspaceId(), retrievedWorkspace);
+ assertEquals("Workspace name as expected "+name, name, retrievedWorkspace.getName());
+ assertNotNull("Root folder exists",retrievedWorkspace.getDefaultFolder());
assertNotNull("Default run sequences folder exists", retrievedWorkspace.getDefaultRunSequencesFolder());
- assertEquals("Default run sequences folder has expected id "+defRunSequencesFolder.getWorkspaceFolderId(), defRunSequencesFolder.getWorkspaceFolderId(), retrievedWorkspace.getDefaultRunSequencesFolder().getWorkspaceFolderId());
- }
+ }
/* public void testSaveOrganisation(){
Organisation organisation = new Organisation("Test Organisation",
"Test Organisation Description",