Index: lams_admin/src/java/org/lamsfoundation/lams/admin/util/ExcelUserImportFileParser.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/util/Attic/ExcelUserImportFileParser.java,v diff -u -r1.4 -r1.5 --- lams_admin/src/java/org/lamsfoundation/lams/admin/util/ExcelUserImportFileParser.java 11 May 2006 07:04:58 -0000 1.4 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/util/ExcelUserImportFileParser.java 18 Jun 2006 18:24:53 -0000 1.5 @@ -57,9 +57,13 @@ */ public class ExcelUserImportFileParser implements IUserImportFileParser{ - /* + public String parseUsersInOrganisation(FileItem fileItem, Organisation org, String adminLogin, boolean existingUsersOnly) throws IOException { + return null; + } + +/* * start of definition of property keys used in the excel file - */ + private static final short LOGIN = 0; private static final short PASSWORD = 1; private static final short AUTH_METHOD = 2; @@ -94,9 +98,9 @@ this.service = service; } - /** + *//** * @see org.lamsfoundation.lams.admin.util.IUserImportFileParser#parseUsersInOrganisation(FileItem fileItem, Organisation org, String adminLogin, boolean existingUsersOnly) - */ + *//* public String parseUsersInOrganisation(FileItem fileItem, Organisation org, String adminLogin, boolean existingUsersOnly) throws IOException{ String errorMessage = ""; POIFSFileSystem fs = new POIFSFileSystem(fileItem.getInputStream()); @@ -332,4 +336,4 @@ String status = parseStringCell(cell,row,-1); return new Boolean(STATUS_DISABLED.equals(status)); } -} +*/} Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java,v diff -u -r1.5 -r1.6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java 9 Jun 2006 02:39:37 -0000 1.5 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java 18 Jun 2006 18:24:53 -0000 1.6 @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -133,20 +134,21 @@ orgManageBeans.add(orgManageBean); } }else{ - List userOrganisations = service.getUserOrganisationsForUser(service.getUserByLogin(username)); + Set userOrganisations = service.getUserByLogin(username).getUserOrganisations(); if(userOrganisations!=null){ - for(int i=0; i roles = service.getRolesForUserByOrganisation(user, orgId); @@ -133,7 +135,7 @@ HttpServletResponse response) throws Exception { Integer userId = WebUtil.readIntParam(request,"userId",true); log.debug("removing userid: "+userId); - service.deleteUserById(userId); + service.deleteById(User.class,userId); Integer orgId = WebUtil.readIntParam(request,"orgId"); request.setAttribute("org",orgId); return mapping.findForward("userlist"); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java,v diff -u -r1.1 -r1.2 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java 16 Jun 2006 06:57:54 -0000 1.1 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java 18 Jun 2006 18:24:53 -0000 1.2 @@ -39,6 +39,7 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm; +import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.UserOrganisation; @@ -102,49 +103,49 @@ User user; if(userId!=0){ // edit user log.debug("editing userId: "+userId); - user = service.getUserById(userId); + user = (User)service.findById(User.class,userId); BeanUtils.copyProperties(user,userForm); - service.updateUser(user); + service.save(user); UserOrganisation userOrganisation = service.getUserOrganisation(userId, orgId); List roles = service.getRolesForUserByOrganisation(user, orgId); - Role currentRole = service.getRoleByName("LEARNER"); + Role currentRole = (Role)service.findByProperty(Role.class,"name","LEARNER").get(0); if(userForm.get("learner").equals("on") && roles.indexOf(currentRole)<0) { UserOrganisationRole userOrganisationRole = new UserOrganisationRole(userOrganisation, currentRole); - service.saveOrUpdateUserOrganisationRole(userOrganisationRole); + service.save(userOrganisationRole); } else if(userForm.get("learner").equals("off")){ //service.deleteUserOrganisationRole(); } - currentRole = service.getRoleByName("AUTHOR"); + currentRole = (Role)service.findByProperty(Role.class,"name","AUTHOR").get(0); if(userForm.get("author").equals("on") && roles.indexOf(currentRole)<0) { UserOrganisationRole userOrganisationRole = new UserOrganisationRole(userOrganisation, currentRole); - service.saveOrUpdateUserOrganisationRole(userOrganisationRole); + service.save(userOrganisationRole); } else if(userForm.get("learner").equals("off")) { //service.deleteUserOrganisationRole(); } - currentRole = service.getRoleByName("STAFF"); + currentRole = (Role)service.findByProperty(Role.class,"name","STAFF").get(0); if(userForm.get("staff").equals("on") && roles.indexOf(currentRole)<0) { UserOrganisationRole userOrganisationRole = new UserOrganisationRole(userOrganisation, currentRole); - service.saveOrUpdateUserOrganisationRole(userOrganisationRole); + service.save(userOrganisationRole); } else if(userForm.get("learner").equals("off")) { //service.deleteUserOrganisationRole(); } - currentRole = service.getRoleByName("COURSE ADMIN"); + currentRole = (Role)service.findByProperty(Role.class,"name","COURSE ADMIN").get(0); if(userForm.get("admin").equals("on") && roles.indexOf(currentRole)<0) { UserOrganisationRole userOrganisationRole = new UserOrganisationRole(userOrganisation, currentRole); - service.saveOrUpdateUserOrganisationRole(userOrganisationRole); + service.save(userOrganisationRole); } else if(userForm.get("learner").equals("off")) { //service.deleteUserOrganisationRole(); } - currentRole = service.getRoleByName("COURSE MANAGER"); + currentRole = (Role)service.findByProperty(Role.class,"name","COURSE MANAGER").get(0); if(userForm.get("manager").equals("on") && roles.indexOf(currentRole)<0) { UserOrganisationRole userOrganisationRole = new UserOrganisationRole(userOrganisation, currentRole); - service.saveOrUpdateUserOrganisationRole(userOrganisationRole); + service.save(userOrganisationRole); } else if(userForm.get("learner").equals("off")) { //service.deleteUserOrganisationRole(); } @@ -157,16 +158,16 @@ } user.setDisabledFlag(false); user.setCreateDate(new Date()); - user.setAuthenticationMethod(service.getAuthenticationMethodByName("LAMS-Database")); + user.setAuthenticationMethod((AuthenticationMethod)service.findByProperty(AuthenticationMethod.class,"name","LAMS-Database").get(0)); log.debug(user.toString()); - service.createUser(user); + service.save(user); user = service.getUserByLogin((String)userForm.get("login")); UserOrganisation userOrganisation = new UserOrganisation(user, service.getOrganisationById(orgId)); - service.saveOrUpdateUserOrganisation(userOrganisation); + service.save(userOrganisation); // set default role to learner - Role role = service.getRoleByName("LEARNER"); + Role role = (Role)service.findByProperty(Role.class,"name","LEARNER").get(0); UserOrganisationRole userOrganisationRole = new UserOrganisationRole(userOrganisation, role); - service.saveOrUpdateUserOrganisationRole(userOrganisationRole); + service.save(userOrganisationRole); } request.setAttribute("org",orgId); log.debug("orgId: "+orgId); Index: lams_admin/web/WEB-INF/struts/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/struts/Attic/struts-config.xml,v diff -u -r1.11 -r1.12 --- lams_admin/web/WEB-INF/struts/struts-config.xml 16 Jun 2006 06:57:54 -0000 1.11 +++ lams_admin/web/WEB-INF/struts/struts-config.xml 18 Jun 2006 18:24:53 -0000 1.12 @@ -62,16 +62,14 @@ - Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java,v diff -u -r1.17 -r1.18 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java 16 Jun 2006 07:25:29 -0000 1.17 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java 18 Jun 2006 18:24:14 -0000 1.18 @@ -57,6 +57,7 @@ import org.lamsfoundation.lams.contentrepository.NodeKey; import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ActivityOrderComparator; import org.lamsfoundation.lams.learningdesign.ChosenGrouping; @@ -93,7 +94,6 @@ import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; -import org.lamsfoundation.lams.usermanagement.dao.IWorkspaceFolderDAO; import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.FileUtilException; import org.lamsfoundation.lams.util.zipfile.ZipFileUtil; @@ -135,7 +135,7 @@ private IActivityDAO activityDAO; private IToolDAO toolDAO; private IToolContentDAO toolContentDAO; - private IWorkspaceFolderDAO workspaceFolderDAO; + private IBaseDAO baseDAO; private ILicenseDAO licenseDAO; private IGroupingDAO groupingDAO; private ITransitionDAO transitionDAO; @@ -454,7 +454,7 @@ // if workspaceFolderUid == null use the user's default folder WorkspaceFolder folder = null; if ( workspaceFolderUid != null ) { - folder = workspaceFolderDAO.getWorkspaceFolderByID(workspaceFolderUid); + folder = (WorkspaceFolder)baseDAO.find(WorkspaceFolder.class,workspaceFolderUid); } if ( folder == null && importer.getWorkspace() != null) { folder = importer.getWorkspace().getRootFolder(); @@ -976,6 +976,9 @@ public ILicenseDAO getLicenseDAO() { return licenseDAO; } + public void setBaseDAO(IBaseDAO baseDAO) { + this.baseDAO = baseDAO; + } public void setLicenseDAO(ILicenseDAO licenseDAO) { this.licenseDAO = licenseDAO; } @@ -997,13 +1000,6 @@ public void setTransitionDAO(ITransitionDAO transitionDAO) { this.transitionDAO = transitionDAO; } - public IWorkspaceFolderDAO getWorkspaceFolderDAO() { - return workspaceFolderDAO; - } - public void setWorkspaceFolderDAO(IWorkspaceFolderDAO workspaceFolderDAO) { - this.workspaceFolderDAO = workspaceFolderDAO; - } - private boolean isComplexActivity(Activity act) { return act.getActivityTypeId().intValue() == Activity.SEQUENCE_ACTIVITY_TYPE ||