Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml,v diff -u -r1.20 -r1.20.6.1 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml 23 Sep 2006 12:05:46 -0000 1.20 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml 12 Mar 2007 08:18:20 -0000 1.20.6.1 @@ -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" + + + + @hibernate.property + column="change_password" + length="1" + + - + \ No newline at end of file Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Attic/Workspace.hbm.xml,v diff -u -r1.11 -r1.11.6.1 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml 8 Aug 2006 02:20:00 -0000 1.11 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml 12 Mar 2007 08:18:20 -0000 1.11.6.1 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml,v diff -u -r1.11 -r1.11.6.1 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml 23 Sep 2006 12:05:46 -0000 1.11 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml 12 Mar 2007 08:18:20 -0000 1.11.6.1 @@ -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/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java,v diff -u -r1.7 -r1.7.2.1 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java 3 Jan 2007 01:29:31 -0000 1.7 +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java 12 Mar 2007 08:18:08 -0000 1.7.2.1 @@ -111,7 +111,7 @@ private void addMemberships(User user, Organisation org){ UserOrganisation uo = new UserOrganisation(user,org); service.save(uo); - Integer[] roles = new Integer[]{Role.ROLE_AUTHOR, Role.ROLE_MONITOR, Role.ROLE_GROUP_MANAGER, Role.ROLE_LEARNER}; + Integer[] roles = new Integer[]{Role.ROLE_AUTHOR, Role.ROLE_MONITOR, Role.ROLE_LEARNER}; for(Integer roleId:roles){ UserOrganisationRole uor = new UserOrganisationRole(uo,(Role)service.findById(Role.class,roleId)); service.save(uor); @@ -138,7 +138,7 @@ org.setName(buildName(serverMap.getPrefix(), extCourseId)); org.setCode(extCourseId); org.setParentOrganisation(serverMap.getOrganisation()); - org.setOrganisationType((OrganisationType)service.findById(OrganisationType.class,OrganisationType.COURSE_TYPE)); + org.setOrganisationType((OrganisationType)service.findById(OrganisationType.class,OrganisationType.CLASS_TYPE)); org.setOrganisationState((OrganisationState)service.findById(OrganisationState.class,OrganisationState.ACTIVE)); org.setLocale(getLocale(countryIsoCode, langIsoCode)); service.saveOrganisation(org, user.getUserId()); @@ -212,6 +212,7 @@ map.setExtUsername(extUsername); map.setUser(user); service.save(map); + addMemberships(user, serverMap.getOrganisation()); return map; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v diff -u -r1.29 -r1.29.6.1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 1 Nov 2006 04:41:33 -0000 1.29 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 12 Mar 2007 08:18:08 -0000 1.29.6.1 @@ -147,8 +147,11 @@ /** persistent field */ private Long portraitUuid; + /** persistent field */ + private Boolean changePassword; + /** full constructor */ - public User(String login, String password, String title, String firstName, String lastName, String addressLine1, String addressLine2, String addressLine3, String city, String state, String postcode, String country, String dayPhone, String eveningPhone, String mobilePhone, String fax, String email, Boolean disabledFlag, Date createDate, Workspace workspace, AuthenticationMethod authenticationMethod, CSSThemeVisualElement flashTheme, CSSThemeVisualElement htmlTheme, Set userOrganisations, String chatId, Set learnerProgresses, Set userToolSessions, Set userGroups, Set learningDesigns, Set lessons, Long portraitUuid) { + public User(String login, String password, String title, String firstName, String lastName, String addressLine1, String addressLine2, String addressLine3, String city, String state, String postcode, String country, String dayPhone, String eveningPhone, String mobilePhone, String fax, String email, Boolean disabledFlag, Date createDate, Workspace workspace, AuthenticationMethod authenticationMethod, CSSThemeVisualElement flashTheme, CSSThemeVisualElement htmlTheme, Set userOrganisations, String chatId, Set learnerProgresses, Set userToolSessions, Set userGroups, Set learningDesigns, Set lessons, Long portraitUuid, Boolean changePassword) { this.login = login; this.password = password; this.title = title; @@ -180,10 +183,12 @@ this.learningDesigns = learningDesigns; this.lessons = lessons; this.portraitUuid = portraitUuid; + this.changePassword = changePassword; } /** default constructor */ public User() { + this.changePassword = false; } /** minimal constructor */ @@ -200,6 +205,7 @@ this.userGroups = userGroups; this.learningDesigns = learningDesigns; this.lessons = lessons; + this.changePassword = false; } /** @@ -220,7 +226,7 @@ /** * @hibernate.property * column="login" - * length="20" + * length="255" * unique="true" * not-null="true" * @@ -265,7 +271,7 @@ /** * @hibernate.property * column="first_name" - * length="64" + * length="128" * */ public String getFirstName() { @@ -810,4 +816,19 @@ public void setPortraitUuid(Long portraitUuid) { this.portraitUuid = portraitUuid; } -} + + /** + * @hibernate.property + * column="change_password" + * length="1" + * not-null="true" + * + */ + public Boolean getChangePassword() { + return this.changePassword; + } + + 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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java,v diff -u -r1.16 -r1.16.6.1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java 25 Sep 2006 05:45:35 -0000 1.16 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java 12 Mar 2007 08:18:08 -0000 1.16.6.1 @@ -167,7 +167,7 @@ /** * @hibernate.property * column="name" - * length="64" + * length="255" * not-null="true" * */ Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java,v diff -u -r1.10 -r1.10.2.1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java 11 Dec 2006 06:56:27 -0000 1.10 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java 12 Mar 2007 08:18:09 -0000 1.10.2.1 @@ -23,20 +23,14 @@ /* $$Id$$ */ package org.lamsfoundation.lams.usermanagement.dao.hibernate; -import java.util.List; - -import org.hibernate.FetchMode; import org.hibernate.HibernateException; import org.hibernate.Query; import org.hibernate.Session; -import org.hibernate.criterion.Expression; -import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.usermanagement.Organisation; +import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; -import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.dao.IRoleDAO; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; -import org.lamsfoundation.lams.lesson.LearnerProgress; import org.springframework.orm.hibernate3.HibernateCallback; import org.springframework.orm.hibernate3.HibernateTemplate; /** @@ -45,9 +39,15 @@ */ public class RoleDAO extends BaseDAO implements IRoleDAO { - private final static String LOAD_USER_BY_ORG_AND_ROLE = - "from User u where u.id = :userId and u.userOrganisations.organisation = :org and u.userOrganisations.userOrganisationRoles.role.roleId = :roleId"; - + private final static String LOAD_USER_BY_ORG_AND_ROLE = + "select u " + +"from User u, UserOrganisation uo, UserOrganisationRole uor " + +"where u.id = :userId and " + +"u.id = uo.user.id and " + +"uo.organisation = :org and " + +"uor.userOrganisation.id = uo.id and " + +"uor.role.id = :roleId"; + private final static String COUNT_ROLE = "select count(distinct userOrganisationRole.userOrganisation.user)" + " from "+UserOrganisationRole.class.getName()+" userOrganisationRole" + " where userOrganisationRole.role.roleId = :roleId"; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v diff -u -r1.73 -r1.73.2.1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 14 Dec 2006 23:43:47 -0000 1.73 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 12 Mar 2007 08:18:09 -0000 1.73.2.1 @@ -656,7 +656,10 @@ uo = new UserOrganisation(user, org); save(uo); log.debug("added "+user.getLogin()+" to "+org.getName()); - Set uos = org.getUserOrganisations(); + Set uos; + if ((uos=org.getUserOrganisations())==null) { + uos = new HashSet(); + } uos.add(uo); }