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.20 -r1.1.2.21
--- lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java	29 Aug 2007 08:15:56 -0000	1.1.2.20
+++ lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java	30 Aug 2007 01:35:22 -0000	1.1.2.21
@@ -62,6 +62,14 @@
 		return service.findAll(FederationServer.class);
 	}
 	
+	public List<FederationLesson> getFederationLessons() {
+		return service.findAll(FederationLesson.class);
+	}
+	
+	public List<LessonFederation> getLessonFederations() {
+		return service.findAll(LessonFederation.class);
+	}
+	
 	public List<Organisation> getCoursesCanJoinSharedLessons() {
 		List<Organisation> orgs = service.findByProperty(Organisation.class, "canJoinJointLessons", true);
 		ArrayList<Organisation> courses = new ArrayList<Organisation>();
@@ -80,6 +88,10 @@
 		return service.findByProperties(FederationLesson.class, properties);
 	}
 	
+	public void saveFederationServer(FederationServer fedServer) {
+		service.save(fedServer);
+	}
+	
 	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);
@@ -440,7 +452,7 @@
 		try {
 			Hashtable table = (Hashtable)WDDXProcessor.deserialize(packet);
 			// lesson id 
-			Integer lessonId = WDDXProcessor.convertToInteger("lessonId", table.get("lessonId"));
+			Long lessonId = WDDXProcessor.convertToLong("lessonId", table.get("lessonId"));
 			log.debug("FederationLesson has lessonId: "+lessonId);
 			Lesson lesson = (Lesson)getService().findById(Lesson.class, lessonId);
 			// list of org ids and the fed ids they come from
@@ -452,11 +464,12 @@
 					if (ht != null) {
 						Integer fedId = WDDXProcessor.convertToInteger(ht, "fedId");
 						FederationServer fedServer = getFedServerByFedId(fedId);
-						Vector extOrgIdList = (Vector)table.get("extOrgIdList");
+						Vector extOrgIdList = (Vector)ht.get("extOrgIdList");
 						if (extOrgIdList != null) {
 							Iterator j = extOrgIdList.iterator();
 							while (j.hasNext()) {
-								Integer extOrgId = (Integer)j.next();
+								Integer extOrgId = WDDXProcessor.convertToInteger("extOrgIdList", j.next());
+								
 								log.debug("Saving FederationLesson with fedId: "+fedId+", extOrgId: "+extOrgId);
 								FederationLesson fedLesson = new FederationLesson(fedServer, extOrgId, lesson);
 								getService().save(fedLesson);
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.14 -r1.1.2.15
--- lams_common/src/java/org/lamsfoundation/lams/federation/service/IFederationService.java	29 Aug 2007 07:28:39 -0000	1.1.2.14
+++ lams_common/src/java/org/lamsfoundation/lams/federation/service/IFederationService.java	30 Aug 2007 01:35:22 -0000	1.1.2.15
@@ -10,6 +10,7 @@
 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;
@@ -28,7 +29,15 @@
 	public List<Organisation> getCoursesCanJoinSharedLessons();
 	
 	public List<FederationLesson> getSharedLessons(FederationServer fedServer, Integer extOrgId);
-		
+
+	public List<FederationServer> getFederationServers();
+	
+	public List<FederationLesson> getFederationLessons();
+	
+	public List<LessonFederation> getLessonFederations();
+	
+	public void saveFederationServer(FederationServer fedServer);
+	
 	/**
 	 * 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.