Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationWDDXAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/Attic/FederationWDDXAction.java,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationWDDXAction.java 5 Jul 2007 01:48:40 -0000 1.1.2.2 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationWDDXAction.java 21 Aug 2007 00:20:54 -0000 1.1.2.3 @@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; @@ -33,6 +34,21 @@ HttpServletRequest request, HttpServletResponse response) throws Exception { + String method = WebUtil.readStrParam(request, "method"); + if (StringUtils.equals("getFedServerGroups", method)) { + return getFedServerGroups(mapping, form, request, response); + } else if (StringUtils.equals("getFedServerIds", method)) { + return getFedServerIds(mapping, form, request, response); + } + + return mapping.findForward("output"); + } + + public ActionForward getFedServerGroups(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws Exception { + IFederationService service = AdminServiceProxy.getFederationService(getServlet().getServletContext()); Integer fedId = WebUtil.readIntParam(request,"fedId",true); @@ -49,4 +65,23 @@ return mapping.findForward("output"); } + public ActionForward getFedServerIds(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws Exception { + + IFederationService service = AdminServiceProxy.getFederationService(getServlet().getServletContext()); + + FlashMessage flashMessage = new FlashMessage("getFedServerIds", service.getFedServerIds()); + String message = "Failed on creating flash message: "+flashMessage; + try { + message = flashMessage.serializeMessage(); + } catch (IOException e) { + log.error(message); + } + message = flashMessage.serializeMessage(); + request.setAttribute("wddx", message); + + return mapping.findForward("output"); + } } Index: lams_admin/web/federation/federation.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/federation/Attic/federation.jsp,v diff -u -r1.1.2.7 -r1.1.2.8 --- lams_admin/web/federation/federation.jsp 4 Jul 2007 06:10:23 -0000 1.1.2.7 +++ lams_admin/web/federation/federation.jsp 21 Aug 2007 00:20:54 -0000 1.1.2.8 @@ -31,6 +31,7 @@

" target="_blank">View XML from federation registry

Update servers

+

View WDDX getFedServerIds

@@ -50,7 +51,7 @@ - + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/GetFedServerIdsServlet.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/federation/dto/FedServerDTO.java'. Fisheye: No comparison available. Pass `N' to diff? 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.12 -r1.1.2.13 --- lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java 31 Jul 2007 02:13:33 -0000 1.1.2.12 +++ lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java 21 Aug 2007 00:20:54 -0000 1.1.2.13 @@ -22,6 +22,7 @@ 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; import org.lamsfoundation.lams.usermanagement.OrganisationType; @@ -402,6 +403,35 @@ } // return nothing rather than original username so there is no chance of accidental login // to another person's local account + log.error("Origin server "+originServerURL+" isn't listed as a fedServer, no User created for shib user "+username); return null; } + + public List getFedServerIds() { + List fedServers = getFederationServers(); + List fedServerIds = new ArrayList(); + for (FederationServer f : fedServers) { + fedServerIds.add(new FedServerDTO(f.getFedId(), f.getName())); + } + return fedServerIds; + } + + public String getWDDXFedServerIds() throws Exception { + FlashMessage flashMessage; + try { + flashMessage = new FlashMessage("getFedServerIds", getFedServerIds()); + } catch (Exception e) { + log.error("Couldn't get list of federation server ids.", e); + flashMessage = new FlashMessage("getFedServerIds", e.getMessage(), FlashMessage.ERROR); + } + + String message = "Failed on creating flash message: "+flashMessage; + try { + message = flashMessage.serializeMessage(); + } catch (IOException e) { + log.error(message); + } + log.debug("getWDDXFedServerIds.message: "+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.9 -r1.1.2.10 --- lams_common/src/java/org/lamsfoundation/lams/federation/service/IFederationService.java 31 Jul 2007 02:13:33 -0000 1.1.2.9 +++ lams_common/src/java/org/lamsfoundation/lams/federation/service/IFederationService.java 21 Aug 2007 00:20:54 -0000 1.1.2.10 @@ -14,6 +14,7 @@ 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; import org.w3c.dom.Document; @@ -127,4 +128,17 @@ * @throws FederationException */ public String getLocalUsername(String username, String providerId) throws FederationException; + + /** + * Returns list of fedIds and server names of all federation servers in local list. + * @return list of FedServerDTO. + */ + public List getFedServerIds(); + + /** + * Returns (wddx'd) list of fedIds of all federation servers in local list. + * @return wddx packet of list of fedIds + * @throws Exception + */ + public String getWDDXFedServerIds() throws Exception; }
" target="_blank">getFedServerGroups" target="_blank">getFedServerGroups