[MOBY-guts] biomoby commit

[Dmitry Repchevski]

drepchevski
Tue Feb 19 08:17:48 EST 2013
Update of /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/central/factory/jaxb
In directory dev.open-bio.org:/tmp/cvs-serv13838/central/factory/jaxb

Modified Files:
	JAXBMobyCentralImpl.java ModelConverter.java 
Log Message:
some fixes
moby-live/Java/src/main/org/inb/biomoby/central/factory/jaxb JAXBMobyCentralImpl.java,1.2,1.3 ModelConverter.java,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/central/factory/jaxb/JAXBMobyCentralImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/central/factory/jaxb/JAXBMobyCentralImpl.java	2011/02/02 13:23:40	1.2
+++ /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/central/factory/jaxb/JAXBMobyCentralImpl.java	2013/02/19 13:17:48	1.3
@@ -10,8 +10,6 @@
 
 package org.inb.biomoby.central.factory.jaxb;
 
-import org.inb.biomoby.central.factory.*;
-import org.inb.biomoby.shared.registry.*;
 import java.util.ArrayList;
 import java.util.List;
 import org.inb.biomoby.central.MobyCentral;
@@ -47,6 +45,7 @@
 import org.inb.biomoby.central.factory.jaxb.registry.RetrieveServiceProvidersOperation;
 import org.inb.biomoby.central.factory.jaxb.registry.RetrieveServiceTypesOperation;
 import org.inb.biomoby.central.factory.jaxb.registry.RetrieveServiceTypesOperation.ServiceTypes;
+import org.inb.biomoby.shared.registry.*;
 
 /**
  * @author Dmitry Repchevsky
@@ -477,26 +476,24 @@
         return registration;
     }
     
-    public ServiceType retrieveService(ServiceType serviceType) throws Exception
+    public Service retrieveService(Service service) throws Exception
     {
         RetrieveServiceOperation endpoint = new RetrieveServiceOperation(central);
         
         RetrieveService request = new RetrieveService();
         
-        ServiceTemplate service = new ServiceTemplate();
-        service.setServiceName(serviceType.getName());
-        service.setAuthURI(serviceType.getAuthURI());
-        service.setLsid(serviceType.getLsid());
+        ServiceTemplate template = new ServiceTemplate();
+        template.setServiceName(service.getName());
+        template.setAuthURI(service.getAuthURI());
+        template.setLsid(service.getLsid());
         
-        request.setService(service);
+        request.setService(template);
         
         ServiceTemplate response = endpoint.call(request);
 
-        ServiceType st = new ServiceType(response.getServiceName(), response.getAuthURI());
-        st.setLsid(response.getLsid());
-        st.setWSDL(response.getWSDL());
+        service.setWSDL(response.getWSDL());
         
-        return st;
+        return service;
     }
     
     public List<Relationship<ServiceType>> relationships(ServiceType serviceType, List<Relationship.RELATIONSHIP_TYPE> relationships, Relationship.DIRECTION_TYPE direction, boolean expandRelationship) throws Exception

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/central/factory/jaxb/ModelConverter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/central/factory/jaxb/ModelConverter.java	2009/09/09 19:47:48	1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/inb/biomoby/central/factory/jaxb/ModelConverter.java	2013/02/19 13:17:48	1.2
@@ -160,6 +160,8 @@
     {
         Service service = new Service(sv.getServiceName(), sv.getAuthURI());
 
+        service.setLsid(sv.getLsid());
+        
         service.setContactEmail(sv.getContactEmail());
         service.setDescription(sv.getDescription());