Index: lams_tool_images/db/model/imageGallery.clay
===================================================================
diff -u -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_images/db/model/imageGallery.clay (.../imageGallery.clay) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2)
+++ lams_tool_images/db/model/imageGallery.clay (.../imageGallery.clay) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -69,7 +69,7 @@
-
+
@@ -162,7 +162,7 @@
-
+
@@ -281,7 +281,7 @@
-
+
@@ -300,7 +300,7 @@
-
+
-
+
@@ -653,7 +653,7 @@
-
+
@@ -756,7 +756,7 @@
-
+
@@ -868,7 +868,7 @@
-
+
Index: lams_tool_images/db/sql/create_lams_tool_imageGallery.sql
===================================================================
diff -u -rde59f382658daefe4f6679aaaea621284d1c72cc -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_images/db/sql/create_lams_tool_imageGallery.sql (.../create_lams_tool_imageGallery.sql) (revision de59f382658daefe4f6679aaaea621284d1c72cc)
+++ lams_tool_images/db/sql/create_lams_tool_imageGallery.sql (.../create_lams_tool_imageGallery.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -1,7 +1,7 @@
SET FOREIGN_KEY_CHECKS=0;
drop table if exists tl_laimag10_attachment;
-drop table if exists tl_laimag10_imageGallery;
-drop table if exists tl_laimag10_imageGallery_item;
+drop table if exists tl_laimag10_imagegallery;
+drop table if exists tl_laimag10_imagegallery_item;
drop table if exists tl_laimag10_image_comment;
drop table if exists tl_laimag10_image_rating;
drop table if exists tl_laimag10_image_vote;
@@ -20,7 +20,7 @@
imageGallery_uid bigint,
primary key (attachment_uid)
)ENGINE=InnoDB;
-create table tl_laimag10_imageGallery (
+create table tl_laimag10_imagegallery (
uid bigint not null auto_increment,
create_date datetime,
update_date datetime,
@@ -44,7 +44,7 @@
image_submit_notify tinyint DEFAULT 0,
primary key (uid)
)ENGINE=InnoDB;
-create table tl_laimag10_imageGallery_item (
+create table tl_laimag10_imagegallery_item (
uid bigint not null auto_increment,
description text,
title varchar(255),
@@ -125,23 +125,23 @@
primary key (uid)
)ENGINE=InnoDB;
-alter table tl_laimag10_attachment add index FK_NEW_1821149711_1E7009430E79035 (imageGallery_uid), add constraint FK_NEW_1821149711_1E7009430E79035 foreign key (imageGallery_uid) references tl_laimag10_imageGallery (uid);
-alter table tl_laimag10_imageGallery add index FK_NEW_1821149711_89093BF758092FB (create_by), add constraint FK_NEW_1821149711_89093BF758092FB foreign key (create_by) references tl_laimag10_user (uid);
-alter table tl_laimag10_imageGallery_item add index FK_NEW_1821149711_F52D1F93758092FB (create_by), add constraint FK_NEW_1821149711_F52D1F93758092FB foreign key (create_by) references tl_laimag10_user (uid);
-alter table tl_laimag10_imageGallery_item add index FK_NEW_1821149711_F52D1F9330E79035 (imageGallery_uid), add constraint FK_NEW_1821149711_F52D1F9330E79035 foreign key (imageGallery_uid) references tl_laimag10_imageGallery (uid);
-alter table tl_laimag10_image_comment add index FK_tl_laimag10_image_comment_3 (imageGallery_item_uid), add constraint FK_tl_laimag10_image_comment_3 foreign key (imageGallery_item_uid) references tl_laimag10_imageGallery_item (uid);
+alter table tl_laimag10_attachment add index FK_NEW_1821149711_1E7009430E79035 (imageGallery_uid), add constraint FK_NEW_1821149711_1E7009430E79035 foreign key (imageGallery_uid) references tl_laimag10_imagegallery (uid);
+alter table tl_laimag10_imagegallery add index FK_NEW_1821149711_89093BF758092FB (create_by), add constraint FK_NEW_1821149711_89093BF758092FB foreign key (create_by) references tl_laimag10_user (uid);
+alter table tl_laimag10_imagegallery_item add index FK_NEW_1821149711_F52D1F93758092FB (create_by), add constraint FK_NEW_1821149711_F52D1F93758092FB foreign key (create_by) references tl_laimag10_user (uid);
+alter table tl_laimag10_imagegallery_item add index FK_NEW_1821149711_F52D1F9330E79035 (imageGallery_uid), add constraint FK_NEW_1821149711_F52D1F9330E79035 foreign key (imageGallery_uid) references tl_laimag10_imagegallery (uid);
+alter table tl_laimag10_image_comment add index FK_tl_laimag10_image_comment_3 (imageGallery_item_uid), add constraint FK_tl_laimag10_image_comment_3 foreign key (imageGallery_item_uid) references tl_laimag10_imagegallery_item (uid);
alter table tl_laimag10_image_comment add index FK_tl_laimag10_image_comment_2 (create_by), add constraint FK_tl_laimag10_image_comment_2 foreign key (create_by) references tl_laimag10_user (uid);
-alter table tl_laimag10_image_rating add index FK_tl_laimag10_image_rating_3 (imageGallery_item_uid), add constraint FK_tl_laimag10_image_rating_3 foreign key (imageGallery_item_uid) references tl_laimag10_imageGallery_item (uid);
+alter table tl_laimag10_image_rating add index FK_tl_laimag10_image_rating_3 (imageGallery_item_uid), add constraint FK_tl_laimag10_image_rating_3 foreign key (imageGallery_item_uid) references tl_laimag10_imagegallery_item (uid);
alter table tl_laimag10_image_rating add index FK_tl_laimag10_image_rating_2 (create_by), add constraint FK_tl_laimag10_image_rating_2 foreign key (create_by) references tl_laimag10_user (uid);
-alter table tl_laimag10_image_vote add index FK_tl_laimag10_image_vote_3 (imageGallery_item_uid), add constraint FK_tl_laimag10_image_vote_3 foreign key (imageGallery_item_uid) references tl_laimag10_imageGallery_item (uid);
+alter table tl_laimag10_image_vote add index FK_tl_laimag10_image_vote_3 (imageGallery_item_uid), add constraint FK_tl_laimag10_image_vote_3 foreign key (imageGallery_item_uid) references tl_laimag10_imagegallery_item (uid);
alter table tl_laimag10_image_vote add index FK_tl_laimag10_image_vote_2 (create_by), add constraint FK_tl_laimag10_image_vote_2 foreign key (create_by) references tl_laimag10_user (uid);
-alter table tl_laimag10_item_log add index FK_NEW_1821149711_693580A438BF8DFE (imageGallery_item_uid), add constraint FK_NEW_1821149711_693580A438BF8DFE foreign key (imageGallery_item_uid) references tl_laimag10_imageGallery_item (uid);
+alter table tl_laimag10_item_log add index FK_NEW_1821149711_693580A438BF8DFE (imageGallery_item_uid), add constraint FK_NEW_1821149711_693580A438BF8DFE foreign key (imageGallery_item_uid) references tl_laimag10_imagegallery_item (uid);
alter table tl_laimag10_item_log add index FK_NEW_1821149711_693580A441F9365D (user_uid), add constraint FK_NEW_1821149711_693580A441F9365D foreign key (user_uid) references tl_laimag10_user (uid);
-alter table tl_laimag10_session add index FK_NEW_1821149711_24AA78C530E79035 (imageGallery_uid), add constraint FK_NEW_1821149711_24AA78C530E79035 foreign key (imageGallery_uid) references tl_laimag10_imageGallery (uid);
+alter table tl_laimag10_session add index FK_NEW_1821149711_24AA78C530E79035 (imageGallery_uid), add constraint FK_NEW_1821149711_24AA78C530E79035 foreign key (imageGallery_uid) references tl_laimag10_imagegallery (uid);
alter table tl_laimag10_user add index FK_NEW_1821149711_30113BFCEC0D3147 (session_uid), add constraint FK_NEW_1821149711_30113BFCEC0D3147 foreign key (session_uid) references tl_laimag10_session (uid);
-alter table tl_laimag10_user add index FK_NEW_1821149711_30113BFC309ED320 (imageGallery_uid), add constraint FK_NEW_1821149711_30113BFC309ED320 foreign key (imageGallery_uid) references tl_laimag10_imageGallery (uid);
+alter table tl_laimag10_user add index FK_NEW_1821149711_30113BFC309ED320 (imageGallery_uid), add constraint FK_NEW_1821149711_30113BFC309ED320 foreign key (imageGallery_uid) references tl_laimag10_imagegallery (uid);
-INSERT INTO `tl_laimag10_imageGallery` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`,
+INSERT INTO `tl_laimag10_imagegallery` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`,
`instructions`, `next_image_title`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_comment_images`,
`allow_share_images`, `allow_vote`, `allow_rank`, `reflect_on_activity`, `image_submit_notify`) VALUES
(1,NULL,NULL,NULL,'Image Gallery','0','0','Instructions ',1,null,null,0,0,${default_content_id},0,0,0,0,0,0);
Index: lams_tool_images/db/sql/drop_lams_tool_imageGallery.sql
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_images/db/sql/drop_lams_tool_imageGallery.sql (.../drop_lams_tool_imageGallery.sql) (revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/db/sql/drop_lams_tool_imageGallery.sql (.../drop_lams_tool_imageGallery.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -1,8 +1,8 @@
SET FOREIGN_KEY_CHECKS=0;
drop table if exists tl_laimag10_attachment;
drop table if exists tl_laimag10_item_instruction;
-drop table if exists tl_laimag10_imageGallery;
-drop table if exists tl_laimag10_imageGallery_item;
+drop table if exists tl_laimag10_imagegallery;
+drop table if exists tl_laimag10_imagegallery_item;
drop table if exists tl_laimag10_item_log;
drop table if exists tl_laimag10_session;
drop table if exists tl_laimag10_user;
Index: lams_tool_images/db/sql/table-schema.sql
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_images/db/sql/table-schema.sql (.../table-schema.sql) (revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_tool_images/db/sql/table-schema.sql (.../table-schema.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -1,7 +1,7 @@
alter table tl_laimag10_attachment drop foreign key FK6AB6721D2B86FA42;
-alter table tl_laimag10_imageGallery drop foreign key FK451FBF1B98EE9FF;
-alter table tl_laimag10_imageGallery_item drop foreign key FKF75F06A1B98EE9FF;
-alter table tl_laimag10_imageGallery_item drop foreign key FKF75F06A12B86FA42;
+alter table tl_laimag10_imagegallery drop foreign key FK451FBF1B98EE9FF;
+alter table tl_laimag10_imagegallery_item drop foreign key FKF75F06A1B98EE9FF;
+alter table tl_laimag10_imagegallery_item drop foreign key FKF75F06A12B86FA42;
alter table tl_laimag10_image_comment drop foreign key FKB20640417B33199;
alter table tl_laimag10_image_comment drop foreign key FKB2064041B98EE9FF;
alter table tl_laimag10_image_rating drop foreign key FK16529B7B7B33199;
@@ -15,8 +15,8 @@
alter table tl_laimag10_user drop foreign key FKFF92C8452B86FA42;
drop table if exists tl_laimag10_attachment;
drop table if exists tl_laimag10_configuration;
-drop table if exists tl_laimag10_imageGallery;
-drop table if exists tl_laimag10_imageGallery_item;
+drop table if exists tl_laimag10_imagegallery;
+drop table if exists tl_laimag10_imagegallery_item;
drop table if exists tl_laimag10_image_comment;
drop table if exists tl_laimag10_image_rating;
drop table if exists tl_laimag10_image_vote;
@@ -25,26 +25,26 @@
drop table if exists tl_laimag10_user;
create table tl_laimag10_attachment (attachment_uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, imageGallery_uid bigint, primary key (attachment_uid));
create table tl_laimag10_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid));
-create table tl_laimag10_imageGallery (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), run_offline bit, lock_on_finished bit, instructions longtext, next_image_title bigint, online_instructions longtext, offline_instructions longtext, content_in_use bit, define_later bit, content_id bigint unique, allow_comment_images bit, allow_share_images bit, allow_vote bit, reflect_instructions varchar(255), reflect_on_activity bit, allow_rank bit, image_submit_notify bit, primary key (uid));
-create table tl_laimag10_imageGallery_item (uid bigint not null auto_increment, title varchar(255), description longtext, sequence_id integer, create_by bigint, create_date datetime, create_by_author bit, is_hide bit, original_file_uuid bigint, original_image_width integer, original_image_height integer, medium_file_uuid bigint, medium_image_width integer, medium_image_height integer, thumbnail_file_uuid bigint, file_version_id bigint, file_type varchar(255), file_name varchar(255), imageGallery_uid bigint, primary key (uid));
+create table tl_laimag10_imagegallery (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), run_offline bit, lock_on_finished bit, instructions longtext, next_image_title bigint, online_instructions longtext, offline_instructions longtext, content_in_use bit, define_later bit, content_id bigint unique, allow_comment_images bit, allow_share_images bit, allow_vote bit, reflect_instructions varchar(255), reflect_on_activity bit, allow_rank bit, image_submit_notify bit, primary key (uid));
+create table tl_laimag10_imagegallery_item (uid bigint not null auto_increment, title varchar(255), description longtext, sequence_id integer, create_by bigint, create_date datetime, create_by_author bit, is_hide bit, original_file_uuid bigint, original_image_width integer, original_image_height integer, medium_file_uuid bigint, medium_image_width integer, medium_image_height integer, thumbnail_file_uuid bigint, file_version_id bigint, file_type varchar(255), file_name varchar(255), imageGallery_uid bigint, primary key (uid));
create table tl_laimag10_image_comment (uid bigint not null auto_increment, create_date datetime, create_by bigint, comment longtext, imageGallery_item_uid bigint, primary key (uid));
create table tl_laimag10_image_rating (uid bigint not null auto_increment, create_by bigint, rating integer, imageGallery_item_uid bigint, primary key (uid));
create table tl_laimag10_image_vote (uid bigint not null auto_increment, create_by bigint, is_voted bit, imageGallery_item_uid bigint, primary key (uid));
create table tl_laimag10_item_log (uid bigint not null auto_increment, access_date datetime, imageGallery_item_uid bigint, user_uid bigint, complete bit, session_id bigint, primary key (uid));
create table tl_laimag10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, imageGallery_uid bigint, session_id bigint, session_name varchar(250), primary key (uid));
create table tl_laimag10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), login_name varchar(255), session_uid bigint, imageGallery_uid bigint, session_finished bit, primary key (uid));
-alter table tl_laimag10_attachment add index FK6AB6721D2B86FA42 (imageGallery_uid), add constraint FK6AB6721D2B86FA42 foreign key (imageGallery_uid) references tl_laimag10_imageGallery (uid);
-alter table tl_laimag10_imageGallery add index FK451FBF1B98EE9FF (create_by), add constraint FK451FBF1B98EE9FF foreign key (create_by) references tl_laimag10_user (uid);
-alter table tl_laimag10_imageGallery_item add index FKF75F06A1B98EE9FF (create_by), add constraint FKF75F06A1B98EE9FF foreign key (create_by) references tl_laimag10_user (uid);
-alter table tl_laimag10_imageGallery_item add index FKF75F06A12B86FA42 (imageGallery_uid), add constraint FKF75F06A12B86FA42 foreign key (imageGallery_uid) references tl_laimag10_imageGallery (uid);
-alter table tl_laimag10_image_comment add index FKB20640417B33199 (imageGallery_item_uid), add constraint FKB20640417B33199 foreign key (imageGallery_item_uid) references tl_laimag10_imageGallery_item (uid);
+alter table tl_laimag10_attachment add index FK6AB6721D2B86FA42 (imageGallery_uid), add constraint FK6AB6721D2B86FA42 foreign key (imageGallery_uid) references tl_laimag10_imagegallery (uid);
+alter table tl_laimag10_imagegallery add index FK451FBF1B98EE9FF (create_by), add constraint FK451FBF1B98EE9FF foreign key (create_by) references tl_laimag10_user (uid);
+alter table tl_laimag10_imagegallery_item add index FKF75F06A1B98EE9FF (create_by), add constraint FKF75F06A1B98EE9FF foreign key (create_by) references tl_laimag10_user (uid);
+alter table tl_laimag10_imagegallery_item add index FKF75F06A12B86FA42 (imageGallery_uid), add constraint FKF75F06A12B86FA42 foreign key (imageGallery_uid) references tl_laimag10_imagegallery (uid);
+alter table tl_laimag10_image_comment add index FKB20640417B33199 (imageGallery_item_uid), add constraint FKB20640417B33199 foreign key (imageGallery_item_uid) references tl_laimag10_imagegallery_item (uid);
alter table tl_laimag10_image_comment add index FKB2064041B98EE9FF (create_by), add constraint FKB2064041B98EE9FF foreign key (create_by) references tl_laimag10_user (uid);
-alter table tl_laimag10_image_rating add index FK16529B7B7B33199 (imageGallery_item_uid), add constraint FK16529B7B7B33199 foreign key (imageGallery_item_uid) references tl_laimag10_imageGallery_item (uid);
+alter table tl_laimag10_image_rating add index FK16529B7B7B33199 (imageGallery_item_uid), add constraint FK16529B7B7B33199 foreign key (imageGallery_item_uid) references tl_laimag10_imagegallery_item (uid);
alter table tl_laimag10_image_rating add index FK16529B7BB98EE9FF (create_by), add constraint FK16529B7BB98EE9FF foreign key (create_by) references tl_laimag10_user (uid);
-alter table tl_laimag10_image_vote add index FK89C11C487B33199 (imageGallery_item_uid), add constraint FK89C11C487B33199 foreign key (imageGallery_item_uid) references tl_laimag10_imageGallery_item (uid);
+alter table tl_laimag10_image_vote add index FK89C11C487B33199 (imageGallery_item_uid), add constraint FK89C11C487B33199 foreign key (imageGallery_item_uid) references tl_laimag10_imagegallery_item (uid);
alter table tl_laimag10_image_vote add index FK89C11C48B98EE9FF (create_by), add constraint FK89C11C48B98EE9FF foreign key (create_by) references tl_laimag10_user (uid);
-alter table tl_laimag10_item_log add index FK42F99B927B33199 (imageGallery_item_uid), add constraint FK42F99B927B33199 foreign key (imageGallery_item_uid) references tl_laimag10_imageGallery_item (uid);
+alter table tl_laimag10_item_log add index FK42F99B927B33199 (imageGallery_item_uid), add constraint FK42F99B927B33199 foreign key (imageGallery_item_uid) references tl_laimag10_imagegallery_item (uid);
alter table tl_laimag10_item_log add index FK42F99B9286078D61 (user_uid), add constraint FK42F99B9286078D61 foreign key (user_uid) references tl_laimag10_user (uid);
-alter table tl_laimag10_session add index FKD94E9BDC2B86FA42 (imageGallery_uid), add constraint FKD94E9BDC2B86FA42 foreign key (imageGallery_uid) references tl_laimag10_imageGallery (uid);
+alter table tl_laimag10_session add index FKD94E9BDC2B86FA42 (imageGallery_uid), add constraint FKD94E9BDC2B86FA42 foreign key (imageGallery_uid) references tl_laimag10_imagegallery (uid);
alter table tl_laimag10_user add index FKFF92C845ACCD4BC3 (session_uid), add constraint FKFF92C845ACCD4BC3 foreign key (session_uid) references tl_laimag10_session (uid);
-alter table tl_laimag10_user add index FKFF92C8452B86FA42 (imageGallery_uid), add constraint FKFF92C8452B86FA42 foreign key (imageGallery_uid) references tl_laimag10_imageGallery (uid);
+alter table tl_laimag10_user add index FKFF92C8452B86FA42 (imageGallery_uid), add constraint FKFF92C8452B86FA42 foreign key (imageGallery_uid) references tl_laimag10_imagegallery (uid);
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20090819_updateFrom23.sql
===================================================================
diff -u -r70688b063f9ccc4c48eae2ceb0abbfd59ef4e49f -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20090819_updateFrom23.sql (.../patch20090819_updateFrom23.sql) (revision 70688b063f9ccc4c48eae2ceb0abbfd59ef4e49f)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20090819_updateFrom23.sql (.../patch20090819_updateFrom23.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -5,7 +5,7 @@
----------------------Put all sql statements below here-------------------------
-ALTER TABLE tl_laimag10_imageGallery_item DROP FOREIGN KEY FK_NEW_1821149711_F52D1F93EC0D3147,
+ALTER TABLE tl_laimag10_imagegallery_item DROP FOREIGN KEY FK_NEW_1821149711_F52D1F93EC0D3147,
DROP COLUMN session_uid;
----------------------Put all sql statements above here-------------------------
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20140102.sql
===================================================================
diff -u -r6d674e346dea6ce7a824366c8a7c315660677744 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20140102.sql (.../patch20140102.sql) (revision 6d674e346dea6ce7a824366c8a7c315660677744)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20140102.sql (.../patch20140102.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -4,9 +4,9 @@
----------------------Put all sql statements below here-------------------------
-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options
-ALTER TABLE tl_laimag10_imageGallery DROP COLUMN online_instructions;
-ALTER TABLE tl_laimag10_imageGallery DROP COLUMN offline_instructions;
-ALTER TABLE tl_laimag10_imageGallery DROP COLUMN run_offline;
+ALTER TABLE tl_laimag10_imagegallery DROP COLUMN online_instructions;
+ALTER TABLE tl_laimag10_imagegallery DROP COLUMN offline_instructions;
+ALTER TABLE tl_laimag10_imagegallery DROP COLUMN run_offline;
DROP TABLE IF EXISTS tl_laimag10_attachment;
UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='laimag10';
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java
===================================================================
diff -u -r6d674e346dea6ce7a824366c8a7c315660677744 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java (.../ImageGallery.java) (revision 6d674e346dea6ce7a824366c8a7c315660677744)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java (.../ImageGallery.java) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -40,7 +40,7 @@
/**
* ImageGallery
*
- * @hibernate.class table="tl_laimag10_imageGallery"
+ * @hibernate.class table="tl_laimag10_imagegallery"
*
*/
public class ImageGallery implements Cloneable {
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java
===================================================================
diff -u -r8e512e5f28ad5c247d577c7189e2b7908f506240 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java (.../ImageGalleryItem.java) (revision 8e512e5f28ad5c247d577c7189e2b7908f506240)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java (.../ImageGalleryItem.java) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -33,7 +33,7 @@
/**
* ImageGallery
*
- * @hibernate.class table="tl_laimag10_imageGallery_item"
+ * @hibernate.class table="tl_laimag10_imagegallery_item"
*
* @author Andrey Balan
*
Index: lams_tool_imscc/db/model/commonCartridge.clay
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_imscc/db/model/commonCartridge.clay (.../commonCartridge.clay) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05)
+++ lams_tool_imscc/db/model/commonCartridge.clay (.../commonCartridge.clay) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -95,7 +95,7 @@
-
+
@@ -171,7 +171,7 @@
-
+
@@ -190,7 +190,7 @@
-
+
-
+
@@ -549,7 +549,7 @@
-
+
@@ -652,7 +652,7 @@
-
+
@@ -757,7 +757,7 @@
-
+
Index: lams_tool_imscc/db/sql/create_lams_tool_commonCartridge.sql
===================================================================
diff -u -rf6a03ee21a18654d54498cd94d9f68fbea3b996a -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_imscc/db/sql/create_lams_tool_commonCartridge.sql (.../create_lams_tool_commonCartridge.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a)
+++ lams_tool_imscc/db/sql/create_lams_tool_commonCartridge.sql (.../create_lams_tool_commonCartridge.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -1,9 +1,9 @@
SET FOREIGN_KEY_CHECKS=0;
drop table if exists tl_laimsc11_attachment;
drop table if exists tl_laimsc11_item_instruction;
-drop table if exists tl_laimsc11_commonCartridge;
-drop table if exists tl_laimsc11_commonCartridge_item;
-drop table if exists tl_laimsc11_commonCartridge_item_visit_log;
+drop table if exists tl_laimsc11_commoncartridge;
+drop table if exists tl_laimsc11_commoncartridge_item;
+drop table if exists tl_laimsc11_commoncartridge_item_visit_log;
drop table if exists tl_laimsc11_session;
drop table if exists tl_laimsc11_user;
drop table if exists tl_laimsc11_configuration;
@@ -25,7 +25,7 @@
item_uid bigint,
primary key (uid)
)ENGINE=InnoDB;
-create table tl_laimsc11_commonCartridge (
+create table tl_laimsc11_commoncartridge (
uid bigint not null auto_increment,
create_date datetime,
update_date datetime,
@@ -45,7 +45,7 @@
reflect_on_activity smallint,
primary key (uid)
)ENGINE=InnoDB;
-create table tl_laimsc11_commonCartridge_item (
+create table tl_laimsc11_commoncartridge_item (
uid bigint not null auto_increment,
file_uuid bigint,
file_version_id bigint,
@@ -111,26 +111,26 @@
primary key (uid)
)ENGINE=InnoDB;
-alter table tl_laimsc11_attachment add index FK_NEW_1279208528_1E7009430E79035 (commonCartridge_uid), add constraint FK_NEW_1279208528_1E7009430E79035 foreign key (commonCartridge_uid) references tl_laimsc11_commonCartridge (uid);
-alter table tl_laimsc11_item_instruction add index FK_NEW_1279208528_A5665013980570ED (item_uid), add constraint FK_NEW_1279208528_A5665013980570ED foreign key (item_uid) references tl_laimsc11_commonCartridge_item (uid);
-alter table tl_laimsc11_commonCartridge add index FK_NEW_1279208528_89093BF758092FB (create_by), add constraint FK_NEW_1279208528_89093BF758092FB foreign key (create_by) references tl_laimsc11_user (uid);
-alter table tl_laimsc11_commonCartridge_item add index FK_NEW_1279208528_F52D1F93758092FB (create_by), add constraint FK_NEW_1279208528_F52D1F93758092FB foreign key (create_by) references tl_laimsc11_user (uid);
-alter table tl_laimsc11_commonCartridge_item add index FK_NEW_1279208528_F52D1F9330E79035 (commonCartridge_uid), add constraint FK_NEW_1279208528_F52D1F9330E79035 foreign key (commonCartridge_uid) references tl_laimsc11_commonCartridge (uid);
-alter table tl_laimsc11_commonCartridge_item add index FK_NEW_1279208528_F52D1F93EC0D3147 (session_uid), add constraint FK_NEW_1279208528_F52D1F93EC0D3147 foreign key (session_uid) references tl_laimsc11_session (uid);
-alter table tl_laimsc11_item_log add index FK_NEW_1279208528_693580A438BF8DFE (commonCartridge_item_uid), add constraint FK_NEW_1279208528_693580A438BF8DFE foreign key (commonCartridge_item_uid) references tl_laimsc11_commonCartridge_item (uid);
+alter table tl_laimsc11_attachment add index FK_NEW_1279208528_1E7009430E79035 (commonCartridge_uid), add constraint FK_NEW_1279208528_1E7009430E79035 foreign key (commonCartridge_uid) references tl_laimsc11_commoncartridge (uid);
+alter table tl_laimsc11_item_instruction add index FK_NEW_1279208528_A5665013980570ED (item_uid), add constraint FK_NEW_1279208528_A5665013980570ED foreign key (item_uid) references tl_laimsc11_commoncartridge_item (uid);
+alter table tl_laimsc11_commoncartridge add index FK_NEW_1279208528_89093BF758092FB (create_by), add constraint FK_NEW_1279208528_89093BF758092FB foreign key (create_by) references tl_laimsc11_user (uid);
+alter table tl_laimsc11_commoncartridge_item add index FK_NEW_1279208528_F52D1F93758092FB (create_by), add constraint FK_NEW_1279208528_F52D1F93758092FB foreign key (create_by) references tl_laimsc11_user (uid);
+alter table tl_laimsc11_commoncartridge_item add index FK_NEW_1279208528_F52D1F9330E79035 (commonCartridge_uid), add constraint FK_NEW_1279208528_F52D1F9330E79035 foreign key (commonCartridge_uid) references tl_laimsc11_commoncartridge (uid);
+alter table tl_laimsc11_commoncartridge_item add index FK_NEW_1279208528_F52D1F93EC0D3147 (session_uid), add constraint FK_NEW_1279208528_F52D1F93EC0D3147 foreign key (session_uid) references tl_laimsc11_session (uid);
+alter table tl_laimsc11_item_log add index FK_NEW_1279208528_693580A438BF8DFE (commonCartridge_item_uid), add constraint FK_NEW_1279208528_693580A438BF8DFE foreign key (commonCartridge_item_uid) references tl_laimsc11_commoncartridge_item (uid);
alter table tl_laimsc11_item_log add index FK_NEW_1279208528_693580A441F9365D (user_uid), add constraint FK_NEW_1279208528_693580A441F9365D foreign key (user_uid) references tl_laimsc11_user (uid);
-alter table tl_laimsc11_session add index FK_NEW_1279208528_24AA78C530E79035 (commonCartridge_uid), add constraint FK_NEW_1279208528_24AA78C530E79035 foreign key (commonCartridge_uid) references tl_laimsc11_commonCartridge (uid);
+alter table tl_laimsc11_session add index FK_NEW_1279208528_24AA78C530E79035 (commonCartridge_uid), add constraint FK_NEW_1279208528_24AA78C530E79035 foreign key (commonCartridge_uid) references tl_laimsc11_commoncartridge (uid);
alter table tl_laimsc11_user add index FK_NEW_1279208528_30113BFCEC0D3147 (session_uid), add constraint FK_NEW_1279208528_30113BFCEC0D3147 foreign key (session_uid) references tl_laimsc11_session (uid);
-alter table tl_laimsc11_user add index FK_NEW_1279208528_30113BFC309ED320 (commonCartridge_uid), add constraint FK_NEW_1279208528_30113BFC309ED320 foreign key (commonCartridge_uid) references tl_laimsc11_commonCartridge (uid);
+alter table tl_laimsc11_user add index FK_NEW_1279208528_30113BFC309ED320 (commonCartridge_uid), add constraint FK_NEW_1279208528_30113BFC309ED320 foreign key (commonCartridge_uid) references tl_laimsc11_commoncartridge (uid);
-INSERT INTO `tl_laimsc11_commonCartridge` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`,
+INSERT INTO `tl_laimsc11_commoncartridge` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`,
`instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`,
`mini_view_commonCartridge_number`, `allow_auto_run`,`reflect_on_activity`) VALUES
(1,NULL,NULL,NULL,'CommonCartridge','0','0','Instructions ',null,null,0,0,${default_content_id},0,0,0);
-INSERT INTO `tl_laimsc11_commonCartridge_item` (`uid`, `file_uuid`, `file_version_id`, `description`, `ims_schema`, `init_item`, `organization_xml`, `title`, `url`, `create_by`, `create_date`, `create_by_author`, `is_hide`, `item_type`, `file_type`, `file_name`, `open_url_new_window`, `commonCartridge_uid`, `session_uid`, `frame_height`) VALUES
+INSERT INTO `tl_laimsc11_commoncartridge_item` (`uid`, `file_uuid`, `file_version_id`, `description`, `ims_schema`, `init_item`, `organization_xml`, `title`, `url`, `create_by`, `create_date`, `create_by_author`, `is_hide`, `item_type`, `file_type`, `file_name`, `open_url_new_window`, `commonCartridge_uid`, `session_uid`, `frame_height`) VALUES
(1,NULL,NULL,NULL,NULL,NULL,NULL,'Web Search','http://www.google.com ',null,NOW(),1,0,1,NULL,NULL,0,1,NULL, 100);
INSERT INTO `tl_laimsc11_configuration` (`config_key`, `config_value`) VALUES
Index: lams_tool_imscc/db/sql/drop_lams_tool_commonCartridge.sql
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_imscc/db/sql/drop_lams_tool_commonCartridge.sql (.../drop_lams_tool_commonCartridge.sql) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05)
+++ lams_tool_imscc/db/sql/drop_lams_tool_commonCartridge.sql (.../drop_lams_tool_commonCartridge.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -1,8 +1,8 @@
SET FOREIGN_KEY_CHECKS=0;
drop table if exists tl_laimsc11_attachment;
drop table if exists tl_laimsc11_item_instruction;
-drop table if exists tl_laimsc11_commonCartridge;
-drop table if exists tl_laimsc11_commonCartridge_item;
+drop table if exists tl_laimsc11_commoncartridge;
+drop table if exists tl_laimsc11_commoncartridge_item;
drop table if exists tl_laimsc11_item_log;
drop table if exists tl_laimsc11_session;
drop table if exists tl_laimsc11_user;
Index: lams_tool_imscc/db/sql/table-schema.sql
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_imscc/db/sql/table-schema.sql (.../table-schema.sql) (revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_tool_imscc/db/sql/table-schema.sql (.../table-schema.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -1,38 +1,38 @@
alter table tl_laimsc11_attachment drop foreign key FK3C5E6992119AAE45;
-alter table tl_laimsc11_commonCartridge drop foreign key FKB141FAD11B70119;
-alter table tl_laimsc11_commonCartridge_item drop foreign key FKF4FB53C1119AAE45;
-alter table tl_laimsc11_commonCartridge_item drop foreign key FKF4FB53C19E25A669;
-alter table tl_laimsc11_commonCartridge_item drop foreign key FKF4FB53C11B70119;
+alter table tl_laimsc11_commoncartridge drop foreign key FKB141FAD11B70119;
+alter table tl_laimsc11_commoncartridge_item drop foreign key FKF4FB53C1119AAE45;
+alter table tl_laimsc11_commoncartridge_item drop foreign key FKF4FB53C19E25A669;
+alter table tl_laimsc11_commoncartridge_item drop foreign key FKF4FB53C11B70119;
alter table tl_laimsc11_item_instruction drop foreign key FKEF1E8291243BDF0B;
alter table tl_laimsc11_item_log drop foreign key FKDDB2EC47AE3BD26A;
alter table tl_laimsc11_item_log drop foreign key FKDDB2EC47CE2FA47B;
alter table tl_laimsc11_session drop foreign key FKA47DE087119AAE45;
alter table tl_laimsc11_user drop foreign key FKCE92BB7A119AAE45;
alter table tl_laimsc11_user drop foreign key FKCE92BB7A9E25A669;
drop table if exists tl_laimsc11_attachment;
-drop table if exists tl_laimsc11_commonCartridge;
-drop table if exists tl_laimsc11_commonCartridge_item;
+drop table if exists tl_laimsc11_commoncartridge;
+drop table if exists tl_laimsc11_commoncartridge_item;
drop table if exists tl_laimsc11_configuration;
drop table if exists tl_laimsc11_item_instruction;
drop table if exists tl_laimsc11_item_log;
drop table if exists tl_laimsc11_session;
drop table if exists tl_laimsc11_user;
create table tl_laimsc11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, commonCartridge_uid bigint, primary key (uid));
-create table tl_laimsc11_commonCartridge (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), run_offline bit, lock_on_finished bit, instructions longtext, online_instructions longtext, offline_instructions longtext, content_in_use bit, define_later bit, content_id bigint unique, mini_view_commonCartridge_number integer, allow_auto_run bit, reflect_instructions varchar(255), reflect_on_activity bit, primary key (uid));
-create table tl_laimsc11_commonCartridge_item (uid bigint not null auto_increment, file_uuid bigint, file_version_id bigint, description varchar(255), ims_schema varchar(255), init_item varchar(255), organization_xml longtext, title varchar(255), url longtext, create_by bigint, create_date datetime, create_by_author bit, is_hide bit, item_type smallint, file_type varchar(255), file_name varchar(255), open_url_new_window bit, launch_url varchar(255), secure_launch_url varchar(255), tool_key varchar(255), tool_secret varchar(255), custom_str longtext, button_text varchar(255), frame_height integer, commonCartridge_uid bigint, session_uid bigint, primary key (uid));
+create table tl_laimsc11_commoncartridge (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), run_offline bit, lock_on_finished bit, instructions longtext, online_instructions longtext, offline_instructions longtext, content_in_use bit, define_later bit, content_id bigint unique, mini_view_commonCartridge_number integer, allow_auto_run bit, reflect_instructions varchar(255), reflect_on_activity bit, primary key (uid));
+create table tl_laimsc11_commoncartridge_item (uid bigint not null auto_increment, file_uuid bigint, file_version_id bigint, description varchar(255), ims_schema varchar(255), init_item varchar(255), organization_xml longtext, title varchar(255), url longtext, create_by bigint, create_date datetime, create_by_author bit, is_hide bit, item_type smallint, file_type varchar(255), file_name varchar(255), open_url_new_window bit, launch_url varchar(255), secure_launch_url varchar(255), tool_key varchar(255), tool_secret varchar(255), custom_str longtext, button_text varchar(255), frame_height integer, commonCartridge_uid bigint, session_uid bigint, primary key (uid));
create table tl_laimsc11_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid));
create table tl_laimsc11_item_instruction (uid bigint not null auto_increment, description varchar(255), sequence_id integer, item_uid bigint, primary key (uid));
create table tl_laimsc11_item_log (uid bigint not null auto_increment, access_date datetime, commonCartridge_item_uid bigint, user_uid bigint, complete bit, session_id bigint, primary key (uid));
create table tl_laimsc11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, commonCartridge_uid bigint, session_id bigint, session_name varchar(250), primary key (uid));
create table tl_laimsc11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), login_name varchar(255), session_uid bigint, commonCartridge_uid bigint, session_finished bit, primary key (uid));
-alter table tl_laimsc11_attachment add index FK3C5E6992119AAE45 (commonCartridge_uid), add constraint FK3C5E6992119AAE45 foreign key (commonCartridge_uid) references tl_laimsc11_commonCartridge (uid);
-alter table tl_laimsc11_commonCartridge add index FKB141FAD11B70119 (create_by), add constraint FKB141FAD11B70119 foreign key (create_by) references tl_laimsc11_user (uid);
-alter table tl_laimsc11_commonCartridge_item add index FKF4FB53C1119AAE45 (commonCartridge_uid), add constraint FKF4FB53C1119AAE45 foreign key (commonCartridge_uid) references tl_laimsc11_commonCartridge (uid);
-alter table tl_laimsc11_commonCartridge_item add index FKF4FB53C19E25A669 (session_uid), add constraint FKF4FB53C19E25A669 foreign key (session_uid) references tl_laimsc11_session (uid);
-alter table tl_laimsc11_commonCartridge_item add index FKF4FB53C11B70119 (create_by), add constraint FKF4FB53C11B70119 foreign key (create_by) references tl_laimsc11_user (uid);
-alter table tl_laimsc11_item_instruction add index FKEF1E8291243BDF0B (item_uid), add constraint FKEF1E8291243BDF0B foreign key (item_uid) references tl_laimsc11_commonCartridge_item (uid);
-alter table tl_laimsc11_item_log add index FKDDB2EC47AE3BD26A (commonCartridge_item_uid), add constraint FKDDB2EC47AE3BD26A foreign key (commonCartridge_item_uid) references tl_laimsc11_commonCartridge_item (uid);
+alter table tl_laimsc11_attachment add index FK3C5E6992119AAE45 (commonCartridge_uid), add constraint FK3C5E6992119AAE45 foreign key (commonCartridge_uid) references tl_laimsc11_commoncartridge (uid);
+alter table tl_laimsc11_commoncartridge add index FKB141FAD11B70119 (create_by), add constraint FKB141FAD11B70119 foreign key (create_by) references tl_laimsc11_user (uid);
+alter table tl_laimsc11_commoncartridge_item add index FKF4FB53C1119AAE45 (commonCartridge_uid), add constraint FKF4FB53C1119AAE45 foreign key (commonCartridge_uid) references tl_laimsc11_commoncartridge (uid);
+alter table tl_laimsc11_commoncartridge_item add index FKF4FB53C19E25A669 (session_uid), add constraint FKF4FB53C19E25A669 foreign key (session_uid) references tl_laimsc11_session (uid);
+alter table tl_laimsc11_commoncartridge_item add index FKF4FB53C11B70119 (create_by), add constraint FKF4FB53C11B70119 foreign key (create_by) references tl_laimsc11_user (uid);
+alter table tl_laimsc11_item_instruction add index FKEF1E8291243BDF0B (item_uid), add constraint FKEF1E8291243BDF0B foreign key (item_uid) references tl_laimsc11_commoncartridge_item (uid);
+alter table tl_laimsc11_item_log add index FKDDB2EC47AE3BD26A (commonCartridge_item_uid), add constraint FKDDB2EC47AE3BD26A foreign key (commonCartridge_item_uid) references tl_laimsc11_commoncartridge_item (uid);
alter table tl_laimsc11_item_log add index FKDDB2EC47CE2FA47B (user_uid), add constraint FKDDB2EC47CE2FA47B foreign key (user_uid) references tl_laimsc11_user (uid);
-alter table tl_laimsc11_session add index FKA47DE087119AAE45 (commonCartridge_uid), add constraint FKA47DE087119AAE45 foreign key (commonCartridge_uid) references tl_laimsc11_commonCartridge (uid);
-alter table tl_laimsc11_user add index FKCE92BB7A119AAE45 (commonCartridge_uid), add constraint FKCE92BB7A119AAE45 foreign key (commonCartridge_uid) references tl_laimsc11_commonCartridge (uid);
+alter table tl_laimsc11_session add index FKA47DE087119AAE45 (commonCartridge_uid), add constraint FKA47DE087119AAE45 foreign key (commonCartridge_uid) references tl_laimsc11_commoncartridge (uid);
+alter table tl_laimsc11_user add index FKCE92BB7A119AAE45 (commonCartridge_uid), add constraint FKCE92BB7A119AAE45 foreign key (commonCartridge_uid) references tl_laimsc11_commoncartridge (uid);
alter table tl_laimsc11_user add index FKCE92BB7A9E25A669 (session_uid), add constraint FKCE92BB7A9E25A669 foreign key (session_uid) references tl_laimsc11_session (uid);
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20140102.sql
===================================================================
diff -u -r6d674e346dea6ce7a824366c8a7c315660677744 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20140102.sql (.../patch20140102.sql) (revision 6d674e346dea6ce7a824366c8a7c315660677744)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20140102.sql (.../patch20140102.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -4,9 +4,9 @@
----------------------Put all sql statements below here-------------------------
-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options
-ALTER TABLE tl_laimsc11_commonCartridge DROP COLUMN online_instructions;
-ALTER TABLE tl_laimsc11_commonCartridge DROP COLUMN offline_instructions;
-ALTER TABLE tl_laimsc11_commonCartridge DROP COLUMN run_offline;
+ALTER TABLE tl_laimsc11_commoncartridge DROP COLUMN online_instructions;
+ALTER TABLE tl_laimsc11_commoncartridge DROP COLUMN offline_instructions;
+ALTER TABLE tl_laimsc11_commoncartridge DROP COLUMN run_offline;
DROP TABLE IF EXISTS tl_laimsc11_attachment;
UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='laimsc11';
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java
===================================================================
diff -u -r6d674e346dea6ce7a824366c8a7c315660677744 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java (.../CommonCartridge.java) (revision 6d674e346dea6ce7a824366c8a7c315660677744)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java (.../CommonCartridge.java) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -42,7 +42,7 @@
*
* @author Andrey Balan
*
- * @hibernate.class table="tl_laimsc11_commonCartridge"
+ * @hibernate.class table="tl_laimsc11_commoncartridge"
*
*/
public class CommonCartridge implements Cloneable {
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java (.../CommonCartridgeItem.java) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java (.../CommonCartridgeItem.java) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -35,7 +35,7 @@
*
* @author Andrey Balan
*
- * @hibernate.class table="tl_laimsc11_commonCartridge_item"
+ * @hibernate.class table="tl_laimsc11_commoncartridge_item"
*
*/
public class CommonCartridgeItem implements Cloneable {
Index: lams_tool_task/db/model/taskList.clay
===================================================================
diff -u -r3f118a66718ff89ec94041602e7e60db6ee06722 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_task/db/model/taskList.clay (.../taskList.clay) (revision 3f118a66718ff89ec94041602e7e60db6ee06722)
+++ lams_tool_task/db/model/taskList.clay (.../taskList.clay) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -83,7 +83,7 @@
-
+
@@ -196,7 +196,7 @@
-
+
@@ -268,7 +268,7 @@
-
+
@@ -314,14 +314,14 @@
-
+
-
+
@@ -420,7 +420,7 @@
-
+
@@ -435,7 +435,7 @@
-
+
-
+
@@ -772,7 +772,7 @@
-
+
@@ -871,7 +871,7 @@
-
+
@@ -972,7 +972,7 @@
-
+
Index: lams_tool_task/db/sql/create_lams_tool_taskList.sql
===================================================================
diff -u -rf6a03ee21a18654d54498cd94d9f68fbea3b996a -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_task/db/sql/create_lams_tool_taskList.sql (.../create_lams_tool_taskList.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a)
+++ lams_tool_task/db/sql/create_lams_tool_taskList.sql (.../create_lams_tool_taskList.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -2,9 +2,9 @@
drop table if exists tl_latask10_attachment;
drop table if exists tl_latask10_condition;
drop table if exists tl_latask10_condition_tl_item;
-drop table if exists tl_latask10_taskList;
-drop table if exists tl_latask10_taskList_item;
-drop table if exists tl_latask10_taskList_item_visit_log;
+drop table if exists tl_latask10_tasklist;
+drop table if exists tl_latask10_tasklist_item;
+drop table if exists tl_latask10_tasklist_item_visit_log;
drop table if exists tl_latask10_item_attachment;
drop table if exists tl_latask10_item_comment;
drop table if exists tl_latask10_session;
@@ -31,7 +31,7 @@
condition_uid bigint not null,
primary key (uid, condition_uid)
)ENGINE=InnoDB;
-create table tl_latask10_taskList (
+create table tl_latask10_tasklist (
uid bigint not null auto_increment,
create_date datetime,
update_date datetime,
@@ -54,7 +54,7 @@
submission_deadline datetime DEFAULT NULL,
primary key (uid)
)ENGINE=InnoDB;
-create table tl_latask10_taskList_item (
+create table tl_latask10_tasklist_item (
uid bigint not null auto_increment,
sequence_id integer,
description text,
@@ -127,33 +127,33 @@
is_verified_by_monitor tinyint,
primary key (uid)
)ENGINE=InnoDB;
-alter table tl_latask10_attachment add index FK_NEW_174079138_1E7009430E79035 (taskList_uid), add constraint FK_NEW_174079138_1E7009430E79035 foreign key (taskList_uid) references tl_latask10_taskList (uid);
-alter table tl_latask10_condition add index FK_tl_latask10_condition_1 (taskList_uid), add constraint FK_tl_latask10_condition_1 foreign key (taskList_uid) references tl_latask10_taskList (uid);
-alter table tl_latask10_condition_tl_item add index FK_tl_latask10_taskList_item_condition_1 (condition_uid), add constraint FK_tl_latask10_taskList_item_condition_1 foreign key (condition_uid) references tl_latask10_condition (condition_uid);
-alter table tl_latask10_condition_tl_item add index FK_tl_latask10_taskList_item_condition_2 (uid), add constraint FK_tl_latask10_taskList_item_condition_2 foreign key (uid) references tl_latask10_taskList_item (uid);
-alter table tl_latask10_taskList add index FK_NEW_174079138_89093BF758092FB (create_by), add constraint FK_NEW_174079138_89093BF758092FB foreign key (create_by) references tl_latask10_user (uid);
-alter table tl_latask10_taskList_item add index FK_NEW_174079138_F52D1F93758092FB (create_by), add constraint FK_NEW_174079138_F52D1F93758092FB foreign key (create_by) references tl_latask10_user (uid);
-alter table tl_latask10_taskList_item add index FK_NEW_174079138_F52D1F9330E79035 (taskList_uid), add constraint FK_NEW_174079138_F52D1F9330E79035 foreign key (taskList_uid) references tl_latask10_taskList (uid);
-alter table tl_latask10_taskList_item add index FK_NEW_174079138_F52D1F93EC0D3147 (session_uid), add constraint FK_NEW_174079138_F52D1F93EC0D3147 foreign key (session_uid) references tl_latask10_session (uid);
-alter table tl_latask10_item_log add index FK_NEW_174079138_693580A438BF8DFE (taskList_item_uid), add constraint FK_NEW_174079138_693580A438BF8DFE foreign key (taskList_item_uid) references tl_latask10_taskList_item (uid);
+alter table tl_latask10_attachment add index FK_NEW_174079138_1E7009430E79035 (taskList_uid), add constraint FK_NEW_174079138_1E7009430E79035 foreign key (taskList_uid) references tl_latask10_tasklist (uid);
+alter table tl_latask10_condition add index FK_tl_latask10_condition_1 (taskList_uid), add constraint FK_tl_latask10_condition_1 foreign key (taskList_uid) references tl_latask10_tasklist (uid);
+alter table tl_latask10_condition_tl_item add index FK_tl_latask10_tasklist_item_condition_1 (condition_uid), add constraint FK_tl_latask10_tasklist_item_condition_1 foreign key (condition_uid) references tl_latask10_condition (condition_uid);
+alter table tl_latask10_condition_tl_item add index FK_tl_latask10_tasklist_item_condition_2 (uid), add constraint FK_tl_latask10_tasklist_item_condition_2 foreign key (uid) references tl_latask10_tasklist_item (uid);
+alter table tl_latask10_tasklist add index FK_NEW_174079138_89093BF758092FB (create_by), add constraint FK_NEW_174079138_89093BF758092FB foreign key (create_by) references tl_latask10_user (uid);
+alter table tl_latask10_tasklist_item add index FK_NEW_174079138_F52D1F93758092FB (create_by), add constraint FK_NEW_174079138_F52D1F93758092FB foreign key (create_by) references tl_latask10_user (uid);
+alter table tl_latask10_tasklist_item add index FK_NEW_174079138_F52D1F9330E79035 (taskList_uid), add constraint FK_NEW_174079138_F52D1F9330E79035 foreign key (taskList_uid) references tl_latask10_tasklist (uid);
+alter table tl_latask10_tasklist_item add index FK_NEW_174079138_F52D1F93EC0D3147 (session_uid), add constraint FK_NEW_174079138_F52D1F93EC0D3147 foreign key (session_uid) references tl_latask10_session (uid);
+alter table tl_latask10_item_log add index FK_NEW_174079138_693580A438BF8DFE (taskList_item_uid), add constraint FK_NEW_174079138_693580A438BF8DFE foreign key (taskList_item_uid) references tl_latask10_tasklist_item (uid);
alter table tl_latask10_item_log add index FK_NEW_174079138_693580A441F9365D (user_uid), add constraint FK_NEW_174079138_693580A441F9365D foreign key (user_uid) references tl_latask10_user (uid);
-alter table tl_latask10_item_attachment add index FK_tl_latask10_item_attachment_1 (taskList_item_uid), add constraint FK_tl_latask10_item_attachment_1 foreign key (taskList_item_uid) references tl_latask10_taskList_item (uid);
+alter table tl_latask10_item_attachment add index FK_tl_latask10_item_attachment_1 (taskList_item_uid), add constraint FK_tl_latask10_item_attachment_1 foreign key (taskList_item_uid) references tl_latask10_tasklist_item (uid);
alter table tl_latask10_item_attachment add index FK_tl_latask10_item_attachment_2 (create_by), add constraint FK_tl_latask10_item_attachment_2 foreign key (create_by) references tl_latask10_user (uid);
-alter table tl_latask10_item_comment add index FK_tl_latask10_item_comment_3 (taskList_item_uid), add constraint FK_tl_latask10_item_comment_3 foreign key (taskList_item_uid) references tl_latask10_taskList_item (uid);
+alter table tl_latask10_item_comment add index FK_tl_latask10_item_comment_3 (taskList_item_uid), add constraint FK_tl_latask10_item_comment_3 foreign key (taskList_item_uid) references tl_latask10_tasklist_item (uid);
alter table tl_latask10_item_comment add index FK_tl_latask10_item_comment_2 (create_by), add constraint FK_tl_latask10_item_comment_2 foreign key (create_by) references tl_latask10_user (uid);
-alter table tl_latask10_session add index FK_NEW_174079138_24AA78C530E79035 (taskList_uid), add constraint FK_NEW_174079138_24AA78C530E79035 foreign key (taskList_uid) references tl_latask10_taskList (uid);
+alter table tl_latask10_session add index FK_NEW_174079138_24AA78C530E79035 (taskList_uid), add constraint FK_NEW_174079138_24AA78C530E79035 foreign key (taskList_uid) references tl_latask10_tasklist (uid);
alter table tl_latask10_user add index FK_NEW_174079138_30113BFCEC0D3147 (session_uid), add constraint FK_NEW_174079138_30113BFCEC0D3147 foreign key (session_uid) references tl_latask10_session (uid);
-alter table tl_latask10_user add index FK_NEW_174079138_30113BFC309ED320 (taskList_uid), add constraint FK_NEW_174079138_30113BFC309ED320 foreign key (taskList_uid) references tl_latask10_taskList (uid);
+alter table tl_latask10_user add index FK_NEW_174079138_30113BFC309ED320 (taskList_uid), add constraint FK_NEW_174079138_30113BFC309ED320 foreign key (taskList_uid) references tl_latask10_tasklist (uid);
-INSERT INTO `tl_latask10_taskList` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `instructions`,
+INSERT INTO `tl_latask10_tasklist` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `instructions`,
`online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `lock_when_finished`,
`minimum_number_tasks`, `is_sequential_order`, `allow_contribute_tasks`, `is_monitor_verification_required`,
`reflect_on_activity`) VALUES
(1,NULL,NULL,NULL,'Task List','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0,0);
-INSERT INTO `tl_latask10_taskList_item` (`uid`, `sequence_id`, `description`, `init_item`, `organization_xml`, `title`, `create_by`, `create_date`, `create_by_author`, `is_required`, `is_comments_allowed`, `is_comments_required`, `is_files_allowed`, `is_files_required`, `is_comments_files_allowed`, `show_comments_to_all`, `is_child_task`, `parent_task_name`, `taskList_uid`, `session_uid`) VALUES
+INSERT INTO `tl_latask10_tasklist_item` (`uid`, `sequence_id`, `description`, `init_item`, `organization_xml`, `title`, `create_by`, `create_date`, `create_by_author`, `is_required`, `is_comments_allowed`, `is_comments_required`, `is_files_allowed`, `is_files_required`, `is_comments_files_allowed`, `show_comments_to_all`, `is_child_task`, `parent_task_name`, `taskList_uid`, `session_uid`) VALUES
(1,1,NULL,NULL,NULL,'Task number 1',null,NOW(),1,0,0,0,0,0,0,1,0,NULL,1,NULL);
SET FOREIGN_KEY_CHECKS=1;
Index: lams_tool_task/db/sql/drop_lams_tool_taskList.sql
===================================================================
diff -u -re12e54b34d1312f79a1c8b1fb3662fb5a6da9676 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_task/db/sql/drop_lams_tool_taskList.sql (.../drop_lams_tool_taskList.sql) (revision e12e54b34d1312f79a1c8b1fb3662fb5a6da9676)
+++ lams_tool_task/db/sql/drop_lams_tool_taskList.sql (.../drop_lams_tool_taskList.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -1,7 +1,7 @@
SET FOREIGN_KEY_CHECKS=0;
drop table if exists tl_latask10_attachment;
-drop table if exists tl_latask10_taskList;
-drop table if exists tl_latask10_taskList_item;
+drop table if exists tl_latask10_tasklist;
+drop table if exists tl_latask10_tasklist_item;
drop table if exists tl_latask10_item_log;
drop table if exists tl_latask10_item_attachment;
drop table if exists tl_latask10_item_comment;
Index: lams_tool_task/db/sql/table-schema.sql
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_task/db/sql/table-schema.sql (.../table-schema.sql) (revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_tool_task/db/sql/table-schema.sql (.../table-schema.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -9,10 +9,10 @@
alter table tl_latask10_item_log drop foreign key FK6CFEC3773324488D;
alter table tl_latask10_item_log drop foreign key FK6CFEC377B20A10E1;
alter table tl_latask10_session drop foreign key FK3DC26357994F51CE;
-alter table tl_latask10_taskList drop foreign key FKE544722E5916D7F;
-alter table tl_latask10_taskList_item drop foreign key FK2DB1121025521843;
-alter table tl_latask10_taskList_item drop foreign key FK2DB11210E5916D7F;
-alter table tl_latask10_taskList_item drop foreign key FK2DB11210994F51CE;
+alter table tl_latask10_tasklist drop foreign key FKE544722E5916D7F;
+alter table tl_latask10_tasklist_item drop foreign key FK2DB1121025521843;
+alter table tl_latask10_tasklist_item drop foreign key FK2DB11210E5916D7F;
+alter table tl_latask10_tasklist_item drop foreign key FK2DB11210994F51CE;
alter table tl_latask10_user drop foreign key FKFE49AAAA25521843;
alter table tl_latask10_user drop foreign key FKFE49AAAA994F51CE;
drop table if exists tl_latask10_attachment;
@@ -22,8 +22,8 @@
drop table if exists tl_latask10_item_comment;
drop table if exists tl_latask10_item_log;
drop table if exists tl_latask10_session;
-drop table if exists tl_latask10_taskList;
-drop table if exists tl_latask10_taskList_item;
+drop table if exists tl_latask10_tasklist;
+drop table if exists tl_latask10_tasklist_item;
drop table if exists tl_latask10_user;
create table tl_latask10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, taskList_uid bigint, primary key (uid));
create table tl_latask10_condition (condition_uid bigint not null auto_increment, name varchar(255), sequence_id integer, taskList_uid bigint, primary key (condition_uid));
@@ -32,23 +32,23 @@
create table tl_latask10_item_comment (uid bigint not null auto_increment, create_date datetime, create_by bigint, comment longtext, taskList_item_uid bigint, primary key (uid));
create table tl_latask10_item_log (uid bigint not null auto_increment, access_date datetime, taskList_item_uid bigint, user_uid bigint, complete bit, session_id bigint, primary key (uid));
create table tl_latask10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, taskList_uid bigint, session_id bigint, session_name varchar(250), primary key (uid));
-create table tl_latask10_taskList (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), run_offline bit, instructions longtext, online_instructions longtext, offline_instructions longtext, content_in_use bit, define_later bit, content_id bigint unique, lock_when_finished bit, allow_contribute_tasks bit, is_monitor_verification_required bit, is_sequential_order bit, minimum_number_tasks integer, reflect_instructions varchar(255), reflect_on_activity bit, submission_deadline datetime, primary key (uid));
-create table tl_latask10_taskList_item (uid bigint not null auto_increment, description longtext, init_item varchar(255), organization_xml longtext, title varchar(255), create_by bigint, create_date datetime, create_by_author bit, sequence_id integer, is_required bit, is_comments_allowed bit, is_comments_required bit, is_files_allowed bit, is_files_required bit, is_child_task bit, parent_task_name varchar(255), show_comments_to_all bit, is_comments_files_allowed bit, taskList_uid bigint, session_uid bigint, primary key (uid));
+create table tl_latask10_tasklist (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), run_offline bit, instructions longtext, online_instructions longtext, offline_instructions longtext, content_in_use bit, define_later bit, content_id bigint unique, lock_when_finished bit, allow_contribute_tasks bit, is_monitor_verification_required bit, is_sequential_order bit, minimum_number_tasks integer, reflect_instructions varchar(255), reflect_on_activity bit, submission_deadline datetime, primary key (uid));
+create table tl_latask10_tasklist_item (uid bigint not null auto_increment, description longtext, init_item varchar(255), organization_xml longtext, title varchar(255), create_by bigint, create_date datetime, create_by_author bit, sequence_id integer, is_required bit, is_comments_allowed bit, is_comments_required bit, is_files_allowed bit, is_files_required bit, is_child_task bit, parent_task_name varchar(255), show_comments_to_all bit, is_comments_files_allowed bit, taskList_uid bigint, session_uid bigint, primary key (uid));
create table tl_latask10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), login_name varchar(255), session_uid bigint, taskList_uid bigint, session_finished bit, is_verified_by_monitor bit, primary key (uid));
-alter table tl_latask10_attachment add index FK281134C2994F51CE (taskList_uid), add constraint FK281134C2994F51CE foreign key (taskList_uid) references tl_latask10_taskList (uid);
-alter table tl_latask10_condition add index FK7F26219C994F51CE (taskList_uid), add constraint FK7F26219C994F51CE foreign key (taskList_uid) references tl_latask10_taskList (uid);
-alter table tl_latask10_condition_tl_item add index FK67C2DCD7C1E3629D (uid), add constraint FK67C2DCD7C1E3629D foreign key (uid) references tl_latask10_taskList_item (uid);
+alter table tl_latask10_attachment add index FK281134C2994F51CE (taskList_uid), add constraint FK281134C2994F51CE foreign key (taskList_uid) references tl_latask10_tasklist (uid);
+alter table tl_latask10_condition add index FK7F26219C994F51CE (taskList_uid), add constraint FK7F26219C994F51CE foreign key (taskList_uid) references tl_latask10_tasklist (uid);
+alter table tl_latask10_condition_tl_item add index FK67C2DCD7C1E3629D (uid), add constraint FK67C2DCD7C1E3629D foreign key (uid) references tl_latask10_tasklist_item (uid);
alter table tl_latask10_condition_tl_item add index FK67C2DCD7764994D (condition_uid), add constraint FK67C2DCD7764994D foreign key (condition_uid) references tl_latask10_condition (condition_uid);
-alter table tl_latask10_item_attachment add index FKCED229903324488D (taskList_item_uid), add constraint FKCED229903324488D foreign key (taskList_item_uid) references tl_latask10_taskList_item (uid);
+alter table tl_latask10_item_attachment add index FKCED229903324488D (taskList_item_uid), add constraint FKCED229903324488D foreign key (taskList_item_uid) references tl_latask10_tasklist_item (uid);
alter table tl_latask10_item_attachment add index FKCED22990E5916D7F (create_by), add constraint FKCED22990E5916D7F foreign key (create_by) references tl_latask10_user (uid);
-alter table tl_latask10_item_comment add index FKA4E1BD123324488D (taskList_item_uid), add constraint FKA4E1BD123324488D foreign key (taskList_item_uid) references tl_latask10_taskList_item (uid);
+alter table tl_latask10_item_comment add index FKA4E1BD123324488D (taskList_item_uid), add constraint FKA4E1BD123324488D foreign key (taskList_item_uid) references tl_latask10_tasklist_item (uid);
alter table tl_latask10_item_comment add index FKA4E1BD12E5916D7F (create_by), add constraint FKA4E1BD12E5916D7F foreign key (create_by) references tl_latask10_user (uid);
-alter table tl_latask10_item_log add index FK6CFEC3773324488D (taskList_item_uid), add constraint FK6CFEC3773324488D foreign key (taskList_item_uid) references tl_latask10_taskList_item (uid);
+alter table tl_latask10_item_log add index FK6CFEC3773324488D (taskList_item_uid), add constraint FK6CFEC3773324488D foreign key (taskList_item_uid) references tl_latask10_tasklist_item (uid);
alter table tl_latask10_item_log add index FK6CFEC377B20A10E1 (user_uid), add constraint FK6CFEC377B20A10E1 foreign key (user_uid) references tl_latask10_user (uid);
-alter table tl_latask10_session add index FK3DC26357994F51CE (taskList_uid), add constraint FK3DC26357994F51CE foreign key (taskList_uid) references tl_latask10_taskList (uid);
-alter table tl_latask10_taskList add index FKE544722E5916D7F (create_by), add constraint FKE544722E5916D7F foreign key (create_by) references tl_latask10_user (uid);
-alter table tl_latask10_taskList_item add index FK2DB1121025521843 (session_uid), add constraint FK2DB1121025521843 foreign key (session_uid) references tl_latask10_session (uid);
-alter table tl_latask10_taskList_item add index FK2DB11210E5916D7F (create_by), add constraint FK2DB11210E5916D7F foreign key (create_by) references tl_latask10_user (uid);
-alter table tl_latask10_taskList_item add index FK2DB11210994F51CE (taskList_uid), add constraint FK2DB11210994F51CE foreign key (taskList_uid) references tl_latask10_taskList (uid);
+alter table tl_latask10_session add index FK3DC26357994F51CE (taskList_uid), add constraint FK3DC26357994F51CE foreign key (taskList_uid) references tl_latask10_tasklist (uid);
+alter table tl_latask10_tasklist add index FKE544722E5916D7F (create_by), add constraint FKE544722E5916D7F foreign key (create_by) references tl_latask10_user (uid);
+alter table tl_latask10_tasklist_item add index FK2DB1121025521843 (session_uid), add constraint FK2DB1121025521843 foreign key (session_uid) references tl_latask10_session (uid);
+alter table tl_latask10_tasklist_item add index FK2DB11210E5916D7F (create_by), add constraint FK2DB11210E5916D7F foreign key (create_by) references tl_latask10_user (uid);
+alter table tl_latask10_tasklist_item add index FK2DB11210994F51CE (taskList_uid), add constraint FK2DB11210994F51CE foreign key (taskList_uid) references tl_latask10_tasklist (uid);
alter table tl_latask10_user add index FKFE49AAAA25521843 (session_uid), add constraint FKFE49AAAA25521843 foreign key (session_uid) references tl_latask10_session (uid);
-alter table tl_latask10_user add index FKFE49AAAA994F51CE (taskList_uid), add constraint FKFE49AAAA994F51CE foreign key (taskList_uid) references tl_latask10_taskList (uid);
+alter table tl_latask10_user add index FKFE49AAAA994F51CE (taskList_uid), add constraint FKFE49AAAA994F51CE foreign key (taskList_uid) references tl_latask10_tasklist (uid);
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20140102.sql
===================================================================
diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20140102.sql (.../patch20140102.sql) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20140102.sql (.../patch20140102.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -4,9 +4,9 @@
----------------------Put all sql statements below here-------------------------
-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options
-ALTER TABLE tl_latask10_taskList DROP COLUMN online_instructions;
-ALTER TABLE tl_latask10_taskList DROP COLUMN offline_instructions;
-ALTER TABLE tl_latask10_taskList DROP COLUMN run_offline;
+ALTER TABLE tl_latask10_tasklist DROP COLUMN online_instructions;
+ALTER TABLE tl_latask10_tasklist DROP COLUMN offline_instructions;
+ALTER TABLE tl_latask10_tasklist DROP COLUMN run_offline;
DROP TABLE IF EXISTS tl_latask10_attachment;
UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='latask10';
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java
===================================================================
diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java (.../TaskList.java) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java (.../TaskList.java) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -39,7 +39,7 @@
* @author Dapeng Ni
* @author Andrey Balan
*
- * @hibernate.class table="tl_latask10_taskList"
+ * @hibernate.class table="tl_latask10_tasklist"
*/
public class TaskList implements Cloneable{
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java
===================================================================
diff -u -r9bd21433617c6dbccfacfb09752344c640570966 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java (.../TaskListItem.java) (revision 9bd21433617c6dbccfacfb09752344c640570966)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java (.../TaskListItem.java) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -36,7 +36,7 @@
* TaskList
* @author Dapeng Ni
*
- * @hibernate.class table="tl_latask10_taskList_item"
+ * @hibernate.class table="tl_latask10_tasklist_item"
*
*/
public class TaskListItem implements Cloneable{
Index: lams_tool_videorecorder/conf/middlegen/lams_tool_lavideoRecorder11-prefs.properties
===================================================================
diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_videorecorder/conf/middlegen/lams_tool_lavideoRecorder11-prefs.properties (.../lams_tool_lavideoRecorder11-prefs.properties) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
+++ lams_tool_videorecorder/conf/middlegen/lams_tool_lavideoRecorder11-prefs.properties (.../lams_tool_lavideoRecorder11-prefs.properties) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -26,40 +26,40 @@
hibernate.tables.tl_lavidr10_attachment.columns.uid.java-type=java.lang.Long
hibernate.tables.tl_lavidr10_attachment.equalshashcode=true
hibernate.tables.tl_lavidr10_attachment.keygenerator=native
-hibernate.tables.tl_lavidr10_videoRecorder.base-class-name=VideoRecorder
-hibernate.tables.tl_lavidr10_videoRecorder.columns.content_in_use.java-name=contentInUse
-hibernate.tables.tl_lavidr10_videoRecorder.columns.content_in_use.java-type=java.lang.Boolean
-hibernate.tables.tl_lavidr10_videoRecorder.columns.create_by.java-name=createBy
-hibernate.tables.tl_lavidr10_videoRecorder.columns.create_by.java-type=java.lang.Long
-hibernate.tables.tl_lavidr10_videoRecorder.columns.create_date.java-name=createDate
-hibernate.tables.tl_lavidr10_videoRecorder.columns.create_date.java-type=java.sql.Timestamp
-hibernate.tables.tl_lavidr10_videoRecorder.columns.define_later.java-name=defineLater
-hibernate.tables.tl_lavidr10_videoRecorder.columns.define_later.java-type=java.lang.Boolean
-hibernate.tables.tl_lavidr10_videoRecorder.columns.instructions.inctostring=true
-hibernate.tables.tl_lavidr10_videoRecorder.columns.instructions.java-name=instructions
-hibernate.tables.tl_lavidr10_videoRecorder.columns.instructions.java-type=java.lang.String
-hibernate.tables.tl_lavidr10_videoRecorder.columns.lock_on_finished.java-name=lockOnFinished
-hibernate.tables.tl_lavidr10_videoRecorder.columns.lock_on_finished.java-type=java.lang.Boolean
-hibernate.tables.tl_lavidr10_videoRecorder.columns.offline_instructions.java-name=offlineInstructions
-hibernate.tables.tl_lavidr10_videoRecorder.columns.offline_instructions.java-type=java.lang.String
-hibernate.tables.tl_lavidr10_videoRecorder.columns.online_instructions.java-name=onlineInstructions
-hibernate.tables.tl_lavidr10_videoRecorder.columns.online_instructions.java-type=java.lang.String
-hibernate.tables.tl_lavidr10_videoRecorder.columns.title.inctostring=true
-hibernate.tables.tl_lavidr10_videoRecorder.columns.title.java-name=title
-hibernate.tables.tl_lavidr10_videoRecorder.columns.title.java-type=java.lang.String
-hibernate.tables.tl_lavidr10_videoRecorder.columns.tool_content_id.inctostring=true
-hibernate.tables.tl_lavidr10_videoRecorder.columns.tool_content_id.java-name=toolContentId
-hibernate.tables.tl_lavidr10_videoRecorder.columns.tool_content_id.java-type=java.lang.Long
-hibernate.tables.tl_lavidr10_videoRecorder.columns.uid.columnspecialty=key
-hibernate.tables.tl_lavidr10_videoRecorder.columns.uid.incequals=true
-hibernate.tables.tl_lavidr10_videoRecorder.columns.uid.inctostring=true
-hibernate.tables.tl_lavidr10_videoRecorder.columns.uid.java-name=uid
-hibernate.tables.tl_lavidr10_videoRecorder.columns.uid.java-type=java.lang.Long
-hibernate.tables.tl_lavidr10_videoRecorder.columns.update_date.java-name=updateDate
-hibernate.tables.tl_lavidr10_videoRecorder.columns.update_date.java-type=java.sql.Timestamp
-hibernate.tables.tl_lavidr10_videoRecorder.dynamicInsert=false
-hibernate.tables.tl_lavidr10_videoRecorder.equalshashcode=true
-hibernate.tables.tl_lavidr10_videoRecorder.keygenerator=native
+hibernate.tables.tl_lavidr10_videorecorder.base-class-name=VideoRecorder
+hibernate.tables.tl_lavidr10_videorecorder.columns.content_in_use.java-name=contentInUse
+hibernate.tables.tl_lavidr10_videorecorder.columns.content_in_use.java-type=java.lang.Boolean
+hibernate.tables.tl_lavidr10_videorecorder.columns.create_by.java-name=createBy
+hibernate.tables.tl_lavidr10_videorecorder.columns.create_by.java-type=java.lang.Long
+hibernate.tables.tl_lavidr10_videorecorder.columns.create_date.java-name=createDate
+hibernate.tables.tl_lavidr10_videorecorder.columns.create_date.java-type=java.sql.Timestamp
+hibernate.tables.tl_lavidr10_videorecorder.columns.define_later.java-name=defineLater
+hibernate.tables.tl_lavidr10_videorecorder.columns.define_later.java-type=java.lang.Boolean
+hibernate.tables.tl_lavidr10_videorecorder.columns.instructions.inctostring=true
+hibernate.tables.tl_lavidr10_videorecorder.columns.instructions.java-name=instructions
+hibernate.tables.tl_lavidr10_videorecorder.columns.instructions.java-type=java.lang.String
+hibernate.tables.tl_lavidr10_videorecorder.columns.lock_on_finished.java-name=lockOnFinished
+hibernate.tables.tl_lavidr10_videorecorder.columns.lock_on_finished.java-type=java.lang.Boolean
+hibernate.tables.tl_lavidr10_videorecorder.columns.offline_instructions.java-name=offlineInstructions
+hibernate.tables.tl_lavidr10_videorecorder.columns.offline_instructions.java-type=java.lang.String
+hibernate.tables.tl_lavidr10_videorecorder.columns.online_instructions.java-name=onlineInstructions
+hibernate.tables.tl_lavidr10_videorecorder.columns.online_instructions.java-type=java.lang.String
+hibernate.tables.tl_lavidr10_videorecorder.columns.title.inctostring=true
+hibernate.tables.tl_lavidr10_videorecorder.columns.title.java-name=title
+hibernate.tables.tl_lavidr10_videorecorder.columns.title.java-type=java.lang.String
+hibernate.tables.tl_lavidr10_videorecorder.columns.tool_content_id.inctostring=true
+hibernate.tables.tl_lavidr10_videorecorder.columns.tool_content_id.java-name=toolContentId
+hibernate.tables.tl_lavidr10_videorecorder.columns.tool_content_id.java-type=java.lang.Long
+hibernate.tables.tl_lavidr10_videorecorder.columns.uid.columnspecialty=key
+hibernate.tables.tl_lavidr10_videorecorder.columns.uid.incequals=true
+hibernate.tables.tl_lavidr10_videorecorder.columns.uid.inctostring=true
+hibernate.tables.tl_lavidr10_videorecorder.columns.uid.java-name=uid
+hibernate.tables.tl_lavidr10_videorecorder.columns.uid.java-type=java.lang.Long
+hibernate.tables.tl_lavidr10_videorecorder.columns.update_date.java-name=updateDate
+hibernate.tables.tl_lavidr10_videorecorder.columns.update_date.java-type=java.sql.Timestamp
+hibernate.tables.tl_lavidr10_videorecorder.dynamicInsert=false
+hibernate.tables.tl_lavidr10_videorecorder.equalshashcode=true
+hibernate.tables.tl_lavidr10_videorecorder.keygenerator=native
hibernate.tables.tl_lavidr10_session.base-class-name=VideoRecorderSession
hibernate.tables.tl_lavidr10_session.columns.videoRecorder_uid.java-name=videoRecorderUid
hibernate.tables.tl_lavidr10_session.columns.videoRecorder_uid.java-type=java.lang.Long
@@ -104,22 +104,22 @@
hibernate.tables.tl_lavidr10_user.columns.user_id.java-type=java.lang.Long
hibernate.tables.tl_lavidr10_user.equalshashcode=true
hibernate.tables.tl_lavidr10_user.keygenerator=sequence
-relations.tl_lavidr10_videoRecorder-tl_lavidr10_attachment.tl_lavidr10_attachment-has-tl_lavidr10_videoRecorder.enabled=true
-relations.tl_lavidr10_videoRecorder-tl_lavidr10_attachment.tl_lavidr10_attachment-has-tl_lavidr10_videoRecorder.target-many=false
-relations.tl_lavidr10_videoRecorder-tl_lavidr10_attachment.tl_lavidr10_videoRecorder-has-tl_lavidr10_attachment.enabled=true
-relations.tl_lavidr10_videoRecorder-tl_lavidr10_attachment.tl_lavidr10_videoRecorder-has-tl_lavidr10_attachment.target-many=true
-relations.tl_lavidr10_videoRecorder-tl_lavidr10_session.tl_lavidr10_videoRecorder-has-tl_lavidr10_session.enabled=true
-relations.tl_lavidr10_videoRecorder-tl_lavidr10_session.tl_lavidr10_videoRecorder-has-tl_lavidr10_session.target-many=true
-relations.tl_lavidr10_videoRecorder-tl_lavidr10_session.tl_lavidr10_session-has-tl_lavidr10_videoRecorder.enabled=true
-relations.tl_lavidr10_videoRecorder-tl_lavidr10_session.tl_lavidr10_session-has-tl_lavidr10_videoRecorder.target-many=false
+relations.tl_lavidr10_videorecorder-tl_lavidr10_attachment.tl_lavidr10_attachment-has-tl_lavidr10_videorecorder.enabled=true
+relations.tl_lavidr10_videorecorder-tl_lavidr10_attachment.tl_lavidr10_attachment-has-tl_lavidr10_videorecorder.target-many=false
+relations.tl_lavidr10_videorecorder-tl_lavidr10_attachment.tl_lavidr10_videorecorder-has-tl_lavidr10_attachment.enabled=true
+relations.tl_lavidr10_videorecorder-tl_lavidr10_attachment.tl_lavidr10_videorecorder-has-tl_lavidr10_attachment.target-many=true
+relations.tl_lavidr10_videorecorder-tl_lavidr10_session.tl_lavidr10_videorecorder-has-tl_lavidr10_session.enabled=true
+relations.tl_lavidr10_videorecorder-tl_lavidr10_session.tl_lavidr10_videorecorder-has-tl_lavidr10_session.target-many=true
+relations.tl_lavidr10_videorecorder-tl_lavidr10_session.tl_lavidr10_session-has-tl_lavidr10_videorecorder.enabled=true
+relations.tl_lavidr10_videorecorder-tl_lavidr10_session.tl_lavidr10_session-has-tl_lavidr10_videorecorder.target-many=false
relations.tl_lavidr10_session-tl_lavidr10_user.tl_lavidr10_session-has-tl_lavidr10_user.enabled=true
relations.tl_lavidr10_session-tl_lavidr10_user.tl_lavidr10_session-has-tl_lavidr10_user.target-many=true
relations.tl_lavidr10_session-tl_lavidr10_user.tl_lavidr10_user-has-tl_lavidr10_session.enabled=true
relations.tl_lavidr10_session-tl_lavidr10_user.tl_lavidr10_user-has-tl_lavidr10_session.target-many=false
tables.tl_lavidr10_attachment.x=566
tables.tl_lavidr10_attachment.y=173
-tables.tl_lavidr10_videoRecorder.x=308
-tables.tl_lavidr10_videoRecorder.y=176
+tables.tl_lavidr10_videorecorder.x=308
+tables.tl_lavidr10_videorecorder.y=176
tables.tl_lavidr10_session.x=70
tables.tl_lavidr10_session.y=70
tables.tl_lavidr10_user.x=460
Index: lams_tool_videorecorder/db/model/videoRecorder_tool.clay
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_videorecorder/db/model/videoRecorder_tool.clay (.../videoRecorder_tool.clay) (revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/db/model/videoRecorder_tool.clay (.../videoRecorder_tool.clay) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -44,7 +44,7 @@
-
+
@@ -143,7 +143,7 @@
-
+
@@ -162,7 +162,7 @@
-
+
@@ -505,7 +505,7 @@
-
+
Index: lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql
===================================================================
diff -u -rf6a03ee21a18654d54498cd94d9f68fbea3b996a -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql (.../create_lams_tool_videoRecorder.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a)
+++ lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql (.../create_lams_tool_videoRecorder.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -3,7 +3,7 @@
SET FOREIGN_KEY_CHECKS=0;
DROP TABLE IF EXISTS tl_lavidr10_conditions;
drop table if exists tl_lavidr10_attachment;
-drop table if exists tl_lavidr10_videoRecorder;
+drop table if exists tl_lavidr10_videorecorder;
drop table if exists tl_lavidr10_recording;
drop table if exists tl_lavidr10_session;
drop table if exists tl_lavidr10_user;
@@ -21,7 +21,7 @@
primary key (uid)
)ENGINE=InnoDB;
-create table tl_lavidr10_videoRecorder (
+create table tl_lavidr10_videorecorder (
uid bigint not null auto_increment,
create_date datetime,
update_date datetime,
@@ -107,11 +107,11 @@
primary key (uid)
)ENGINE=InnoDB;
-alter table tl_lavidr10_attachment add index FK_NEW_75587508_12090F57FC940906 (videoRecorder_uid), add constraint FK_NEW_75587508_12090F57FC940906 foreign key (videoRecorder_uid) references tl_lavidr10_videoRecorder (uid);
-alter table tl_lavidr10_session add index FK_NEW_75587508_B7C198E2FC940906 (videoRecorder_uid), add constraint FK_NEW_75587508_B7C198E2FC940906 foreign key (videoRecorder_uid) references tl_lavidr10_videoRecorder (uid);
+alter table tl_lavidr10_attachment add index FK_NEW_75587508_12090F57FC940906 (videoRecorder_uid), add constraint FK_NEW_75587508_12090F57FC940906 foreign key (videoRecorder_uid) references tl_lavidr10_videorecorder (uid);
+alter table tl_lavidr10_session add index FK_NEW_75587508_B7C198E2FC940906 (videoRecorder_uid), add constraint FK_NEW_75587508_B7C198E2FC940906 foreign key (videoRecorder_uid) references tl_lavidr10_videorecorder (uid);
alter table tl_lavidr10_user add index FK_NEW_75587508_CB8A58FFA3B0FADF (videoRecorder_session_uid), add constraint FK_NEW_75587508_CB8A58FFA3B0FADF foreign key (videoRecorder_session_uid) references tl_lavidr10_session (uid);
-INSERT INTO tl_lavidr10_videoRecorder (
+INSERT INTO tl_lavidr10_videorecorder (
title,
instructions,
online_instructions,
@@ -160,7 +160,7 @@
, CONSTRAINT VideoRecorderConditionInheritance FOREIGN KEY (condition_id)
REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
, CONSTRAINT VideoRecorderConditionToVideoRecorder FOREIGN KEY (content_uid)
- REFERENCES tl_lavidr10_videoRecorder(uid) ON DELETE CASCADE ON UPDATE CASCADE
+ REFERENCES tl_lavidr10_videorecorder(uid) ON DELETE CASCADE ON UPDATE CASCADE
)ENGINE=InnoDB;
SET FOREIGN_KEY_CHECKS=1;
Index: lams_tool_videorecorder/db/sql/drop_lams_tool_videoRecorder.sql
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_videorecorder/db/sql/drop_lams_tool_videoRecorder.sql (.../drop_lams_tool_videoRecorder.sql) (revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/db/sql/drop_lams_tool_videoRecorder.sql (.../drop_lams_tool_videoRecorder.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -5,7 +5,7 @@
DROP TABLE IF EXISTS tl_lavidr10_user;
DROP TABLE IF EXISTS tl_lavidr10_attachment;
DROP TABLE IF EXISTS tl_lavidr10_session;
-DROP TABLE IF EXISTS tl_lavidr10_videoRecorder;
+DROP TABLE IF EXISTS tl_lavidr10_videorecorder;
SET FOREIGN_KEY_CHECKS=1;
Index: lams_tool_videorecorder/db/sql/table-schema.sql
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_videorecorder/db/sql/table-schema.sql (.../table-schema.sql) (revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_tool_videorecorder/db/sql/table-schema.sql (.../table-schema.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -21,7 +21,7 @@
drop table if exists tl_lavidr10_recording;
drop table if exists tl_lavidr10_session;
drop table if exists tl_lavidr10_user;
-drop table if exists tl_lavidr10_videoRecorder;
+drop table if exists tl_lavidr10_videorecorder;
create table lams_branch_condition (condition_id bigint not null auto_increment, condition_ui_id integer, order_id integer, name varchar(255), display_name varchar(255), type varchar(255), start_value varchar(255), end_value varchar(255), exact_match_value varchar(255), primary key (condition_id));
create table lams_text_search_condition (condition_id bigint not null, text_search_all_words varchar(255), text_search_phrase varchar(255), text_search_any_words varchar(255), text_search_excluded_words varchar(255), primary key (condition_id));
create table tl_lavidr10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, videoRecorder_uid bigint, primary key (uid));
@@ -31,18 +31,18 @@
create table tl_lavidr10_recording (uid bigint not null auto_increment, tool_content_id bigint, create_date datetime, update_date datetime, create_by bigint, title varchar(255), description longtext, rating float, is_just_sound bit, is_local bit, videoRecorder_session_uid bigint, filename varchar(255), primary key (uid));
create table tl_lavidr10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), content_folder_id varchar(32), videoRecorder_uid bigint, primary key (uid));
create table tl_lavidr10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, videoRecorder_session_uid bigint, entry_uid bigint, primary key (uid));
-create table tl_lavidr10_videoRecorder (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions longtext, reflect_on_activity bit, reflect_instructions longtext, run_offline bit, lock_on_finished bit, allow_use_voice bit, allow_use_camera bit, allow_learner_video_visibility bit, allow_comments bit, allow_ratings bit, export_offline bit, export_all bit, online_instructions longtext, offline_instructions longtext, content_in_use bit, define_later bit, tool_content_id bigint, primary key (uid));
+create table tl_lavidr10_videorecorder (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions longtext, reflect_on_activity bit, reflect_instructions longtext, run_offline bit, lock_on_finished bit, allow_use_voice bit, allow_use_camera bit, allow_learner_video_visibility bit, allow_comments bit, allow_ratings bit, export_offline bit, export_all bit, online_instructions longtext, offline_instructions longtext, content_in_use bit, define_later bit, tool_content_id bigint, primary key (uid));
alter table lams_text_search_condition add index FK69B884B21E70F543 (condition_id), add constraint FK69B884B21E70F543 foreign key (condition_id) references lams_branch_condition (condition_id);
-alter table tl_lavidr10_attachment add index FKBF292946C1D77330 (videoRecorder_uid), add constraint FKBF292946C1D77330 foreign key (videoRecorder_uid) references tl_lavidr10_videoRecorder (uid);
+alter table tl_lavidr10_attachment add index FKBF292946C1D77330 (videoRecorder_uid), add constraint FKBF292946C1D77330 foreign key (videoRecorder_uid) references tl_lavidr10_videorecorder (uid);
alter table tl_lavidr10_comment add index FKD6C3C91C5C3E37F1 (videoRecorder_session_uid), add constraint FKD6C3C91C5C3E37F1 foreign key (videoRecorder_session_uid) references tl_lavidr10_session (uid);
alter table tl_lavidr10_comment add index FKD6C3C91C1EA54C27 (videoRecorder_recording_uid), add constraint FKD6C3C91C1EA54C27 foreign key (videoRecorder_recording_uid) references tl_lavidr10_recording (uid);
alter table tl_lavidr10_comment add index FKD6C3C91CB1418D4B (create_by), add constraint FKD6C3C91CB1418D4B foreign key (create_by) references tl_lavidr10_user (uid);
-alter table tl_lavidr10_conditions add index FKFCB606DBCA197570 (content_uid), add constraint FKFCB606DBCA197570 foreign key (content_uid) references tl_lavidr10_videoRecorder (uid);
+alter table tl_lavidr10_conditions add index FKFCB606DBCA197570 (content_uid), add constraint FKFCB606DBCA197570 foreign key (content_uid) references tl_lavidr10_videorecorder (uid);
alter table tl_lavidr10_conditions add index FKFCB606DB3E8DC190 (condition_id), add constraint FKFCB606DB3E8DC190 foreign key (condition_id) references lams_text_search_condition (condition_id);
alter table tl_lavidr10_rating add index FK9BA30B405C3E37F1 (videoRecorder_session_uid), add constraint FK9BA30B405C3E37F1 foreign key (videoRecorder_session_uid) references tl_lavidr10_session (uid);
alter table tl_lavidr10_rating add index FK9BA30B401EA54C27 (videoRecorder_recording_uid), add constraint FK9BA30B401EA54C27 foreign key (videoRecorder_recording_uid) references tl_lavidr10_recording (uid);
alter table tl_lavidr10_rating add index FK9BA30B40B1418D4B (create_by), add constraint FK9BA30B40B1418D4B foreign key (create_by) references tl_lavidr10_user (uid);
alter table tl_lavidr10_recording add index FKC94A9D6E5C3E37F1 (videoRecorder_session_uid), add constraint FKC94A9D6E5C3E37F1 foreign key (videoRecorder_session_uid) references tl_lavidr10_session (uid);
alter table tl_lavidr10_recording add index FKC94A9D6EB1418D4B (create_by), add constraint FKC94A9D6EB1418D4B foreign key (create_by) references tl_lavidr10_user (uid);
-alter table tl_lavidr10_session add index FK146E5D53C1D77330 (videoRecorder_uid), add constraint FK146E5D53C1D77330 foreign key (videoRecorder_uid) references tl_lavidr10_videoRecorder (uid);
+alter table tl_lavidr10_session add index FK146E5D53C1D77330 (videoRecorder_uid), add constraint FK146E5D53C1D77330 foreign key (videoRecorder_uid) references tl_lavidr10_videorecorder (uid);
alter table tl_lavidr10_user add index FKF184522E5C3E37F1 (videoRecorder_session_uid), add constraint FKF184522E5C3E37F1 foreign key (videoRecorder_session_uid) references tl_lavidr10_session (uid);
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/patch20140102.sql
===================================================================
diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/patch20140102.sql (.../patch20140102.sql) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/patch20140102.sql (.../patch20140102.sql) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -4,9 +4,9 @@
----------------------Put all sql statements below here-------------------------
-- LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options
-ALTER TABLE tl_lavidr10_videoRecorder DROP COLUMN online_instructions;
-ALTER TABLE tl_lavidr10_videoRecorder DROP COLUMN offline_instructions;
-ALTER TABLE tl_lavidr10_videoRecorder DROP COLUMN run_offline;
+ALTER TABLE tl_lavidr10_videorecorder DROP COLUMN online_instructions;
+ALTER TABLE tl_lavidr10_videorecorder DROP COLUMN offline_instructions;
+ALTER TABLE tl_lavidr10_videorecorder DROP COLUMN run_offline;
DROP TABLE IF EXISTS tl_lavidr10_attachment;
UPDATE lams_tool SET tool_version='20140102' WHERE tool_signature='lavidr10';
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java
===================================================================
diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r4d7dfe83093db060d8edeab425ce01543b38b530
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java (.../VideoRecorder.java) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java (.../VideoRecorder.java) (revision 4d7dfe83093db060d8edeab425ce01543b38b530)
@@ -36,7 +36,7 @@
import org.lamsfoundation.lams.tool.videoRecorder.service.VideoRecorderService;
/**
- * @hibernate.class table="tl_lavidr10_videoRecorder"
+ * @hibernate.class table="tl_lavidr10_videorecorder"
*/
public class VideoRecorder implements java.io.Serializable, Cloneable {