[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Mon Dec 17 13:31:09 EST 2007
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/test
In directory dev.open-bio.org:/tmp/cvs-serv5925/src/main/org/biomoby/service/test

Modified Files:
	ServletTester.java 
Log Message:
Added support for non-default registry usage for MobyServlet's
moby-live/Java/src/main/org/biomoby/service/test ServletTester.java,1.3,1.4
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/test/ServletTester.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/test/ServletTester.java	2007/04/12 00:53:31	1.3
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/test/ServletTester.java	2007/12/17 18:31:09	1.4
@@ -9,6 +9,7 @@
 package org.biomoby.service.test;
 
 import org.biomoby.client.*;
+import org.biomoby.registry.meta.Registry;
 import org.biomoby.service.*;
 import org.biomoby.shared.*;
 import org.biomoby.shared.data.*;
@@ -102,12 +103,9 @@
 	// Otherwise we keep the signature URL that servlet.createServiceFromConfig() generated
 
 	// Setup communication with MOBY Central
-        Central worker = null;
-	if(centralURL != null){  // not implemented yet
-	    worker = new CentralImpl(centralURL);
-	}
-	else{  // Use the default
-	    worker = new CentralImpl();
+        Central worker = servlet.getCentralImpl();
+	if(centralURL == null){  // shouldn't happen, but just in case...
+	    worker = new CentralImpl();  //use default server
 	}
 
 	if("unregister".equals(args[1])){
@@ -155,7 +153,10 @@
 	    }
 	    
 	    // Create the data and service instances.
-	    testData = MobyDataUtils.fromXMLDocument(dataIn);
+	    Registry registry = new Registry("any_reg_synonym", 
+					     worker.getRegistryEndpoint(),
+					     worker.getRegistryNamespace());
+	    testData = MobyDataUtils.fromXMLDocument(dataIn, registry);
 	}
 	else{
 	    // Create a blank request if the input is void