Index: lams_common/db/sql/create_lams_11_tables.sql =================================================================== diff -u -r0e4c2d8550392e022509a50245be3c99a85257f3 -r0e226fe0306f00d662a784f67b7093e8cb2c8f68 --- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 0e4c2d8550392e022509a50245be3c99a85257f3) +++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 0e226fe0306f00d662a784f67b7093e8cb2c8f68) @@ -36,7 +36,7 @@ role_id INT(6) NOT NULL DEFAULT 0 , name VARCHAR(64) NOT NULL , description TEXT - , create_date BIGINT(20) + , create_date DATETIME , PRIMARY KEY (role_id) )TYPE=InnoDB; CREATE INDEX gname ON lams_role (name ASC); Index: lams_common/db/sql/insert_test_data.sql =================================================================== diff -u -r0e4c2d8550392e022509a50245be3c99a85257f3 -r0e226fe0306f00d662a784f67b7093e8cb2c8f68 --- lams_common/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision 0e4c2d8550392e022509a50245be3c99a85257f3) +++ lams_common/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision 0e226fe0306f00d662a784f67b7093e8cb2c8f68) @@ -37,10 +37,10 @@ INSERT INTO lams_authentication_method VALUES (3, 3, 'MQ-LDAP'); INSERT INTO lams_activity_category VALUES (1 ,'SYSTEM'); -INSERT INTO lams_activity_category VALUES (1 ,'COLLABORATION'); -INSERT INTO lams_activity_category VALUES (1 ,'ASSESSMENT'); -INSERT INTO lams_activity_category VALUES (1 ,'CONTENT'); -INSERT INTO lams_activity_category VALUES (1 ,'SPLIT'); +INSERT INTO lams_activity_category VALUES (2 ,'COLLABORATION'); +INSERT INTO lams_activity_category VALUES (3 ,'ASSESSMENT'); +INSERT INTO lams_activity_category VALUES (4 ,'CONTENT'); +INSERT INTO lams_activity_category VALUES (5 ,'SPLIT'); insert into lams_workspace_folder (parent_folder_id,name,workspace_id) values(null,'Trial',1); Index: lams_common/db/sql/insert_types_data.sql =================================================================== diff -u -r045c58f1c6b87e30d896fcdfa164b10c06c00fb1 -r0e226fe0306f00d662a784f67b7093e8cb2c8f68 --- lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 045c58f1c6b87e30d896fcdfa164b10c06c00fb1) +++ lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 0e226fe0306f00d662a784f67b7093e8cb2c8f68) @@ -5,7 +5,7 @@ # Connection: ROOT LOCAL # Host: localhost # Saved: 2005-02-15 11:44:49 -# + INSERT INTO lams_role VALUES (1, 'SYSADMIN', 'LAMS System Adminstrator', NOW()); INSERT INTO lams_role VALUES (2, 'ADMIN', 'Organization Adminstrator', NOW()); INSERT INTO lams_role VALUES (3, 'AUTHOR', 'Authors Learning Designs', NOW()); @@ -55,12 +55,12 @@ INSERT INTO lams_lesson_state VALUES (5, 'FINISHED'); INSERT INTO lams_lesson_state VALUES (6, 'ARCHIVED'); -INSERT into lams_license VALUES (1, 'Attribution-Noncommercial-ShareAlike', 'by-nc-sa', 'http://creativecommons.org/licenses/by-nc-sa/2.0/', 'true', ''); -INSERT into lams_license VALUES (2, 'Other Licensing Agreement', 'other', '','false', ''); -INSERT into lams_license VALUES (3, 'Attribution-No Derivatives', 'by-nd', 'http://creativecommons.org/licenses/by-nd/2.0/','false',''); -INSERT into lams_license VALUES (4, 'Attribution-Noncommercial-No Derivatives', 'by-nc-nd', 'http://creativecommons.org/licenses/by-nc-nd/2.0/','false', ''); -INSERT into lams_license VALUES (5, 'Attribution-Noncommercial', 'by-nc', 'http://creativecommons.org/licenses/by-nc/2.0/','false',''); -INSERT into lams_license VALUES (6, 'Attribution-ShareAlike', 'by-sa', 'http://creativecommons.org/licenses/by-sa/2.0/','false',''); +INSERT into lams_license VALUES (1, 'Attribution-Noncommercial-ShareAlike', 'by-nc-sa', 'http://creativecommons.org/licenses/by-nc-sa/2.0/', 1, ''); +INSERT into lams_license VALUES (2, 'Other Licensing Agreement', 'other', '',0, ''); +INSERT into lams_license VALUES (3, 'Attribution-No Derivatives', 'by-nd', 'http://creativecommons.org/licenses/by-nd/2.0/',0,''); +INSERT into lams_license VALUES (4, 'Attribution-Noncommercial-No Derivatives', 'by-nc-nd', 'http://creativecommons.org/licenses/by-nc-nd/2.0/',0, ''); +INSERT into lams_license VALUES (5, 'Attribution-Noncommercial', 'by-nc', 'http://creativecommons.org/licenses/by-nc/2.0/',0,''); +INSERT into lams_license VALUES (6, 'Attribution-ShareAlike', 'by-sa', 'http://creativecommons.org/licenses/by-sa/2.0/',0,''); INSERT into lams_copy_type VALUES(1,'NONE'); INSERT into lams_copy_type VALUES(2,'LESSON'); Index: lams_common/lib/mysql/mysql-connector-java-3.0.16-ga-bin.jar =================================================================== diff -u -r13fa0140fa606fed27053296cddb39c4df30676b -r0e226fe0306f00d662a784f67b7093e8cb2c8f68 Binary files differ Index: lams_common/lib/mysql/mysql-connector-java-3.1.7-bin.jar =================================================================== diff -u Binary files differ Index: lams_common/properties.xml =================================================================== diff -u -rfe4acb49960c15b037e3a7a33205ce46d3ec12a2 -r0e226fe0306f00d662a784f67b7093e8cb2c8f68 --- lams_common/properties.xml (.../properties.xml) (revision fe4acb49960c15b037e3a7a33205ce46d3ec12a2) +++ lams_common/properties.xml (.../properties.xml) (revision 0e226fe0306f00d662a784f67b7093e8cb2c8f68) @@ -59,7 +59,7 @@ - +