[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Wed Feb 13 23:33:58 EST 2008
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/service
In directory dev.open-bio.org:/tmp/cvs-serv21970/src/main/org/biomoby/service

Modified Files:
	MobyServlet.java 
Log Message:
Updated due to Eddie's changes to ServiceInstanceRDF (now supports multiple registries)
moby-live/Java/src/main/org/biomoby/service MobyServlet.java,1.12,1.13
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/MobyServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/MobyServlet.java	2008/01/15 20:56:38	1.12
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/MobyServlet.java	2008/02/14 04:33:58	1.13
@@ -61,6 +61,7 @@
 
     protected static MobyRequest mobyRequest;
     protected static DocumentBuilder docBuilder;
+    protected static ServiceInstanceRDF serviceInstanceRDF;
 
     // Members used to wrap the response in SOAP
     protected static MessageFactory soapMessageFactory;
@@ -141,7 +142,7 @@
 	}
 
         boolean USE_LSIDS = true;
-	Model model = ServiceInstanceRDF.createRDFModel(ModelFactory.createDefaultModel(), 
+	Model model = serviceInstanceRDF.createRDFModel(ModelFactory.createDefaultModel(), 
 							new MobyService[]{thisService},
                                                         USE_LSIDS);
 	FilteredStream stream = new FilteredStream(new java.io.ByteArrayOutputStream(5000));
@@ -277,7 +278,8 @@
 
 	// Parse the SOAP data envelope to get just the MOBY part
 	MobyContentInstance mobyRequestContents = null;
-	org.w3c.dom.Element mobyEnvelopeDOM = mobyRequest.decodeSOAPMessage(bodyDoc.getDocumentElement(), 
+	org.w3c.dom.Element mobyEnvelopeDOM = mobyRequest.decodeSOAPMessage(bodyDoc.getDocumentElement(),
+									    //getServiceName(),
 									    null, 
 									    null);
 	
@@ -670,10 +672,10 @@
 				   "org.apache.xalan.processor.TransformerFactoryImpl");
 	    }
 
-	    if(System.getProperty("javax.xml.soap.MessageFactory") == null){
-		System.setProperty("javax.xml.soap.MessageFactory", 
-				   "org.apache.axis.soap.MessageFactoryImpl");
-	    }
+	    //if(System.getProperty("javax.xml.soap.MessageFactory") == null){
+	//	System.setProperty("javax.xml.soap.MessageFactory", 
+	//			   "org.apache.axis.soap.MessageFactoryImpl");
+	 //   }
 	    soapMessageFactory = MessageFactory.newInstance();  // Should find Axis by default
 	    SOAPFactory soapFactory = SOAPFactory.newInstance();
 	    bodyContentsName = soapFactory.createName(getServiceName()+"Return",
@@ -713,6 +715,7 @@
 	    registry = new Registry("any_synonym", 
 				    mobyRequest.getCentralImpl().getRegistryEndpoint(),
 				    mobyRequest.getCentralImpl().getRegistryNamespace());
+            serviceInstanceRDF = new ServiceInstanceRDF(registry);
 	    // Forces a preload of the current MOBY Object ontology
 	    MobyDataType.getDataType("Object", registry);