Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/shibboleth/SaveLessonFedServlet.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/federation/LessonFederation.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/federation/Attic/LessonFederation.java,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_common/src/java/org/lamsfoundation/lams/federation/LessonFederation.java 4 Jul 2007 06:10:24 -0000 1.1.2.2 +++ lams_common/src/java/org/lamsfoundation/lams/federation/LessonFederation.java 29 Aug 2007 03:32:01 -0000 1.1.2.3 @@ -48,6 +48,11 @@ this.lessonStateId = lessonStateId; } + public String toString() { + return "fedId: "+fedServer.getFedId() + +"orgId: "+org.getOrganisationId(); + } + /** * @hibernate.id * generator-class="native" 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.16 -r1.1.2.17 --- lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java 27 Aug 2007 05:46:07 -0000 1.1.2.16 +++ lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java 29 Aug 2007 03:32:01 -0000 1.1.2.17 @@ -499,4 +499,40 @@ } return message; } + + public String saveWDDXLessonFed(String packet) throws IOException, FederationException { + FlashMessage flashMessage; + try { + Hashtable table = (Hashtable)WDDXProcessor.deserialize(packet); + // lesson id + Long extLessonId = WDDXProcessor.convertToLong("extLessonId", table.get("extLessonId")); + String extLessonName = WDDXProcessor.convertToString("extLessonName", table.get("extLessonName")); + Integer fedId = WDDXProcessor.convertToInteger("fedId", table.get("fedId")); + Integer orgId = WDDXProcessor.convertToInteger("orgId", table.get("orgId")); + + FederationServer fedServer = getFedServerByFedId(fedId); + Organisation org = (Organisation)getService().findById(Organisation.class, orgId); + if (fedServer != null && org != null) { + LessonFederation lessonFed = new LessonFederation(fedServer, org, extLessonId, extLessonName, Lesson.STARTED_STATE); + log.debug("Saving LessonFederation: "+lessonFed); + getService().save(lessonFed); + } + + flashMessage = new FlashMessage("saveLessonFed", true); + } catch (WddxDeserializationException e) { + log.error("Couldn't interpret wddx packet: "+packet); + flashMessage = new FlashMessage("saveLessonFed", e.getMessage(), FlashMessage.ERROR); + } catch (Exception e) { + log.error("Couldn't save shared lessons.", e); + flashMessage = new FlashMessage("saveLessonFed", e.getMessage(), FlashMessage.ERROR); + } + + String message = "Failed on creating flash message: "+flashMessage; + try { + message = flashMessage.serializeMessage(); + } catch (IOException e) { + log.error(message); + } + return message; + } } 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.12 -r1.1.2.13 --- lams_common/src/java/org/lamsfoundation/lams/federation/service/IFederationService.java 27 Aug 2007 05:46:07 -0000 1.1.2.12 +++ lams_common/src/java/org/lamsfoundation/lams/federation/service/IFederationService.java 29 Aug 2007 03:32:01 -0000 1.1.2.13 @@ -140,4 +140,13 @@ * @throws FederationException */ public String saveWDDXFedLessons(String packet) throws IOException, FederationException; + + /** + * Saves a LessonFederation from posted Flash packet. + * @param packet + * @return + * @throws IOException + * @throws FederationException + */ + public String saveWDDXLessonFed(String packet) throws IOException, FederationException; }