Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
===================================================================
diff -u -r950ffe777776ecffa7f99e02b9674f0c71d382ab -r96871d90a1687f73bef35cac8e4837325b51e843
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml (.../Tool.hbm.xml) (revision 950ffe777776ecffa7f99e02b9674f0c71d382ab)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml (.../Tool.hbm.xml) (revision 96871d90a1687f73bef35cac8e4837325b51e843)
@@ -168,14 +168,14 @@
name="defaultToolContentId"
type="long"
column="default_tool_content_id"
- not-null="true"
+ not-null="false"
length="20"
>
@hibernate.property
column="default_tool_content_id"
length="20"
- not-null="true"
+ not-null="false"
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2161,8 +2148,8 @@
-
+
@@ -2717,11 +2704,11 @@
-
+
-
+
@@ -2730,11 +2717,11 @@
-
+
-
+
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r9c2999d1cf0a8370184a836e8389deae63881df3 -r96871d90a1687f73bef35cac8e4837325b51e843
--- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 9c2999d1cf0a8370184a836e8389deae63881df3)
+++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 96871d90a1687f73bef35cac8e4837325b51e843)
@@ -87,6 +87,7 @@
, name VARCHAR(255) NOT NULL
, PRIMARY KEY (workspace_id)
)TYPE=InnoDB;
+ALTER TABLE lams_cr_workspace COMMENT='Content repository workspace';
CREATE TABLE lams_cr_credential (
credential_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT
@@ -95,6 +96,7 @@
, wc_id BIGINT(20) UNSIGNED NOT NULL
, PRIMARY KEY (credential_id)
)TYPE=InnoDB;
+ALTER TABLE lams_cr_credential COMMENT='Records the identification properties for a tool.';
CREATE TABLE lams_workspace_folder_type (
lams_workspace_folder_type_id INT(3) NOT NULL
@@ -138,7 +140,7 @@
, workspace_id BIGINT(20) NOT NULL
, user_id BIGINT(20) NOT NULL
, create_date_time DATETIME NOT NULL
- , last_modified_date_time DATETIME
+ , last_modified_date_time DATETIME
, lams_workspace_folder_type_id INT(3) NOT NULL
, PRIMARY KEY (workspace_folder_id)
, INDEX (parent_folder_id)
@@ -201,7 +203,6 @@
, create_date DATETIME NOT NULL
, authentication_method_id BIGINT(20) NOT NULL DEFAULT 0
, workspace_id BIGINT(20)
- , user_organisation_id BIGINT(20) NOT NULL DEFAULT 0
, base_organisation_id BIGINT(20) NOT NULL DEFAULT 0
, PRIMARY KEY (user_id)
, INDEX (authentication_method_id)
@@ -242,7 +243,7 @@
, lesson_id BIGINT(20)
, lesson_start_date_time DATETIME
, lesson_name VARCHAR(255)
- , last_modified_date_time DATETIME
+ , last_modified_date_time DATETIME
, PRIMARY KEY (learning_design_id)
, INDEX (parent_learning_design_id)
, CONSTRAINT FK_lams_learning_design_2 FOREIGN KEY (parent_learning_design_id)
@@ -337,8 +338,8 @@
, service_name VARCHAR(255) NOT NULL
, tool_display_name VARCHAR(255) NOT NULL
, description TEXT
- , learning_library_id BIGINT(20) NOT NULL
- , default_tool_content_id BIGINT(20) NOT NULL
+ , learning_library_id BIGINT(20)
+ , default_tool_content_id BIGINT(20)
, valid_flag TINYINT(1) NOT NULL DEFAULT 1
, grouping_support_type_id INT(3) NOT NULL
, supports_define_later_flag TINYINT(1) NOT NULL DEFAULT 0
@@ -483,6 +484,7 @@
, CONSTRAINT FK_lams_cr_node_1 FOREIGN KEY (workspace_id)
REFERENCES lams_cr_workspace (workspace_id)
)TYPE=InnoDB;
+ALTER TABLE lams_cr_node COMMENT='The main table containing the node definition';
CREATE TABLE lams_cr_node_version (
nv_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT
@@ -495,6 +497,7 @@
, CONSTRAINT FK_lams_cr_node_version_2 FOREIGN KEY (node_id)
REFERENCES lams_cr_node (node_id)
)TYPE=InnoDB;
+ALTER TABLE lams_cr_node_version COMMENT='Represents a version of a node';
CREATE TABLE lams_user_organisation_role (
user_organisation_role_id BIGINT(20) NOT NULL AUTO_INCREMENT
@@ -620,6 +623,7 @@
, CONSTRAINT FK_lams_cr_workspace_credential_2 FOREIGN KEY (credential_id)
REFERENCES lams_cr_credential (credential_id) ON DELETE NO ACTION ON UPDATE NO ACTION
)TYPE=InnoDB;
+ALTER TABLE lams_cr_workspace_credential COMMENT='Maps tools access to workspaces';
CREATE TABLE lams_cr_node_version_property (
id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT
Index: lams_common/db/sql/insert_test_data.sql
===================================================================
diff -u -r8f947c72ba15d3c2adac009f08afddf0f089aae4 -r96871d90a1687f73bef35cac8e4837325b51e843
--- lams_common/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision 8f947c72ba15d3c2adac009f08afddf0f089aae4)
+++ lams_common/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision 96871d90a1687f73bef35cac8e4837325b51e843)
@@ -6,9 +6,9 @@
INSERT INTO lams_organisation VALUES (4, 'LAMS', 'Lams Project Team',3,3,NOW(),null);
INSERT INTO lams_organisation VALUES (5, 'MAMS', 'Mams Project Team',3,3,NOW(),null);
-INSERT INTO lams_user VALUES(1, 'sysadmin','sysadmin','Mr','Fei','Yang',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'fyang@melcoe.mq.edu.au',0,NOW(),1,null,1,1);
-INSERT INTO lams_user VALUES(2, 'test','test','Mr','Kevin','Han',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'khan@melcoe.mq.edu.au',0,NOW(),3,null,2,2);
-INSERT INTO lams_user VALUES(3, 'lamskh01','dummy','Mr','Jacky','Fang',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'jfang@melcoe.mq.edu.au',0,NOW(),2,null,3,3);
+INSERT INTO lams_user VALUES(1, 'sysadmin','sysadmin','Mr','Fei','Yang',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'fyang@melcoe.mq.edu.au',0,NOW(),1,null,1);
+INSERT INTO lams_user VALUES(2, 'test','test','Mr','Kevin','Han',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'khan@melcoe.mq.edu.au',0,NOW(),3,null,2);
+INSERT INTO lams_user VALUES(3, 'lamskh01','dummy','Mr','Jacky','Fang',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'jfang@melcoe.mq.edu.au',0,NOW(),2,null,3);
INSERT INTO lams_user_organisation VALUES (1, 1, 1);
INSERT INTO lams_user_organisation VALUES (2, 2, 2);
Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
===================================================================
diff -u -r950ffe777776ecffa7f99e02b9674f0c71d382ab -r96871d90a1687f73bef35cac8e4837325b51e843
--- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 950ffe777776ecffa7f99e02b9674f0c71d382ab)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 96871d90a1687f73bef35cac8e4837325b51e843)
@@ -44,7 +44,7 @@
/** nullable persistent field */
private String defineLaterUrl;
- /** persistent field */
+ /** nullable persistent field */
private long defaultToolContentId;
/** persistent field */
@@ -290,7 +290,7 @@
/**
* @hibernate.property column="default_tool_content_id" length="20"
- * not-null="true"
+ * not-null="false"
*/
public long getDefaultToolContentId() {
return this.defaultToolContentId;