Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/struts-forms.xml,v
diff -u -r1.22.2.4 -r1.22.2.5
--- lams_admin/conf/xdoclet/struts-forms.xml	7 Jun 2007 01:26:09 -0000	1.22.2.4
+++ lams_admin/conf/xdoclet/struts-forms.xml	22 Jun 2007 05:17:20 -0000	1.22.2.5
@@ -112,6 +112,7 @@
 </form-bean>
 
 <form-bean name="FederationServerForm" type="org.apache.struts.action.DynaActionForm">
+	<form-property name="fedId" type="java.lang.Integer" />
 	<form-property name="name" type="java.lang.String" />
 	<form-property name="institution" type="java.lang.String" />
 	<form-property name="url" type="java.lang.String" />
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/Attic/FederationAction.java,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationAction.java	5 Jun 2007 04:31:43 -0000	1.1.2.2
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationAction.java	22 Jun 2007 05:17:20 -0000	1.1.2.3
@@ -3,6 +3,8 @@
  */
 package org.lamsfoundation.lams.admin.web.action;
 
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -18,6 +20,7 @@
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
 import org.lamsfoundation.lams.federation.FederationServer;
 import org.lamsfoundation.lams.federation.service.IFederationService;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 
 /**
  * @author jliew
@@ -43,8 +46,11 @@
 			service = AdminServiceProxy.getFederationService(getServlet().getServletContext());
 		}
 		
+		IUserManagementService uservice = AdminServiceProxy.getService(getServlet().getServletContext());
+		
 		ActionMessages errors = new ActionMessages();
 		DynaActionForm fedServerForm = (DynaActionForm)form;
+		Integer fedId = (Integer)fedServerForm.get("fedId");
 		String name = fedServerForm.getString("name");
 		String url = fedServerForm.getString("url");
 		String privatekey = fedServerForm.getString("privateKey");
@@ -53,6 +59,9 @@
 		if (submitted!=null && submitted.equals(new Integer(1))) {
 			
 			// form validation
+			if (fedId==null) {
+				errors.add("fedId", new ActionMessage("error.fedId.required"));
+			}
 			if (name==null || name.trim().length()==0) {
 				errors.add("name", new ActionMessage("error.name.required"));
 			}
@@ -65,9 +74,15 @@
 			
 			// save form or display errors
 			if (errors.isEmpty()) {
-				FederationServer newServer = new FederationServer();
-				BeanUtils.copyProperties(newServer, fedServerForm);
-				service.insertFederationServer(newServer);
+				FederationServer fedServer;
+				List fedServers = uservice.findByProperty(FederationServer.class, "fedId", fedId);
+				if (fedServers==null || fedServers.isEmpty()) {
+					fedServer = new FederationServer();
+				} else {
+					fedServer = (FederationServer)fedServers.get(0);
+				}
+				BeanUtils.copyProperties(fedServer, fedServerForm);
+				service.saveFederationServer(fedServer);
 				fedServerForm.initialize(mapping);
 			} else {
 				saveErrors(request, errors);
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.3 -r1.1.2.4
--- lams_admin/web/federation/federation.jsp	5 Jun 2007 04:31:43 -0000	1.1.2.3
+++ lams_admin/web/federation/federation.jsp	22 Jun 2007 05:17:20 -0000	1.1.2.4
@@ -6,29 +6,31 @@
 </h2>
 
 <h3>Federation Servers</h3>
+<p>Add servers for testing, should be overwritten when updated against the registry.</p>
 <div align="center"><html:errors/></div>
 <html:form action="/federation.do" method="post">
 	<html:hidden property="submitted" value="1"/>
 	<table>
 		<tr>
-			<td>name</td><td>institution</td><td>url</td><td>privatekey</td>
+			<td>fedId</td><td>name</td><td>institution</td><td>url</td><td>privatekey</td>
 		</tr>
 		<tr>
+			<td><html:text property="fedId" size="11" maxlength="11"/></td>
 			<td><html:text property="name" size="20" maxlength="255"/></td>
 			<td><html:text property="institution" size="20" maxlength="255"/></td>
 			<td><html:text property="url" size="20" maxlength="255"/></td>
 			<td><html:text property="privateKey" size="20" maxlength="255"/></td>
 		</tr>
 		<tr>
-			<td colspan="4" align="center">
+			<td colspan="5" align="center">
 				<html:submit styleClass="button"><fmt:message key="admin.save"/></html:submit>
 			</td>
 		</tr>
 	</table>
 </html:form>
 
-<p><a href="<c:out value="${fedUrl}"/>">view federation xml</a></p>
-<p><a href="<lams:LAMSURL />/federation/update.do">Update servers</a></p>
+<p><a href="<c:out value="${fedUrl}"/>" target="_blank">View XML from federation registry</a></p>
+<p><a href="<lams:LAMSURL />/federation/update.do" target="_blank">Update servers</a></p>
 
 <table class="alternative-color" width=100% cellspacing="0" >
 	<tr>
@@ -38,6 +40,7 @@
 		<th>institution</th>
 		<th>url</th>
 		<th>privateKey</th>
+		<th>view wddx</th>
 	</tr>
 	<logic:iterate name="servers" id="server">
 		<tr>
@@ -47,7 +50,9 @@
 			<td><bean:write name="server" property="institution"/></td>
 			<td><bean:write name="server" property="url"/></td>
 			<td><bean:write name="server" property="privateKey"/></td>
+			<td><a href="federation/wddx.do?fedId=<bean:write name="server" property="fedId"/>" target="_blank">getFedServerGroups</a></td>
 		</tr>
+		<span id="groups"></span>
 	</logic:iterate>
 </table>