Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IAuthenticationMethodDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IAuthenticationMethodDAO.java (.../IAuthenticationMethodDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IAuthenticationMethodDAO.java (.../IAuthenticationMethodDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,6 +25,7 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; import org.lamsfoundation.lams.usermanagement.User; @@ -37,7 +38,7 @@ * * @author Fei Yang */ -public interface IAuthenticationMethodDAO { +public interface IAuthenticationMethodDAO extends IBaseDAO{ /** * Gets a list of all the authenticationMethods. @@ -68,33 +69,6 @@ public AuthenticationMethod getAuthenticationMethodByUser(User user); /** - * Saves the authenticationMethod - * @param authenticationMethod the object to be saved - * @return AuthenticationMethod the saved authenticationMethod object - */ - public void saveAuthenticationMethod(AuthenticationMethod authenticationMethod); - - /** - * Updates the authenticationMethod - * @param authenticationMethod the object to be updated - * @return AuthenticationMethod the updated authenticationMethod object - */ - public void updateAuthenticationMethod(AuthenticationMethod authenticationMethod); - - /** - * Saves or updates the authenticationMethod - * @param authenticationMethod the object to be saved or updated - * @return AuthenticationMethod the saved or updated authenticationMethod object - */ - public void saveOrUpdateAuthenticationMethod(AuthenticationMethod authenticationMethod); - - /** - * Deletes a authenticationMethod from the database - * @param authenticationMethod the authenticationMethod to be deleted - */ - public void deleteAuthenticationMethod(AuthenticationMethod authenticationMethod); - - /** * Deletes a authenticationMethod from the database by id * @param authenticationMethodId the authenticationMethod's authenticationMethodId */ Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IAuthenticationMethodTypeDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IAuthenticationMethodTypeDAO.java (.../IAuthenticationMethodTypeDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IAuthenticationMethodTypeDAO.java (.../IAuthenticationMethodTypeDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,6 +25,7 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.usermanagement.AuthenticationMethodType; /** @@ -36,7 +37,7 @@ * * @author Fei Yang */ -public interface IAuthenticationMethodTypeDAO { +public interface IAuthenticationMethodTypeDAO extends IBaseDAO { /** * Gets a list of all the authenticationMethodTypes. @@ -53,33 +54,6 @@ public AuthenticationMethodType getAuthenticationMethodTypeById(Integer authenticationMethodTypeId); /** - * Saves the authenticationMethodType - * @param authenticationMethodType the object to be saved - * @return AuthenticationMethodType the saved authenticationMethodType object - */ - public void saveAuthenticationMethodType(AuthenticationMethodType authenticationMethodType); - - /** - * Updates the authenticationMethodType - * @param authenticationMethodType the object to be updated - * @return AuthenticationMethodType the updated authenticationMethodType object - */ - public void updateAuthenticationMethodType(AuthenticationMethodType authenticationMethodType); - - /** - * Saves or updates the authenticationMethodType - * @param authenticationMethodType the object to be saved or updated - * @return AuthenticationMethodType the saved or updated authenticationMethodType object - */ - public void saveOrUpdateAuthenticationMethodType(AuthenticationMethodType authenticationMethodType); - - /** - * Deletes a authenticationMethodType from the database - * @param authenticationMethodType the authenticationMethodType to be deleted - */ - public void deleteAuthenticationMethodType(AuthenticationMethodType authenticationMethodType); - - /** * Deletes a authenticationMethodType from the database by id * @param authenticationMethodTypeId the authenticationMethodType's authenticationMethodTypeId */ Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java (.../IOrganisationDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java (.../IOrganisationDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,6 +25,7 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.usermanagement.Organisation; /** @@ -36,7 +37,7 @@ * * @author Fei Yang */ -public interface IOrganisationDAO { +public interface IOrganisationDAO extends IBaseDAO{ /** * Gets a list of all the organisations. @@ -68,33 +69,6 @@ public List getChildOrganisations(Organisation parentOrg); /** - * Saves the organisation - * @param organisation the object to be saved - * @return Organisation the saved organisation object - */ - public void saveOrganisation(Organisation organisation); - - /** - * Updates the organisation - * @param organisation the object to be updated - * @return Organisation the updated organisation object - */ - public void updateOrganisation(Organisation organisation); - - /** - * Saves or updates the organisation - * @param organisation the object to be saved or updated - * @return Organisation the saved or updated organisation object - */ - public void saveOrUpdateOrganisation(Organisation organisation); - - /** - * Deletes a organisation from the database - * @param organisation the organisation to be deleted - */ - public void deleteOrganisation(Organisation organisation); - - /** * Deletes a organisation from the database by id * @param organisationId the organisation's organisationId */ Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationStateDAO.java =================================================================== diff -u -r276ae3bb84c57a0e845de85e3cc43df6a29cf848 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationStateDAO.java (.../IOrganisationStateDAO.java) (revision 276ae3bb84c57a0e845de85e3cc43df6a29cf848) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationStateDAO.java (.../IOrganisationStateDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -24,6 +24,7 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.usermanagement.OrganisationState; /** @@ -37,7 +38,7 @@ * * Created at 11:01:56 on 2006-6-2 */ -public interface IOrganisationStateDAO { +public interface IOrganisationStateDAO extends IBaseDAO{ /** * Gets a list of all the organisationStates. @@ -61,33 +62,6 @@ public OrganisationState getOrganisationStateByName(String name); /** - * Saves the organisationState - * @param organisationState the object to be saved - * @return OrganisationState the saved organisationState object - */ - public void saveOrganisationState(OrganisationState organisationState); - - /** - * Updates the organisationState - * @param organisationState the object to be updated - * @return OrganisationState the updated organisationState object - */ - public void updateOrganisationState(OrganisationState organisationState); - - /** - * Saves or updates the organisationState - * @param organisationState the object to be saved or updated - * @return OrganisationState the saved or updated organisationState object - */ - public void saveOrUpdateOrganisationState(OrganisationState organisationState); - - /** - * Deletes a organisationState from the database - * @param organisationState the organisationState to be deleted - */ - public void deleteOrganisationState(OrganisationState organisationState); - - /** * Deletes a organisationState from the database by id * @param organisationStateId the organisationState's organisationStateId */ Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationTypeDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationTypeDAO.java (.../IOrganisationTypeDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationTypeDAO.java (.../IOrganisationTypeDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,6 +25,7 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.usermanagement.OrganisationType; /** @@ -36,7 +37,7 @@ * * @author Fei Yang */ -public interface IOrganisationTypeDAO { +public interface IOrganisationTypeDAO extends IBaseDAO{ /** * Gets a list of all the organisationTypes. @@ -60,33 +61,6 @@ public OrganisationType getOrganisationTypeByName(String name); /** - * Saves the organisationType - * @param organisationType the object to be saved - * @return OrganisationType the saved organisationType object - */ - public void saveOrganisationType(OrganisationType organisationType); - - /** - * Updates the organisationType - * @param organisationType the object to be updated - * @return OrganisationType the updated organisationType object - */ - public void updateOrganisationType(OrganisationType organisationType); - - /** - * Saves or updates the organisationType - * @param organisationType the object to be saved or updated - * @return OrganisationType the saved or updated organisationType object - */ - public void saveOrUpdateOrganisationType(OrganisationType organisationType); - - /** - * Deletes a organisationType from the database - * @param organisationType the organisationType to be deleted - */ - public void deleteOrganisationType(OrganisationType organisationType); - - /** * Deletes a organisationType from the database by id * @param organisationTypeId the organisationType's organisationTypeId */ Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IRoleDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IRoleDAO.java (.../IRoleDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IRoleDAO.java (.../IRoleDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,6 +25,7 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.usermanagement.Role; /** @@ -36,7 +37,7 @@ * * @author Fei Yang */ -public interface IRoleDAO { +public interface IRoleDAO extends IBaseDAO { /** * Gets a list of all the roles. @@ -60,33 +61,6 @@ public Role getRoleByName(String name); /** - * Saves the role - * @param role the object to be saved - * @return Role the saved role object - */ - public void saveRole(Role role); - - /** - * Updates the role - * @param role the object to be updated - * @return Role the updated role object - */ - public void updateRole(Role role); - - /** - * Saves or updates the role - * @param role the object to be saved or updated - * @return Role the saved or updated role object - */ - public void saveOrUpdateRole(Role role); - - /** - * Deletes a role from the database - * @param role the role to be deleted - */ - public void deleteRole(Role role); - - /** * Deletes a role from the database by id * @param roleId the role's roleId */ Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserDAO.java (.../IUserDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserDAO.java (.../IUserDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,6 +25,7 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.Workspace; import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; @@ -38,7 +39,7 @@ * * @author Fei Yang */ -public interface IUserDAO { +public interface IUserDAO extends IBaseDAO { /** @@ -134,33 +135,6 @@ public List getUsersByAuthenticationMethod(AuthenticationMethod authenticationMethod); /** - * Saves the user - * @param user the object to be saved - * @return User the saved user object - */ - public void saveUser(User user); - - /** - * Updates the user - * @param user the object to be updated - * @return User the updated user object - */ - public void updateUser(User user); - - /** - * Saves or updates the user - * @param user the object to be saved or updated - * @return User the saved or updated user object - */ - public void saveOrUpdateUser(User user); - - /** - * Deletes a user from the database - * @param user the user to be deleted - */ - public void deleteUser(User user); - - /** * Deletes a user from the database by id * @param userId the user's userId */ Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationDAO.java =================================================================== diff -u -rcea798b3457c895676bf1cc5ebb3013eee53f505 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationDAO.java (.../IUserOrganisationDAO.java) (revision cea798b3457c895676bf1cc5ebb3013eee53f505) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationDAO.java (.../IUserOrganisationDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,6 +25,7 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.usermanagement.UserOrganisation; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.Organisation; @@ -38,7 +39,7 @@ * * @author Fei Yang */ -public interface IUserOrganisationDAO { +public interface IUserOrganisationDAO extends IBaseDAO{ /** * Gets a list of all the userOrganisations. * @@ -91,33 +92,6 @@ public List getUserOrganisationsByOrganisationId(Integer organisationId); /** - * Saves the userOrganisation - * @param userOrganisation the object to be saved - * @return UserOrganisation the saved userOrganisation object - */ - public void saveUserOrganisation(UserOrganisation userOrganisation); - - /** - * Updates the userOrganisation - * @param userOrganisation the object to be updated - * @return UserOrganisation the updated userOrganisation object - */ - public void updateUserOrganisation(UserOrganisation userOrganisation); - - /** - * Saves or updates the userOrganisation - * @param userOrganisation the object to be saved or updated - * @return UserOrganisation the saved or updated userOrganisation object - */ - public void saveOrUpdateUserOrganisation(UserOrganisation userOrganisation); - - /** - * Deletes a userOrganisation from the database - * @param userOrganisation the userOrganisation to be deleted - */ - public void deleteUserOrganisation(UserOrganisation userOrganisation); - - /** * Deletes a userOrganisation from the database by id * @param userOrganisationId the userOrganisation's userOrganisationId */ Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationRoleDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationRoleDAO.java (.../IUserOrganisationRoleDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationRoleDAO.java (.../IUserOrganisationRoleDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -24,6 +24,8 @@ package org.lamsfoundation.lams.usermanagement.dao; import java.util.List; + +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; /** @@ -33,7 +35,7 @@ * * @author Fei Yang */ -public interface IUserOrganisationRoleDAO { +public interface IUserOrganisationRoleDAO extends IBaseDAO{ /** * Gets userOrganisationRole object based on userOrganisationRoleId. @@ -58,33 +60,6 @@ public List getUserOrganisationRoles(Integer userOrganisationId); /** - * Saves the userOrganisationRole - * @param userOrganisationRole the object to be saved - * @return UserOrganisationRole the saved userOrganisationRole object - */ - public void saveUserOrganisationRole(UserOrganisationRole userOrganisationRole); - - /** - * Updates the userOrganisationRole - * @param userOrganisationRole the object to be updated - * @return UserOrganisationRole the updated userOrganisationRole object - */ - public void updateUserOrganisationRole(UserOrganisationRole userOrganisationRole); - - /** - * Saves or updates the userOrganisationRole - * @param userOrganisationRole the object to be saved or updated - * @return UserOrganisationRole the saved or updated userOrganisationRole object - */ - public void saveOrUpdateUserOrganisationRole(UserOrganisationRole userOrganisationRole); - - /** - * Deletes a userOrganisationRole from the database - * @param userOrganisationRole the userOrganisationRole to be deleted - */ - public void deleteUserOrganisationRole(UserOrganisationRole userOrganisationRole); - - /** * Deletes a userOrganisationRole from the database by id * @param userOrganisationRoleId the userOrganisationRole's userOrganisationRoleId */ Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/AuthenticationMethodDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/AuthenticationMethodDAO.java (.../AuthenticationMethodDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/AuthenticationMethodDAO.java (.../AuthenticationMethodDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,8 +25,7 @@ import java.util.List; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodDAO; @@ -41,7 +40,7 @@ * * @author Fei Yang */ -public class AuthenticationMethodDAO extends HibernateDaoSupport +public class AuthenticationMethodDAO extends BaseDAO implements IAuthenticationMethodDAO { /** @@ -77,38 +76,10 @@ } /** - * @see org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodDAO#saveAuthenticationMethod(org.lamsfoundation.lams.usermanagement.AuthenticationMethod) - */ - public void saveAuthenticationMethod(AuthenticationMethod authenticationMethod) { - getHibernateTemplate().save(authenticationMethod); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodDAO#updateAuthenticationMethod(org.lamsfoundation.lams.usermanagement.AuthenticationMethod) - */ - public void updateAuthenticationMethod(AuthenticationMethod authenticationMethod) { - getHibernateTemplate().update(authenticationMethod); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodDAO#saveOrUpdateAuthenticationMethod(org.lamsfoundation.lams.usermanagement.AuthenticationMethod) - */ - public void saveOrUpdateAuthenticationMethod(AuthenticationMethod authenticationMethod) { - getHibernateTemplate().saveOrUpdate(authenticationMethod); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodDAO#deleteAuthenticationMethod(org.lamsfoundation.lams.usermanagement.AuthenticationMethod) - */ - public void deleteAuthenticationMethod(AuthenticationMethod authenticationMethod) { - getHibernateTemplate().delete(authenticationMethod); - } - - /** * @see org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodDAO#deleteAuthenticationMethodById(java.lang.Integer) */ public void deleteAuthenticationMethodById(Integer authenticationMethodId) { - getHibernateTemplate().delete(getAuthenticationMethodById(authenticationMethodId)); + delete(getAuthenticationMethodById(authenticationMethodId)); } } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/AuthenticationMethodTypeDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/AuthenticationMethodTypeDAO.java (.../AuthenticationMethodTypeDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/AuthenticationMethodTypeDAO.java (.../AuthenticationMethodTypeDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,7 +25,7 @@ import java.util.List; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.usermanagement.AuthenticationMethodType; import org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodTypeDAO; @@ -39,7 +39,7 @@ * * @author Fei Yang */ -public class AuthenticationMethodTypeDAO extends HibernateDaoSupport +public class AuthenticationMethodTypeDAO extends BaseDAO implements IAuthenticationMethodTypeDAO { /** @@ -57,38 +57,10 @@ } /** - * @see org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodTypeDAO#saveAuthenticationMethodType(org.lamsfoundation.lams.usermanagement.AuthenticationMethodType) - */ - public void saveAuthenticationMethodType(AuthenticationMethodType authenticationMethodType) { - getHibernateTemplate().save(authenticationMethodType); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodTypeDAO#updateAuthenticationMethodType(org.lamsfoundation.lams.usermanagement.AuthenticationMethodType) - */ - public void updateAuthenticationMethodType(AuthenticationMethodType authenticationMethodType) { - getHibernateTemplate().update(authenticationMethodType); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodTypeDAO#saveOrUpdateAuthenticationMethodType(org.lamsfoundation.lams.usermanagement.AuthenticationMethodType) - */ - public void saveOrUpdateAuthenticationMethodType(AuthenticationMethodType authenticationMethodType) { - getHibernateTemplate().saveOrUpdate(authenticationMethodType); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodTypeDAO#deleteAuthenticationMethodType(org.lamsfoundation.lams.usermanagement.AuthenticationMethodType) - */ - public void deleteAuthenticationMethodType(AuthenticationMethodType authenticationMethodType) { - getHibernateTemplate().delete(authenticationMethodType); - } - - /** * @see org.lamsfoundation.lams.usermanagement.dao.IAuthenticationMethodTypeDAO#deleteAuthenticationMethodTypeById(java.lang.Integer) */ public void deleteAuthenticationMethodTypeById(Integer authenticationMethodTypeId) { - getHibernateTemplate().delete(getAuthenticationMethodTypeById(authenticationMethodTypeId)); + delete(getAuthenticationMethodTypeById(authenticationMethodTypeId)); } } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -26,7 +26,7 @@ import java.util.List; import java.util.Iterator; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO; import org.lamsfoundation.lams.usermanagement.Organisation; @@ -41,7 +41,7 @@ * * @author Fei Yang */ -public class OrganisationDAO extends HibernateDaoSupport implements +public class OrganisationDAO extends BaseDAO implements IOrganisationDAO { private static final String TABLENAME ="lams_organisation"; @@ -80,30 +80,9 @@ } /** - * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO#saveOrganisation(org.lamsfoundation.lams.usermanagement.Organisation) - */ - public void saveOrganisation(Organisation organisation) { - getHibernateTemplate().save(organisation); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO#updateOrganisation(org.lamsfoundation.lams.usermanagement.Organisation) - */ - public void updateOrganisation(Organisation organisation) { - getHibernateTemplate().update(organisation); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO#saveOrUpdateOrganisation(org.lamsfoundation.lams.usermanagement.Organisation) - */ - public void saveOrUpdateOrganisation(Organisation organisation) { - getHibernateTemplate().saveOrUpdate(organisation); - } - - /** * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO#deleteOrganisation(org.lamsfoundation.lams.usermanagement.Organisation) */ - public void deleteOrganisation(Organisation organisation) { + public void delete(Organisation organisation) { Iterator iter = organisation.getChildOrganisations().iterator(); Organisation parentOrganisation = organisation.getParentOrganisation(); while(iter.hasNext()){ @@ -118,7 +97,7 @@ * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO#deleteOrganisationById(java.lang.Integer) */ public void deleteOrganisationById(Integer organisationId) { - deleteOrganisation(getOrganisationById(organisationId)); + delete(getOrganisationById(organisationId)); } public Organisation getOrganisationByWorkspaceID(Integer workspaceID){ List list = getHibernateTemplate().find(FIND_BY_WORKSPACE,workspaceID); Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationStateDAO.java =================================================================== diff -u -r1411ef875c92ba912ad7b2e3c34e72c0a460ff74 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationStateDAO.java (.../OrganisationStateDAO.java) (revision 1411ef875c92ba912ad7b2e3c34e72c0a460ff74) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationStateDAO.java (.../OrganisationStateDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,9 +25,8 @@ import java.util.List; import org.lamsfoundation.lams.usermanagement.OrganisationState; -import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.dao.IOrganisationStateDAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; /** * @version @@ -40,7 +39,7 @@ * * Created at 11:30:40 on 2006-6-2 */ -public class OrganisationStateDAO extends HibernateDaoSupport implements +public class OrganisationStateDAO extends BaseDAO implements IOrganisationStateDAO { /* (non-Javadoc) @@ -72,46 +71,17 @@ } /* (non-Javadoc) - * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationStateDAO#saveOrganisationState(org.lamsfoundation.lams.usermanagement.OrganisationState) - */ - public void saveOrganisationState(OrganisationState organisationState) { - getHibernateTemplate().save(organisationState); - } - - /* (non-Javadoc) - * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationStateDAO#updateOrganisationState(org.lamsfoundation.lams.usermanagement.OrganisationState) - */ - public void updateOrganisationState(OrganisationState organisationState) { - getHibernateTemplate().update(organisationState); - } - - /* (non-Javadoc) - * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationStateDAO#saveOrUpdateOrganisationState(org.lamsfoundation.lams.usermanagement.OrganisationState) - */ - public void saveOrUpdateOrganisationState( - OrganisationState organisationState) { - getHibernateTemplate().saveOrUpdate(organisationState); - } - - /* (non-Javadoc) - * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationStateDAO#deleteOrganisationState(org.lamsfoundation.lams.usermanagement.OrganisationState) - */ - public void deleteOrganisationState(OrganisationState organisationState) { - getHibernateTemplate().delete(organisationState); - } - - /* (non-Javadoc) * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationStateDAO#deleteOrganisationStateById(java.lang.Integer) */ public void deleteOrganisationStateById(Integer organisationStateId) { - getHibernateTemplate().delete(getOrganisationStateById(organisationStateId)); + delete(getOrganisationStateById(organisationStateId)); } /* (non-Javadoc) * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationStateDAO#deleteOrganisationStateByName(java.lang.String) */ public void deleteOrganisationStateByName(String name) { - getHibernateTemplate().delete(getOrganisationStateByName(name)); + delete(getOrganisationStateByName(name)); } } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAO.java (.../OrganisationTypeDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAO.java (.../OrganisationTypeDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,7 +25,7 @@ import java.util.List; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.dao.IOrganisationTypeDAO; @@ -39,7 +39,7 @@ * * @author Fei Yang */ -public class OrganisationTypeDAO extends HibernateDaoSupport implements +public class OrganisationTypeDAO extends BaseDAO implements IOrganisationTypeDAO { /** @@ -70,34 +70,6 @@ } /** - * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationTypeDAO#saveOrganisationType(org.lamsfoundation.lams.usermanagement.OrganisationType) - */ - public void saveOrganisationType(OrganisationType organisationType) { - getHibernateTemplate().save(organisationType); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationTypeDAO#updateOrganisationType(org.lamsfoundation.lams.usermanagement.OrganisationType) - */ - public void updateOrganisationType(OrganisationType organisationType) { - getHibernateTemplate().update(organisationType); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationTypeDAO#saveOrUpdateOrganisationType(org.lamsfoundation.lams.usermanagement.OrganisationType) - */ - public void saveOrUpdateOrganisationType(OrganisationType organisationType) { - getHibernateTemplate().saveOrUpdate(organisationType); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationTypeDAO#deleteOrganisationType(org.lamsfoundation.lams.usermanagement.OrganisationType) - */ - public void deleteOrganisationType(OrganisationType organisationType) { - getHibernateTemplate().delete(organisationType); - } - - /** * @see org.lamsfoundation.lams.usermanagement.dao.IOrganisationTypeDAO#deleteOrganisationTypeById(java.lang.Integer) */ public void deleteOrganisationTypeById(Integer organisationTypeId) { Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java (.../RoleDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java (.../RoleDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,7 +25,7 @@ import java.util.List; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.usermanagement.dao.IRoleDAO; import org.lamsfoundation.lams.usermanagement.Role; @@ -37,7 +37,7 @@ * * @author Fei Yang */ -public class RoleDAO extends HibernateDaoSupport implements IRoleDAO { +public class RoleDAO extends BaseDAO implements IRoleDAO { /** * @see org.lamsfoundation.lams.usermanagement.dao.IRoleDAO#getAllRoles() @@ -67,45 +67,17 @@ } /** - * @see org.lamsfoundation.lams.usermanagement.dao.IRoleDAO#saveRole(org.lamsfoundation.lams.usermanagement.Role) - */ - public void saveRole(Role role) { - getHibernateTemplate().save(role); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IRoleDAO#updateRole(org.lamsfoundation.lams.usermanagement.Role) - */ - public void updateRole(Role role) { - getHibernateTemplate().update(role); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IRoleDAO#saveOrUpdateRole(org.lamsfoundation.lams.usermanagement.Role) - */ - public void saveOrUpdateRole(Role role) { - getHibernateTemplate().saveOrUpdate(role); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IRoleDAO#deleteRole(org.lamsfoundation.lams.usermanagement.Role) - */ - public void deleteRole(Role role) { - getHibernateTemplate().delete(role); - } - - /** * @see org.lamsfoundation.lams.usermanagement.dao.IRoleDAO#deleteRoleById(java.lang.Integer) */ public void deleteRoleById(Integer roleId) { - deleteRole(getRoleById(roleId)); + delete(getRoleById(roleId)); } /** * @see org.lamsfoundation.lams.usermanagement.dao.IRoleDAO#deleteRoleByName(java.lang.String) */ public void deleteRoleByName(String name) { - deleteRole(getRoleByName(name)); + delete(getRoleByName(name)); } } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java (.../UserDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java (.../UserDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,7 +25,7 @@ import java.util.List; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.usermanagement.dao.IUserDAO; import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; @@ -42,7 +42,7 @@ * * @author Fei Yang */ -public class UserDAO extends HibernateDaoSupport implements IUserDAO { +public class UserDAO extends BaseDAO implements IUserDAO { /** * @see org.lamsfoundation.lams.usermanagement.dao.IUserDAO#getAllUsers() @@ -153,45 +153,17 @@ } /** - * @see org.lamsfoundation.lams.usermanagement.dao.IUserDAO#saveUser(org.lamsfoundation.lams.usermanagement.User) - */ - public void saveUser(User user) { - getHibernateTemplate().save(user); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IUserDAO#updateUser(org.lamsfoundation.lams.usermanagement.User) - */ - public void updateUser(User user) { - getHibernateTemplate().update(user); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IUserDAO#saveOrUpdateUser(org.lamsfoundation.lams.usermanagement.User) - */ - public void saveOrUpdateUser(User user) { - getHibernateTemplate().saveOrUpdate(user); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IUserDAO#deleteUser(org.lamsfoundation.lams.usermanagement.User) - */ - public void deleteUser(User user) { - getHibernateTemplate().delete(user); - } - - /** * @see org.lamsfoundation.lams.usermanagement.dao.IUserDAO#deleteUserById(java.lang.Integer) */ public void deleteUserById(Integer userId) { - getHibernateTemplate().delete(getUserById(userId)); + delete(getUserById(userId)); } /** * @see org.lamsfoundation.lams.usermanagement.dao.IUserDAO#deleteUserByLogin(java.lang.String) */ public void deleteUserByLogin(String login) { - getHibernateTemplate().delete(getUserByLogin(login)); + delete(getUserByLogin(login)); } /** @@ -200,7 +172,7 @@ public void updatePassword(String login, String newPassword){ User user = getUserByLogin(login); user.setPassword(newPassword); - updateUser(user); + update(user); } } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java =================================================================== diff -u -rcea798b3457c895676bf1cc5ebb3013eee53f505 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java (.../UserOrganisationDAO.java) (revision cea798b3457c895676bf1cc5ebb3013eee53f505) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java (.../UserOrganisationDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,7 +25,7 @@ import java.util.List; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.User; @@ -41,7 +41,7 @@ * * @author Fei Yang */ -public class UserOrganisationDAO extends HibernateDaoSupport implements +public class UserOrganisationDAO extends BaseDAO implements IUserOrganisationDAO { /** @@ -107,38 +107,10 @@ } /** - * @see org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationDAO#saveUserOrganisation(org.lamsfoundation.lams.usermanagement.UserOrganisation) - */ - public void saveUserOrganisation(UserOrganisation userOrganisation) { - getHibernateTemplate().save(userOrganisation); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationDAO#updateUserOrganisation(org.lamsfoundation.lams.usermanagement.UserOrganisation) - */ - public void updateUserOrganisation(UserOrganisation userOrganisation) { - getHibernateTemplate().update(userOrganisation); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationDAO#saveOrUpdateUserOrganisation(org.lamsfoundation.lams.usermanagement.UserOrganisation) - */ - public void saveOrUpdateUserOrganisation(UserOrganisation userOrganisation) { - getHibernateTemplate().saveOrUpdate(userOrganisation); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationDAO#deleteUserOrganisation(org.lamsfoundation.lams.usermanagement.UserOrganisation) - */ - public void deleteUserOrganisation(UserOrganisation userOrganisation) { - getHibernateTemplate().delete(userOrganisation); - } - - /** * @see org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationDAO#deleteUserOrganisationById(java.lang.Integer) */ public void deleteUserOrganisationById(Integer userOrganisationId) { - getHibernateTemplate().delete(getUserOrganisationById(userOrganisationId)); + delete(getUserOrganisationById(userOrganisationId)); } } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationRoleDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationRoleDAO.java (.../UserOrganisationRoleDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationRoleDAO.java (.../UserOrganisationRoleDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -25,7 +25,7 @@ import java.util.List; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; import org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationRoleDAO; @@ -37,7 +37,7 @@ * * @author Fei Yang */ -public class UserOrganisationRoleDAO extends HibernateDaoSupport implements +public class UserOrganisationRoleDAO extends BaseDAO implements IUserOrganisationRoleDAO { /** @@ -72,38 +72,10 @@ } /** - * @see org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationRoleDAO#saveUserOrganisationRole(org.lamsfoundation.lams.usermanagement.UserOrganisationRole) - */ - public void saveUserOrganisationRole(UserOrganisationRole userOrganisationRole) { - getHibernateTemplate().save(userOrganisationRole); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationRoleDAO#updateUserOrganisationRole(org.lamsfoundation.lams.usermanagement.UserOrganisationRole) - */ - public void updateUserOrganisationRole(UserOrganisationRole userOrganisationRole) { - getHibernateTemplate().update(userOrganisationRole); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationRoleDAO#saveOrUpdateUserOrganisationRole(org.lamsfoundation.lams.usermanagement.UserOrganisationRole) - */ - public void saveOrUpdateUserOrganisationRole(UserOrganisationRole userOrganisationRole) { - getHibernateTemplate().saveOrUpdate(userOrganisationRole); - } - - /** - * @see org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationRoleDAO#deleteUserOrganisationRole(org.lamsfoundation.lams.usermanagement.UserOrganisationRole) - */ - public void deleteUserOrganisationRole(UserOrganisationRole userOrganisationRole) { - getHibernateTemplate().delete(userOrganisationRole); - } - - /** * @see org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationRoleDAO#deleteUserOrganisationRoleById(java.lang.Integer) */ public void deleteUserOrganisationRoleById(Integer userOrganisationRoleId) { - getHibernateTemplate().delete(getUserOrganisationRoleById(userOrganisationRoleId)); + delete(getUserOrganisationRoleById(userOrganisationRoleId)); } } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -r8c74eb1d41455f08644a9cc637bbea499587c7ab -r9ee21b9038a403027299fd2d3121ad638d1c28b1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 8c74eb1d41455f08644a9cc637bbea499587c7ab) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) @@ -447,22 +447,22 @@ * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#createUser(org.lamsfoundation.lams.usermanagement.User) */ public void createUser(User user) { - userDAO.saveUser(user); + userDAO.insert(user); } /** * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#updateUser(org.lamsfoundation.lams.usermanagement.User) */ public void updateUser(User user) { - userDAO.updateUser(user); + userDAO.update(user); clearUserFromCache(user); } /** - * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#saveOrUpdateUser(org.lamsfoundation.lams.usermanagement.User) + * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#saveOrupdate(org.lamsfoundation.lams.usermanagement.User) */ public void saveOrUpdateUser(User user) { - userDAO.saveOrUpdateUser(user); + userDAO.insertOrUpdate(user); clearUserFromCache(user); } @@ -477,30 +477,29 @@ * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#removeUserOrganisation(org.lamsfoundation.lams.usermanagement.UserOrganisation) */ public void removeUserOrganisation(UserOrganisation userOrganisation) { - userOrganisationDAO.deleteUserOrganisation(userOrganisation); + userOrganisationDAO.delete(userOrganisation); } /** * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#saveOrUpdateOrganisation(org.lamsfoundation.lams.usermanagement.Organisation) */ public void saveOrUpdateOrganisation(Organisation organisation) { - organisationDAO.saveOrUpdateOrganisation(organisation); + organisationDAO.insertOrUpdate(organisation); } /** - * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#saveOrUpdateUserOrganisation(org.lamsfoundation.lams.usermanagement.UserOrganisation) + * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#saveOrUpdateOrganisation(org.lamsfoundation.lams.usermanagement.UserOrganisation) */ public void saveOrUpdateUserOrganisation(UserOrganisation userOrganisation) { - userOrganisationDAO.saveOrUpdateUserOrganisation(userOrganisation); + userOrganisationDAO.insertOrUpdate(userOrganisation); } /** - * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#saveOrUpdateUserOrganisationRole(org.lamsfoundation.lams.usermanagement.UserOrganisationRole) + * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#saveOrUpdateOrganisationRole(org.lamsfoundation.lams.usermanagement.UserOrganisationRole) */ public void saveOrUpdateUserOrganisationRole( UserOrganisationRole userOrganisationRole) { - userOrganisationRoleDAO - .saveOrUpdateUserOrganisationRole(userOrganisationRole); + userOrganisationRoleDAO.insertOrUpdate(userOrganisationRole); } /** @@ -526,7 +525,7 @@ workspace.setRootFolder(workspaceFolder); workspaceDAO.update(workspace); organisation.setWorkspace(workspace); - organisationDAO.saveOrganisation(organisation); + organisationDAO.insert(organisation); return organisation.getOrganisationId(); } @@ -566,10 +565,10 @@ } /** - * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#saveUser(org.lamsfoundation.lams.usermanagement.User) + * @see org.lamsfoundation.lams.usermanagement.service.IUserManagementService#save(org.lamsfoundation.lams.usermanagement.User) */ public Integer saveUser(User user, Integer roleID) { - userDAO.saveUser(user); + userDAO.insert(user); createUserOrganisation(user, roleID); Workspace workspace = createWorkspace(user.getLogin()); WorkspaceFolder workspaceFolder = createWorkspaceFolder(workspace, user @@ -578,13 +577,13 @@ workspace.setRootFolder(workspaceFolder); workspaceDAO.update(workspace); user.setWorkspace(workspace); - userDAO.updateUser(user); + userDAO.update(user); return user.getUserId(); } /** * This is a utility method required by the above method - * saveUser. It adds a new record to the + * save. It adds a new record to the * underlying database table indicating the organisation * to which this user belongs * @@ -595,10 +594,10 @@ private Integer createUserOrganisation(User user, Integer roleID) { UserOrganisation userOrganisation = new UserOrganisation(); userOrganisation.setUser(user); - userOrganisationDAO.saveUserOrganisation(userOrganisation); + userOrganisationDAO.insert(userOrganisation); userOrganisation.addUserOrganisationRole(createUserOrganisationRole( userOrganisation, roleID)); - userOrganisationDAO.saveOrUpdateUserOrganisation(userOrganisation); + userOrganisationDAO.insertOrUpdate(userOrganisation); return userOrganisation.getUserOrganisationId(); } @@ -617,7 +616,7 @@ UserOrganisationRole userOrganisationRole = new UserOrganisationRole(); userOrganisationRole.setUserOrganisation(userOrganisation); userOrganisationRole.setRole(roleDAO.getRoleById(roleID)); - userOrganisationRoleDAO.saveUserOrganisationRole(userOrganisationRole); + userOrganisationRoleDAO.insert(userOrganisationRole); return userOrganisationRole; } /**