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.6 -r1.7 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java 18 Jun 2006 18:24:53 -0000 1.6 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java 19 Jun 2006 05:38:52 -0000 1.7 @@ -93,7 +93,7 @@ } String username = request.getRemoteUser(); OrgListDTO orgManageForm = new OrgListDTO(); - Organisation org = service.getOrganisationById(orgId); + Organisation org = (Organisation)service.findById(Organisation.class,orgId); log.debug("orgId:"+orgId); if(org==null){ errors.add("org",new ActionMessage("error.org.invalid")); @@ -117,7 +117,7 @@ }else{ type = OrganisationType.CLASS_TYPE; } - List organisations = service.getOrganisationsByType(type); + List organisations = service.findByProperty(Organisation.class,"organisationType.organisationTypeId",type); log.debug("user is sysadmin"); log.debug("Got "+organisations.size()+" organsiations"); log.debug("organisationType is "+type); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java,v diff -u -r1.4 -r1.5 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java 18 Jun 2006 18:24:53 -0000 1.4 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java 19 Jun 2006 05:38:52 -0000 1.5 @@ -101,11 +101,11 @@ Integer orgId = (Integer)orgForm.get("orgId"); Organisation org; if(orgId!=0){ - org = service.getOrganisationById(orgId); + org = (Organisation)service.findById(Organisation.class,orgId); }else{ org = new Organisation(); org.setCreateDate(new Date()); - org.setParentOrganisation(service.getOrganisationById((Integer)orgForm.get("parentId"))); + org.setParentOrganisation((Organisation)service.findById(Organisation.class,(Integer)orgForm.get("parentId"))); org.setOrganisationType((OrganisationType)service.findById(OrganisationType.class,(Integer)orgForm.get("typeId"))); } BeanUtils.copyProperties(org,orgForm); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java,v diff -u -r1.9 -r1.10 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java 18 Jun 2006 18:24:53 -0000 1.9 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java 19 Jun 2006 05:38:52 -0000 1.10 @@ -77,7 +77,7 @@ public ActionForward edit(ActionMapping mapping, ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Exception{ Integer orgId = WebUtil.readIntParam(request,"orgId",true); if(orgId != null){//editing existing organisation - Organisation org = service.getOrganisationById(orgId); + Organisation org = (Organisation)service.findById(Organisation.class,orgId); DynaActionForm orgForm = (DynaActionForm)form; BeanUtils.copyProperties(orgForm,org); log.debug("Struts Pupulated orgId:"+(Integer)orgForm.get("orgId")); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java,v diff -u -r1.7 -r1.8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java 18 Jun 2006 18:24:53 -0000 1.7 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java 19 Jun 2006 05:38:52 -0000 1.8 @@ -80,7 +80,7 @@ HttpServletResponse response) throws Exception { // retain orgId to return to userlist Integer orgId = WebUtil.readIntParam(request,"orgId"); - Organisation organisation = service.getOrganisationById(orgId); + Organisation organisation = (Organisation)service.findById(Organisation.class,orgId); Integer parentId = organisation.getParentOrganisation().getOrganisationId(); request.setAttribute("org",orgId); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java,v diff -u -r1.2 -r1.3 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java 16 Jun 2006 06:58:37 -0000 1.2 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java 19 Jun 2006 05:38:52 -0000 1.3 @@ -92,7 +92,7 @@ //String username = request.getRemoteUser(); // get org name - Organisation organisation = service.getOrganisationById(orgId); + Organisation organisation = (Organisation)service.findById(Organisation.class,orgId); if(organisation==null) { errors.add("org",new ActionMessage("error.org.invalid")); saveErrors(request,errors); 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.2 -r1.3 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java 18 Jun 2006 18:24:53 -0000 1.2 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java 19 Jun 2006 05:38:52 -0000 1.3 @@ -40,6 +40,7 @@ import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm; import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; +import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.UserOrganisation; @@ -162,7 +163,7 @@ log.debug(user.toString()); service.save(user); user = service.getUserByLogin((String)userForm.get("login")); - UserOrganisation userOrganisation = new UserOrganisation(user, service.getOrganisationById(orgId)); + UserOrganisation userOrganisation = new UserOrganisation(user, (Organisation)service.findById(Organisation.class,orgId)); service.save(userOrganisation); // set default role to learner Role role = (Role)service.findByProperty(Role.class,"name","LEARNER").get(0); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/Attic/DummyMonitoringAction.java,v diff -u -r1.24 -r1.25 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java 18 Jun 2006 18:17:35 -0000 1.24 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java 19 Jun 2006 05:41:27 -0000 1.25 @@ -168,7 +168,7 @@ throw new IOException("Learning design id must be set"); // hardcode to use the Playpen:Everybody class as the class, Playpen as the course - Organisation classOrganisation = usermanageService.getOrganisationById(everybodyClass); + Organisation classOrganisation = (Organisation)usermanageService.findById(Organisation.class,everybodyClass); if ( classOrganisation == null ) throw new IOException("Organisation cannot be found. Id was "+everybodyClass);