Index: lams_common/src/java/org/lamsfoundation/lams/federation/FederationServer.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/federation/Attic/FederationServer.java,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_common/src/java/org/lamsfoundation/lams/federation/FederationServer.java	29 Jun 2007 06:55:31 -0000	1.1.2.3
+++ lams_common/src/java/org/lamsfoundation/lams/federation/FederationServer.java	3 Jul 2007 01:16:54 -0000	1.1.2.4
@@ -6,6 +6,9 @@
 import java.io.Serializable;
 import java.util.Set;
 
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+
 /**
  * @author jliew
  *
@@ -181,4 +184,12 @@
 	public void setExtLessons(Set extLessons) {
 		this.extLessons = extLessons;
 	}
+	
+	public boolean equals(Object other) {
+        if ( !(other instanceof FederationServer) ) return false;
+        FederationServer castOther = (FederationServer) other;
+        return new EqualsBuilder()
+            .append(this.getFedId(), castOther.getFedId())
+            .isEquals();
+    }
 }
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.5 -r1.1.2.6
--- lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java	29 Jun 2007 06:55:30 -0000	1.1.2.5
+++ lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java	3 Jul 2007 01:16:53 -0000	1.1.2.6
@@ -271,6 +271,9 @@
 		try {
 			Document document = getXmlDocumentFromUrl(new URL(url));
 			NodeList nodeList = document.getElementsByTagName("row");
+			ArrayList<FederationServer> newFedList = new ArrayList<FederationServer>();
+			
+			// update and insert new servers received from registry
 			for (int i=0; i<nodeList.getLength(); i++){
 				Node node = nodeList.item(i);
 				FederationServer fedServer = getFedServerFromNode(node);
@@ -286,8 +289,18 @@
 					existing.setPrivateKey(fedServer.getPrivateKey());
 					service.save(existing);
 				}
-				// TODO need to delete remoevd fedservers
+				newFedList.add(fedServer);
 			}
+			// delete servers no longer in registry list
+			List fedList = service.findAll(FederationServer.class);
+			if (fedList != null) {
+				for (int j=0; j<fedList.size(); j++) {
+					FederationServer fedServer = (FederationServer)fedList.get(j);
+					if (newFedList.indexOf(fedServer)<0) {
+						service.delete(fedServer);
+					}
+				}
+			}
 		} catch(MalformedURLException e) {
 			log.error("Invalid federation registry URL: "+url, e);
 		}