[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Mon Dec 10 17:01:32 EST 2007
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/meta
In directory dev.open-bio.org:/tmp/cvs-serv12392/src/main/org/biomoby/registry/meta

Modified Files:
	RegistriesList.java RegistryCache.java 
Log Message:
Switched default registry from iCAPTURE in Vancouver to Sun COE in Calgary
moby-live/Java/src/main/org/biomoby/registry/meta RegistriesList.java,1.4,1.5 RegistryCache.java,1.6,1.7
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/meta/RegistriesList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/meta/RegistriesList.java	2007/06/09 00:26:24	1.4
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/meta/RegistriesList.java	2007/12/10 22:01:32	1.5
@@ -8,6 +8,7 @@
 
 package org.biomoby.registry.meta;
 
+import org.biomoby.client.CentralImpl;
 import org.biomoby.shared.MobyException;
 
 import org.apache.commons.discovery.tools.Service;
@@ -36,13 +37,13 @@
 	 "", "", "", "", true, ""),
 
 	new Registry
-	("iCAPTURE",                                                         // synonym
-	 "http://mobycentral.icapture.ubc.ca/cgi-bin/MOBY05/mobycentral.pl", // endpoint
-	 "http://mobycentral.icapture.ubc.ca/MOBY/Central",                  // namespace
-	 "iCAPTURE Centre, Vancouver",                                       // full/long name
-	 "Edward Kawas (edward.kawas at gmail.com)",                            // contact
-	 true,                                                               // isPublic
-	 "A curated public registry hosted at the iCAPTURE Centre, Vancouver"),
+	("Calgary",                                                             // synonym
+	 CentralImpl.DEFAULT_ENDPOINT,                                          // endpoint
+	 CentralImpl.DEFAULT_NAMESPACE,                                         // namespace
+	 "Sun Center of Excellence for Visual Genomics, University of Calgary", // full/long name
+	 "Edward Kawas (edward.kawas at gmail.com)",                               // contact
+	 true,                                                                  // isPublic
+	 "A curated public registry hosted at the University of Calgary"),
 
 	new Registry
 	("IRRI",

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/meta/RegistryCache.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/meta/RegistryCache.java	2007/12/06 23:45:28	1.6
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/meta/RegistryCache.java	2007/12/10 22:01:32	1.7
@@ -1,5 +1,6 @@
 package org.biomoby.registry.meta;
 
+import org.biomoby.client.CentralImpl;
 import org.biomoby.shared.Central;
 import org.biomoby.shared.MobyException;
 
@@ -114,17 +115,12 @@
     public synchronized static Registry getDefaultRegistry(){
 	if(defaultRegistry == null){
 	    try{
-		defaultRegistry = (new RegistriesList()).get(Registries.DEFAULT_REGISTRY_SYNONYM);
+		defaultRegistry = new Registry(Registries.DEFAULT_REGISTRY_SYNONYM, 
+					       CentralImpl.getDefaultURL(),
+					       CentralImpl.getDefaultURI());
 	    } catch(Exception e){
 		e.printStackTrace();
 	    }
-	    if(defaultRegistry == null){
-		System.err.println("Error!  Could not find a default registry!  No data types will be available.");
-		System.err.println("Sought " + Registries.DEFAULT_REGISTRY_SYNONYM + " but available options are:");
-		for(String synonym: (new RegistriesList()).list()){
-		    System.err.println(synonym);
-		}
-	    }
 	}
 	return defaultRegistry;
     }