Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml =================================================================== diff -u -rcadb456a32c5e95823f3472fd99a0b17c52b9218 -r7697bd6b1da52d525246c6b28a2508d167b32a47 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml (.../AuthenticationMethodType.hbm.xml) (revision cadb456a32c5e95823f3472fd99a0b17c52b9218) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml (.../AuthenticationMethodType.hbm.xml) (revision 7697bd6b1da52d525246c6b28a2508d167b32a47) @@ -13,11 +13,11 @@ @hibernate.class - table="lams_authentication_method_type" + table="lams_auth_method_type" true Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceWorkspaceFolder.hbm.xml =================================================================== diff -u -ra07f122478a2eb187e7448fbfe41a738504e3f26 -r7697bd6b1da52d525246c6b28a2508d167b32a47 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceWorkspaceFolder.hbm.xml (.../WorkspaceWorkspaceFolder.hbm.xml) (revision a07f122478a2eb187e7448fbfe41a738504e3f26) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceWorkspaceFolder.hbm.xml (.../WorkspaceWorkspaceFolder.hbm.xml) (revision 7697bd6b1da52d525246c6b28a2508d167b32a47) @@ -13,11 +13,11 @@ @hibernate.class - table="lams_workspace_workspace_folder" + table="lams_wkspc_wkspc_folder" true Index: lams_common/db/model/lams_11.clay =================================================================== diff -u -ra0f3adf1d8701263b284822c4fcb6661bb519dac -r7697bd6b1da52d525246c6b28a2508d167b32a47 --- lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision a0f3adf1d8701263b284822c4fcb6661bb519dac) +++ lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 7697bd6b1da52d525246c6b28a2508d167b32a47) @@ -56,7 +56,7 @@ - + @@ -75,7 +75,7 @@ - +
@@ -4469,7 +4469,7 @@ - + @@ -4479,7 +4479,7 @@
- +
@@ -4504,7 +4504,7 @@ - + @@ -4974,7 +4974,7 @@
- +
@@ -5018,25 +5018,25 @@ - + - + - + - + - + Index: lams_common/db/sql/create_lams_11_tables.sql =================================================================== diff -u -r21e9dc2239df1ec1c53d9fb911620d3a85fd0e6e -r7697bd6b1da52d525246c6b28a2508d167b32a47 --- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 21e9dc2239df1ec1c53d9fb911620d3a85fd0e6e) +++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 7697bd6b1da52d525246c6b28a2508d167b32a47) @@ -117,7 +117,7 @@ , PRIMARY KEY (log_event_type_id) )TYPE=InnoDB; -CREATE TABLE lams_workspace_folder_content_type ( +CREATE TABLE lams_wkspc_fld_content_type ( content_type_id INT(3) NOT NULL AUTO_INCREMENT , description VARCHAR(64) NOT NULL , PRIMARY KEY (content_type_id) @@ -151,7 +151,7 @@ COMMENT 'ISO 3166 Country Code'; -CREATE TABLE lams_authentication_method_type ( +CREATE TABLE lams_auth_method_type ( authentication_method_type_id INT(3) NOT NULL , description VARCHAR(64) NOT NULL , PRIMARY KEY (authentication_method_type_id) @@ -165,7 +165,7 @@ , PRIMARY KEY (authentication_method_id) , INDEX (authentication_method_type_id) , CONSTRAINT FK_lams_authorization_method_1 FOREIGN KEY (authentication_method_type_id) - REFERENCES lams_authentication_method_type (authentication_method_type_id) ON DELETE NO ACTION ON UPDATE NO ACTION + REFERENCES lams_auth_method_type (authentication_method_type_id) ON DELETE NO ACTION ON UPDATE NO ACTION )TYPE=InnoDB; CREATE TABLE lams_workspace_folder ( @@ -199,16 +199,16 @@ REFERENCES lams_workspace_folder (workspace_folder_id) )TYPE=InnoDB; -CREATE TABLE lams_workspace_workspace_folder ( +CREATE TABLE lams_wkspc_wkspc_folder ( id BIGINT(20) NOT NULL AUTO_INCREMENT , workspace_id BIGINT(20) NOT NULL , workspace_folder_id BIGINT(20) NOT NULL , PRIMARY KEY (id) , INDEX (workspace_id) - , CONSTRAINT FK_lams_workspace_workspace_folder_1 FOREIGN KEY (workspace_id) + , CONSTRAINT FK_lams_ww_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) + , CONSTRAINT FK_lams_ww_folder_2 FOREIGN KEY (workspace_folder_id) REFERENCES lams_workspace_folder (workspace_folder_id) )TYPE=InnoDB; @@ -805,7 +805,7 @@ REFERENCES lams_workspace_folder (workspace_folder_id) , INDEX (content_type_id) , CONSTRAINT FK_lams_workspace_folder_content_2 FOREIGN KEY (content_type_id) - REFERENCES lams_workspace_folder_content_type (content_type_id) + REFERENCES lams_wkspc_fld_content_type (content_type_id) )TYPE=InnoDB; CREATE TABLE lams_learning_transition ( Index: lams_common/db/sql/create_quartz_table.sql =================================================================== diff -u -r796f8086a008d73d647b95bd44a85c712ee40da3 -r7697bd6b1da52d525246c6b28a2508d167b32a47 --- lams_common/db/sql/create_quartz_table.sql (.../create_quartz_table.sql) (revision 796f8086a008d73d647b95bd44a85c712ee40da3) +++ lams_common/db/sql/create_quartz_table.sql (.../create_quartz_table.sql) (revision 7697bd6b1da52d525246c6b28a2508d167b32a47) @@ -10,21 +10,21 @@ set foreign_key_checks = 0; -DROP TABLE IF EXISTS lams_quartz_JOB_LISTENERS; -DROP TABLE IF EXISTS lams_quartz_TRIGGER_LISTENERS; -DROP TABLE IF EXISTS lams_quartz_FIRED_TRIGGERS; -DROP TABLE IF EXISTS lams_quartz_PAUSED_TRIGGER_GRPS; -DROP TABLE IF EXISTS lams_quartz_SCHEDULER_STATE; -DROP TABLE IF EXISTS lams_quartz_LOCKS; -DROP TABLE IF EXISTS lams_quartz_SIMPLE_TRIGGERS; -DROP TABLE IF EXISTS lams_quartz_CRON_TRIGGERS; -DROP TABLE IF EXISTS lams_quartz_BLOB_TRIGGERS; -DROP TABLE IF EXISTS lams_quartz_TRIGGERS; -DROP TABLE IF EXISTS lams_quartz_JOB_DETAILS; -DROP TABLE IF EXISTS lams_quartz_CALENDARS; +DROP TABLE IF EXISTS lams_qtz_JOB_LISTENERS; +DROP TABLE IF EXISTS lams_qtz_TRIGGER_LISTENERS; +DROP TABLE IF EXISTS lams_qtz_FIRED_TRIGGERS; +DROP TABLE IF EXISTS lams_qtz_PAUSED_TRIGGER_GRPS; +DROP TABLE IF EXISTS lams_qtz_SCHEDULER_STATE; +DROP TABLE IF EXISTS lams_qtz_LOCKS; +DROP TABLE IF EXISTS lams_qtz_SIMPLE_TRIGGERS; +DROP TABLE IF EXISTS lams_qtz_CRON_TRIGGERS; +DROP TABLE IF EXISTS lams_qtz_BLOB_TRIGGERS; +DROP TABLE IF EXISTS lams_qtz_TRIGGERS; +DROP TABLE IF EXISTS lams_qtz_JOB_DETAILS; +DROP TABLE IF EXISTS lams_qtz_CALENDARS; -CREATE TABLE lams_quartz_JOB_DETAILS +CREATE TABLE lams_qtz_JOB_DETAILS ( JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, @@ -38,17 +38,17 @@ PRIMARY KEY (JOB_NAME,JOB_GROUP) ); -CREATE TABLE lams_quartz_JOB_LISTENERS +CREATE TABLE lams_qtz_JOB_LISTENERS ( JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, JOB_LISTENER VARCHAR(80) NOT NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP,JOB_LISTENER), FOREIGN KEY (JOB_NAME,JOB_GROUP) - REFERENCES lams_quartz_JOB_DETAILS(JOB_NAME,JOB_GROUP) + REFERENCES lams_qtz_JOB_DETAILS(JOB_NAME,JOB_GROUP) ); -CREATE TABLE lams_quartz_TRIGGERS +CREATE TABLE lams_qtz_TRIGGERS ( TRIGGER_NAME VARCHAR(80) NOT NULL, TRIGGER_GROUP VARCHAR(80) NOT NULL, @@ -67,10 +67,10 @@ JOB_DATA BLOB NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (JOB_NAME,JOB_GROUP) - REFERENCES lams_quartz_JOB_DETAILS(JOB_NAME,JOB_GROUP) + REFERENCES lams_qtz_JOB_DETAILS(JOB_NAME,JOB_GROUP) ); -CREATE TABLE lams_quartz_SIMPLE_TRIGGERS +CREATE TABLE lams_qtz_SIMPLE_TRIGGERS ( TRIGGER_NAME VARCHAR(80) NOT NULL, TRIGGER_GROUP VARCHAR(80) NOT NULL, @@ -79,42 +79,42 @@ TIMES_TRIGGERED BIGINT(7) NOT NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) - REFERENCES lams_quartz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP) + REFERENCES lams_qtz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP) ); -CREATE TABLE lams_quartz_CRON_TRIGGERS +CREATE TABLE lams_qtz_CRON_TRIGGERS ( TRIGGER_NAME VARCHAR(80) NOT NULL, TRIGGER_GROUP VARCHAR(80) NOT NULL, CRON_EXPRESSION VARCHAR(80) NOT NULL, TIME_ZONE_ID VARCHAR(80), PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) - REFERENCES lams_quartz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP) + REFERENCES lams_qtz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP) ); -CREATE TABLE lams_quartz_BLOB_TRIGGERS +CREATE TABLE lams_qtz_BLOB_TRIGGERS ( TRIGGER_NAME VARCHAR(80) NOT NULL, TRIGGER_GROUP VARCHAR(80) NOT NULL, BLOB_DATA BLOB NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) - REFERENCES lams_quartz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP) + REFERENCES lams_qtz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP) ); -CREATE TABLE lams_quartz_TRIGGER_LISTENERS +CREATE TABLE lams_qtz_TRIGGER_LISTENERS ( TRIGGER_NAME VARCHAR(80) NOT NULL, TRIGGER_GROUP VARCHAR(80) NOT NULL, TRIGGER_LISTENER VARCHAR(80) NOT NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_LISTENER), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) - REFERENCES lams_quartz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP) + REFERENCES lams_qtz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP) ); -CREATE TABLE lams_quartz_CALENDARS +CREATE TABLE lams_qtz_CALENDARS ( CALENDAR_NAME VARCHAR(80) NOT NULL, CALENDAR BLOB NOT NULL, @@ -123,13 +123,13 @@ -CREATE TABLE lams_quartz_PAUSED_TRIGGER_GRPS +CREATE TABLE lams_qtz_PAUSED_TRIGGER_GRPS ( TRIGGER_GROUP VARCHAR(80) NOT NULL, PRIMARY KEY (TRIGGER_GROUP) ); -CREATE TABLE lams_quartz_FIRED_TRIGGERS +CREATE TABLE lams_qtz_FIRED_TRIGGERS ( ENTRY_ID VARCHAR(95) NOT NULL, TRIGGER_NAME VARCHAR(80) NOT NULL, @@ -145,7 +145,7 @@ PRIMARY KEY (ENTRY_ID) ); -CREATE TABLE lams_quartz_SCHEDULER_STATE +CREATE TABLE lams_qtz_SCHEDULER_STATE ( INSTANCE_NAME VARCHAR(80) NOT NULL, LAST_CHECKIN_TIME BIGINT(13) NOT NULL, @@ -154,18 +154,18 @@ PRIMARY KEY (INSTANCE_NAME) ); -CREATE TABLE lams_quartz_LOCKS +CREATE TABLE lams_qtz_LOCKS ( LOCK_NAME VARCHAR(40) NOT NULL, PRIMARY KEY (LOCK_NAME) ); -INSERT INTO lams_quartz_LOCKS values('TRIGGER_ACCESS'); -INSERT INTO lams_quartz_LOCKS values('JOB_ACCESS'); -INSERT INTO lams_quartz_LOCKS values('CALENDAR_ACCESS'); -INSERT INTO lams_quartz_LOCKS values('STATE_ACCESS'); -INSERT INTO lams_quartz_LOCKS values('MISFIRE_ACCESS'); +INSERT INTO lams_qtz_LOCKS values('TRIGGER_ACCESS'); +INSERT INTO lams_qtz_LOCKS values('JOB_ACCESS'); +INSERT INTO lams_qtz_LOCKS values('CALENDAR_ACCESS'); +INSERT INTO lams_qtz_LOCKS values('STATE_ACCESS'); +INSERT INTO lams_qtz_LOCKS values('MISFIRE_ACCESS'); set foreign_key_checks = 1; \ No newline at end of file Index: lams_common/db/sql/insert_types_data.sql =================================================================== diff -u -r0482923600d875cbe0e7ffc2d66bb25ccf03c2ba -r7697bd6b1da52d525246c6b28a2508d167b32a47 --- lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 0482923600d875cbe0e7ffc2d66bb25ccf03c2ba) +++ lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 7697bd6b1da52d525246c6b28a2508d167b32a47) @@ -43,9 +43,9 @@ INSERT INTO lams_role_privilege VALUES (21,6,13); -INSERT INTO lams_authentication_method_type VALUES(1, 'LAMS'); -INSERT INTO lams_authentication_method_type VALUES(2, 'WEB_AUTH'); -INSERT INTO lams_authentication_method_type VALUES(3, 'LDAP'); +INSERT INTO lams_auth_method_type VALUES(1, 'LAMS'); +INSERT INTO lams_auth_method_type VALUES(2, 'WEB_AUTH'); +INSERT INTO lams_auth_method_type VALUES(3, 'LDAP'); INSERT INTO lams_organisation_type VALUES(1, 'ROOT ORGANISATION', 'root all other organisations: controlled by Sysadmin'); INSERT INTO lams_organisation_type VALUES(2, 'COURSE ORGANISATION', 'main organisation level - equivalent to an entire course.'); @@ -124,8 +124,8 @@ INSERT INTO lams_log_event_type VALUES (5, 'LEARNER_ACTIVITY_START'); INSERT INTO lams_log_event_type VALUES (6, 'LEARNER_ACTIVITY_FINISH'); -INSERT INTO lams_workspace_folder_content_type VALUES (1,'FILE'); -INSERT INTO lams_workspace_folder_content_type VALUES (2,'PACKAGE'); +INSERT INTO lams_wkspc_fld_content_type VALUES (1,'FILE'); +INSERT INTO lams_wkspc_fld_content_type VALUES (2,'PACKAGE'); 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, Index: lams_common/db/sql/insert_users.sql =================================================================== diff -u -rc21c3386cec2ee819ba267d84d532676d2f4990d -r7697bd6b1da52d525246c6b28a2508d167b32a47 --- lams_common/db/sql/insert_users.sql (.../insert_users.sql) (revision c21c3386cec2ee819ba267d84d532676d2f4990d) +++ lams_common/db/sql/insert_users.sql (.../insert_users.sql) (revision 7697bd6b1da52d525246c6b28a2508d167b32a47) @@ -56,16 +56,16 @@ 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 (id, workspace_id, workspace_folder_id) values (1, 1,1); -insert into lams_workspace_workspace_folder (id, workspace_id, workspace_folder_id) values (2, 2,2); -insert into lams_workspace_workspace_folder (id, workspace_id, workspace_folder_id) values (3, 2,22); -insert into lams_workspace_workspace_folder (id, workspace_id, workspace_folder_id) values (4, 3,3); -insert into lams_workspace_workspace_folder (id, workspace_id, workspace_folder_id) values (5, 3,23); -insert into lams_workspace_workspace_folder (id, workspace_id, workspace_folder_id) values (6, 4,4); -insert into lams_workspace_workspace_folder (id, workspace_id, workspace_folder_id) values (7, 5,5); -insert into lams_workspace_workspace_folder (id, workspace_id, workspace_folder_id) values (8, 6,6); -insert into lams_workspace_workspace_folder (id, workspace_id, workspace_folder_id) values (9, 7,7); -insert into lams_workspace_workspace_folder (id, workspace_id, workspace_folder_id) values (10, 8,8); +insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (1, 1,1); +insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (2, 2,2); +insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (3, 2,22); +insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (4, 3,3); +insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (5, 3,23); +insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (6, 4,4); +insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (7, 5,5); +insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (8, 6,6); +insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (9, 7,7); +insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (10, 8,8); INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, workspace_id, locale_id, organisation_state_id) VALUES (1, 'Root', null, 'Root Organisation',null,1,NOW(),1,1,1); Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r7697bd6b1da52d525246c6b28a2508d167b32a47 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.java (.../AuthenticationMethodType.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.java (.../AuthenticationMethodType.java) (revision 7697bd6b1da52d525246c6b28a2508d167b32a47) @@ -31,7 +31,7 @@ /** * @hibernate.class - * table="lams_authentication_method_type" + * table="lams_auth_method_type" * */ public class AuthenticationMethodType implements Serializable { Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceWorkspaceFolder.java =================================================================== diff -u -ra07f122478a2eb187e7448fbfe41a738504e3f26 -r7697bd6b1da52d525246c6b28a2508d167b32a47 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceWorkspaceFolder.java (.../WorkspaceWorkspaceFolder.java) (revision a07f122478a2eb187e7448fbfe41a738504e3f26) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceWorkspaceFolder.java (.../WorkspaceWorkspaceFolder.java) (revision 7697bd6b1da52d525246c6b28a2508d167b32a47) @@ -33,7 +33,7 @@ * Join table that maps workspace to workspace folders. Was having trouble getting Hibernate * to persist the join table. * - * @hibernate.class table="lams_workspace_workspace_folder" + * @hibernate.class table="lams_wkspc_wkspc_folder" * * @author Fiona Malikoff * Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml =================================================================== diff -u -r47a3094af8f0cd514ca3d06de4084389ea000059 -r7697bd6b1da52d525246c6b28a2508d167b32a47 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml (.../monitoringApplicationContext.xml) (revision 47a3094af8f0cd514ca3d06de4084389ea000059) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml (.../monitoringApplicationContext.xml) (revision 7697bd6b1da52d525246c6b28a2508d167b32a47) @@ -100,7 +100,7 @@ org.springframework.scheduling.quartz.LocalDataSourceJobStore org.quartz.impl.jdbcjobstore.StdJDBCDelegate - lams_quartz_ + lams_qtz_