Index: lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/federation/service/Attic/FederationService.java,v diff -u -r1.1.2.18 -r1.1.2.19 --- lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java 29 Aug 2007 06:40:48 -0000 1.1.2.18 +++ lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java 29 Aug 2007 07:28:39 -0000 1.1.2.19 @@ -62,14 +62,6 @@ return service.findAll(FederationServer.class); } - public List getFederationLessons() { - return service.findAll(FederationLesson.class); - } - - public List getLessonFederations() { - return service.findAll(LessonFederation.class); - } - public List getCoursesCanJoinSharedLessons() { List orgs = service.findByProperty(Organisation.class, "canJoinJointLessons", true); ArrayList courses = new ArrayList(); @@ -88,18 +80,6 @@ return service.findByProperties(FederationLesson.class, properties); } - public void saveFederationServer(FederationServer fedServer) { - service.save(fedServer); - } - - public void createFederationLesson(FederationServer fedServer, Integer extOrgId, Lesson lesson) { - service.save(new FederationLesson(fedServer, extOrgId, lesson)); - } - - public void createLessonFromFederation(FederationServer fedServer, Organisation org, Long extLessonId, String extLessonName, Integer lessonStateId) { - service.save(new LessonFederation(fedServer, org, extLessonId, extLessonName, lessonStateId)); - } - private FederationServer getFedServerByFedId(Integer fedId) throws FederationException { List list = service.findByProperty(FederationServer.class, "fedId", fedId); return (list == null || list.isEmpty()) ? null : (FederationServer)list.get(0); Index: lams_common/src/java/org/lamsfoundation/lams/federation/service/IFederationService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/federation/service/Attic/IFederationService.java,v diff -u -r1.1.2.13 -r1.1.2.14 --- lams_common/src/java/org/lamsfoundation/lams/federation/service/IFederationService.java 29 Aug 2007 03:32:01 -0000 1.1.2.13 +++ lams_common/src/java/org/lamsfoundation/lams/federation/service/IFederationService.java 29 Aug 2007 07:28:39 -0000 1.1.2.14 @@ -10,11 +10,9 @@ import org.lamsfoundation.lams.federation.FederationException; import org.lamsfoundation.lams.federation.FederationLesson; import org.lamsfoundation.lams.federation.FederationServer; -import org.lamsfoundation.lams.federation.LessonFederation; import org.lamsfoundation.lams.federation.dto.ExtLessonDTO; import org.lamsfoundation.lams.federation.dto.ExtOrgDTO; import org.lamsfoundation.lams.federation.dto.FedServerDTO; -import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.usermanagement.Organisation; /** @@ -27,36 +25,11 @@ public static String RESULTS_UPDATED = "updated"; public static String RESULTS_DELETED = "deleted"; - public List getFederationServers(); - - public List getFederationLessons(); - - public List getLessonFederations(); - public List getCoursesCanJoinSharedLessons(); public List getSharedLessons(FederationServer fedServer, Integer extOrgId); - - public void saveFederationServer(FederationServer fedServer); - + /** - * Used when local teacher has selected external group/s to share their lesson with. - * @param fedServer - * @param extOrgId - * @param lesson - */ - public void createFederationLesson(FederationServer fedServer, Integer extOrgId, Lesson lesson); - - /** - * Used when local teacher has started a joint lesson located on an external server. - * @param fedServer - * @param org - * @param extLessonId - * @param extLessonName - */ - public void createLessonFromFederation(FederationServer fedServer, Organisation org, Long extLessonId, String extLessonName, Integer lessonStateId); - - /** * Wrapper method to return WDDX packet string of getFedServerGroups. * WDDX request contains one field, the fedId of the federation server to get list of groups from. * @param fedId