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.3 -r1.1.2.4
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationWDDXAction.java	21 Aug 2007 00:20:54 -0000	1.1.2.3
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationWDDXAction.java	27 Aug 2007 03:24:26 -0000	1.1.2.4
@@ -39,6 +39,8 @@
 			return getFedServerGroups(mapping, form, request, response);
 		} else if (StringUtils.equals("getFedServerIds", method)) {
 			return getFedServerIds(mapping, form, request, response);
+		} else if (StringUtils.equals("getFedServerLessons", method)) {
+			return getFedServerLessons(mapping, form, request, response);
 		}
 		
 		return mapping.findForward("output");
@@ -84,4 +86,26 @@
 		
 		return mapping.findForward("output");
 	}
+	
+	public ActionForward getFedServerLessons(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response) throws Exception {
+		
+		IFederationService service = AdminServiceProxy.getFederationService(getServlet().getServletContext());
+		Integer fedId = WebUtil.readIntParam(request,"fedId",true);
+		Integer orgId = WebUtil.readIntParam(request,"orgId",true);
+		
+		FlashMessage flashMessage = new FlashMessage("getFedServerLessons", service.getFedServerLessons(fedId, orgId));
+		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.9 -r1.1.2.10
--- lams_admin/web/federation/federation.jsp	22 Aug 2007 00:59:52 -0000	1.1.2.9
+++ lams_admin/web/federation/federation.jsp	27 Aug 2007 03:24:26 -0000	1.1.2.10
@@ -86,7 +86,7 @@
 			<td><bean:write name="lesson" property="sid"/></td>
 			<td><bean:write name="lesson" property="federationServer.sid"/></td>
 			<td><bean:write name="lesson" property="extOrgId"/></td>
-			<td><bean:write name="lesson" property="lessonId"/></td>
+			<td><bean:write name="lesson" property="lesson.lessonId"/></td>
 		</tr>
 	</logic:iterate>
 	</logic:notEmpty>
Index: lams_central/conf/xdoclet/servlets.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/servlets.xml,v
diff -u -r1.14.2.5 -r1.14.2.6
--- lams_central/conf/xdoclet/servlets.xml	26 Jul 2007 03:46:13 -0000	1.14.2.5
+++ lams_central/conf/xdoclet/servlets.xml	27 Aug 2007 03:24:27 -0000	1.14.2.6
@@ -119,12 +119,14 @@
     <init-param>
       <param-name>query</param-name>
       <param-value>
-      select distinct l.lesson_id, l.name from lams_fed_lesson fl, lams_lesson l, lams_fed_server s 
+      select distinct l.lesson_id, l.name, o.code 
+      from lams_fed_lesson fl, lams_lesson l, lams_fed_server s, lams_organisation o
       where fl.lesson_id=l.lesson_id
       and fl.ext_org_id=${param.oid java.lang.Integer}
       and s.fed_id=${param.fid}
       and fl.server_sid=s.sid
 	  and sha1(s.privatekey)=${param.h}
+	  and o.organisation_id=l.organisation_id
       </param-value>
     </init-param>
     <init-param>
Index: lams_common/src/java/org/lamsfoundation/lams/federation/dto/ExtLessonDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/federation/dto/Attic/ExtLessonDTO.java,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_common/src/java/org/lamsfoundation/lams/federation/dto/ExtLessonDTO.java	1 Jun 2007 04:52:52 -0000	1.1.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/federation/dto/ExtLessonDTO.java	27 Aug 2007 03:24:26 -0000	1.1.2.2
@@ -11,6 +11,7 @@
 
 	private Integer extLessonId;
 	private String extLessonName;
+	private String extOrgCode;
 	
 	public ExtLessonDTO() {
 		
@@ -31,4 +32,12 @@
 	public void setExtLessonName(String extLessonName) {
 		this.extLessonName = extLessonName;
 	}
+	
+	public String getExtOrgCode() {
+		return extOrgCode;
+	}
+	
+	public void setExtOrgCode(String extOrgCode) {
+		this.extOrgCode = extOrgCode;
+	}
 }
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.14 -r1.1.2.15
--- lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java	22 Aug 2007 00:59:53 -0000	1.1.2.14
+++ lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java	27 Aug 2007 03:24:26 -0000	1.1.2.15
@@ -176,6 +176,9 @@
 					if (subNode.getNodeName().equals("name")) {
 						dto.setExtLessonName(subSubNode.getNodeValue());
 					}
+					if (subNode.getNodeName().equals("code")) {
+						dto.setExtOrgCode(subSubNode.getNodeValue());
+					}
 				}
 			}
 		}