Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml =================================================================== diff -u -r42136b19481bf27f3df754e7db5b7c073a6db7a6 -r33ea91d27c610597a8ebc896dddcc289b0405b01 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml (.../User.hbm.xml) (revision 42136b19481bf27f3df754e7db5b7c073a6db7a6) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml (.../User.hbm.xml) (revision 33ea91d27c610597a8ebc896dddcc289b0405b01) @@ -46,14 +46,14 @@ column="login" not-null="true" unique="true" - length="20" + length="255" > true @hibernate.property column="login" unique="true" - length="20" + length="255" not-null="true" @@ -87,12 +87,12 @@ name="firstName" type="java.lang.String" column="first_name" - length="64" + length="128" > @hibernate.property column="first_name" - length="64" + length="128" - + \ No newline at end of file Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml =================================================================== diff -u -rd425bf91578e9887df393284ed1ec2f435a78917 -r33ea91d27c610597a8ebc896dddcc289b0405b01 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml (.../Workspace.hbm.xml) (revision d425bf91578e9887df393284ed1ec2f435a78917) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml (.../Workspace.hbm.xml) (revision 33ea91d27c610597a8ebc896dddcc289b0405b01) @@ -38,8 +38,8 @@ - - @hibernate.property column="name" length="65535" + + @hibernate.property column="name" length="255" Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml =================================================================== diff -u -r2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb -r33ea91d27c610597a8ebc896dddcc289b0405b01 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml (.../WorkspaceFolder.hbm.xml) (revision 2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml (.../WorkspaceFolder.hbm.xml) (revision 33ea91d27c610597a8ebc896dddcc289b0405b01) @@ -42,12 +42,12 @@ type="java.lang.String" column="name" not-null="true" - length="64" + length="255" > @hibernate.property column="name" - length="64" + length="255" not-null="true" Index: lams_common/db/model/lams_11.clay =================================================================== diff -u -r149b55b83654769a26d6d08fbca3021281850ab1 -r33ea91d27c610597a8ebc896dddcc289b0405b01 --- lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 149b55b83654769a26d6d08fbca3021281850ab1) +++ lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 33ea91d27c610597a8ebc896dddcc289b0405b01) @@ -1856,7 +1856,7 @@ - + @@ -2430,7 +2430,7 @@ - + Index: lams_common/db/sql/create_lams_11_tables.sql =================================================================== diff -u -r149b55b83654769a26d6d08fbca3021281850ab1 -r33ea91d27c610597a8ebc896dddcc289b0405b01 --- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 149b55b83654769a26d6d08fbca3021281850ab1) +++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 33ea91d27c610597a8ebc896dddcc289b0405b01) @@ -171,7 +171,7 @@ CREATE TABLE lams_workspace_folder ( workspace_folder_id BIGINT(20) NOT NULL AUTO_INCREMENT , parent_folder_id BIGINT(20) - , name VARCHAR(64) NOT NULL + , name VARCHAR(255) NOT NULL , user_id BIGINT(20) NOT NULL , create_date_time DATETIME NOT NULL , last_modified_date_time DATETIME @@ -283,7 +283,7 @@ CREATE TABLE lams_user ( user_id BIGINT(20) NOT NULL AUTO_INCREMENT - , login VARCHAR(20) NOT NULL + , login VARCHAR(255) NOT NULL , password VARCHAR(50) NOT NULL , title VARCHAR(32) , first_name VARCHAR(128) Index: lams_common/db/sql/insert_windows_config_data.sql =================================================================== diff -u -rd438c3fe3c8ccee3264e073c1635c2f6d9d648ed -r33ea91d27c610597a8ebc896dddcc289b0405b01 --- lams_common/db/sql/insert_windows_config_data.sql (.../insert_windows_config_data.sql) (revision d438c3fe3c8ccee3264e073c1635c2f6d9d648ed) +++ lams_common/db/sql/insert_windows_config_data.sql (.../insert_windows_config_data.sql) (revision 33ea91d27c610597a8ebc896dddcc289b0405b01) @@ -2,7 +2,7 @@ insert into lams_configuration (config_key, config_value) values ('Version','2.0'); insert into lams_configuration (config_key, config_value) values ('TempDir','C:/lams/temp'); insert into lams_configuration (config_key, config_value) values ('DumpDir','C:/lams/dump'); -insert into lams_configuration (config_key, config_value) values ('EARDir','D:/jboss-4.0.2/server/default/deploy/lams.ear'); +insert into lams_configuration (config_key, config_value) values ('EARDir','C:/jboss-4.0.2/server/default/deploy/lams.ear'); insert into lams_configuration (config_key, config_value) values ('SMTPServer','mail.lib.mq.edu.au'); insert into lams_configuration (config_key, config_value) values ('LamsSupportEmail','lams_support@melcoe.mq.edu.au'); insert into lams_configuration (config_key, config_value) values ('ContentRepositoryPath','C:/lams/repository'); Fisheye: Tag 33ea91d27c610597a8ebc896dddcc289b0405b01 refers to a dead (removed) revision in file `lams_common/db/sql/updatescripts/alter_201_system_tool_user.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/db/sql/updatescripts/alter_201_system_tool_user_workspace.sql =================================================================== diff -u --- lams_common/db/sql/updatescripts/alter_201_system_tool_user_workspace.sql (revision 0) +++ lams_common/db/sql/updatescripts/alter_201_system_tool_user_workspace.sql (revision 33ea91d27c610597a8ebc896dddcc289b0405b01) @@ -0,0 +1,22 @@ +-- Script to be run for LAMS 2.0.1 release, on LAMS 2.0 tables. +-- Change the url for the learner progress screen for grouping. +-- Add a flag to the user table to indicate that the user needs to change their password + +UPDATE lams_system_tool +SET learner_progress_url = "learning/grouping.do?method=viewGrouping&mode=teacher" +WHERE tool_display_name = "Grouping"; + +ALTER TABLE lams_user +CHANGE COLUMN login varchar(255); + +ALTER TABLE lams_user +ADD COLUMN change_password TINYINT DEFAULT 0; + +ALTER TABLE lams_workspace_folder +CHANGE COLUMN name name VARCHAR(255) NOT NULL; + +UPDATE lams_user +SET change_password = 0 +WHERE change_password is null; + +COMMIT; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java =================================================================== diff -u -r0c355521dfc98646cc4adfe6b53bf2ce3eb27465 -r33ea91d27c610597a8ebc896dddcc289b0405b01 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 0c355521dfc98646cc4adfe6b53bf2ce3eb27465) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 33ea91d27c610597a8ebc896dddcc289b0405b01) @@ -226,7 +226,7 @@ /** * @hibernate.property * column="login" - * length="20" + * length="255" * unique="true" * not-null="true" * @@ -271,7 +271,7 @@ /** * @hibernate.property * column="first_name" - * length="64" + * length="128" * */ public String getFirstName() { @@ -831,4 +831,4 @@ public void setChangePassword(Boolean changePassword) { this.changePassword = changePassword; } -} +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java =================================================================== diff -u -r9c74a0eb1d54a55c302a0617a72d44a438664a41 -r33ea91d27c610597a8ebc896dddcc289b0405b01 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java (.../WorkspaceFolder.java) (revision 9c74a0eb1d54a55c302a0617a72d44a438664a41) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java (.../WorkspaceFolder.java) (revision 33ea91d27c610597a8ebc896dddcc289b0405b01) @@ -167,7 +167,7 @@ /** * @hibernate.property * column="name" - * length="64" + * length="255" * not-null="true" * */