[MOBY-guts] biomoby commit
Martin Senger
senger at pub.open-bio.org
Sun Sep 4 13:45:37 UTC 2005
senger
Sun Sep 4 09:45:37 EDT 2005
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client
In directory pub.open-bio.org:/tmp/cvs-serv27838/src/main/org/biomoby/client
Modified Files:
BaseClient.java BaseCmdLineClient.java CentralDigestImpl.java
CentralImpl.java GraphsServlet.java
Log Message:
moby-live/Java/src/main/org/biomoby/client BaseClient.java,1.1,1.2 BaseCmdLineClient.java,1.1,1.2 CentralDigestImpl.java,1.3,1.4 CentralImpl.java,1.24,1.25 GraphsServlet.java,1.10,1.11
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/BaseClient.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/biomoby/client/BaseClient.java 2005/08/26 06:40:53 1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/BaseClient.java 2005/09/04 13:45:37 1.2
@@ -15,8 +15,8 @@
import org.biomoby.shared.parser.MobyPackage;
import org.biomoby.shared.parser.MobyJob;
-import embl.ebi.soap.axis.AxisCall;
-import embl.ebi.utils.GException;
+import org.tulsoft.tools.soap.axis.AxisCall;
+import org.tulsoft.shared.GException;
import java.net.URL;
import java.net.MalformedURLException;
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/BaseCmdLineClient.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/biomoby/client/BaseCmdLineClient.java 2005/08/26 06:40:53 1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/BaseCmdLineClient.java 2005/09/04 13:45:37 1.2
@@ -17,11 +17,11 @@
import org.biomoby.shared.datatypes.MobyObject;
import org.biomoby.shared.datatypes.MapDataTypesIfc;
-import embl.ebi.tools.BaseCmdLine;
-import embl.ebi.tools.ICreator;
-import embl.ebi.utils.GException;
-import embl.ebi.utils.FileUtils;
-import embl.ebi.utils.DGUtils;
+import org.tulsoft.tools.BaseCmdLine;
+import org.tulsoft.tools.loaders.ICreator;
+import org.tulsoft.shared.GException;
+import org.tulsoft.shared.FileUtils;
+import org.tulsoft.tools.debug.DGUtils;
import java.util.Vector;
import java.util.HashMap;
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestImpl.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/client/CentralDigestImpl.java 2005/04/18 23:57:45 1.3
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestImpl.java 2005/09/04 13:45:37 1.4
@@ -6,18 +6,17 @@
package org.biomoby.client;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-
import org.biomoby.shared.CentralDigest;
import org.biomoby.shared.MobyDataType;
import org.biomoby.shared.MobyException;
import org.biomoby.shared.MobyService;
import org.biomoby.shared.MobyServiceType;
-import embl.ebi.utils.DGUtils;
-// import java.net.*;
+import org.tulsoft.tools.debug.DGUtils;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Vector;
/**
* A default implementation of {@link
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralImpl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralImpl.java 2005/08/26 06:27:04 1.24
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralImpl.java 2005/09/04 13:45:37 1.25
@@ -23,7 +23,7 @@
import org.biomoby.shared.Utils;
import org.biomoby.shared.MobyResourceRef;
-import embl.ebi.soap.axis.AxisUtils;
+import org.tulsoft.tools.soap.axis.AxisUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/GraphsServlet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/GraphsServlet.java 2005/05/19 15:57:25 1.10
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/GraphsServlet.java 2005/09/04 13:45:37 1.11
@@ -8,6 +8,31 @@
package org.biomoby.client;
+import org.biomoby.shared.CentralAll;
+import org.biomoby.shared.MobyDataType;
+import org.biomoby.shared.MobyException;
+import org.biomoby.shared.MobyNamespace;
+import org.biomoby.shared.MobyPrimaryDataSimple;
+import org.biomoby.shared.MobyService;
+import org.biomoby.shared.MobyServiceType;
+import org.biomoby.shared.Utils;
+
+import org.tulsoft.tools.servlets.Html;
+import org.tulsoft.tools.servlets.HtmlConstants;
+import org.tulsoft.tools.external.CatchOutputDefaultImpl;
+import org.tulsoft.tools.external.Executor;
+import org.tulsoft.tools.Printf;
+import org.tulsoft.tools.Sorter;
+import org.tulsoft.shared.GException;
+import org.tulsoft.shared.StringUtils;
+import org.tulsoft.shared.UUtils;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -23,32 +48,6 @@
import java.util.Properties;
import java.util.Vector;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.biomoby.shared.CentralAll;
-import org.biomoby.shared.MobyDataType;
-import org.biomoby.shared.MobyException;
-import org.biomoby.shared.MobyNamespace;
-import org.biomoby.shared.MobyPrimaryDataSimple;
-import org.biomoby.shared.MobyService;
-import org.biomoby.shared.MobyServiceType;
-import org.biomoby.shared.Utils;
-
-import embl.ebi.servlets.Html;
-import embl.ebi.servlets.HtmlConstants;
-import embl.ebi.tools.CatchOutputDefaultImpl;
-import embl.ebi.tools.Executor;
-import embl.ebi.tools.Printf;
-import embl.ebi.tools.Sorter;
-import embl.ebi.utils.GException;
-import embl.ebi.utils.StringUtils;
-import embl.ebi.utils.UUtils;
-
-
/**
* A servlet making graphs of Moby service instances, Moby data types,
* and Moby service types. <P>
@@ -1489,7 +1488,7 @@
// where is the 'dot' program
String dotProg = "dot";
String dotPath = (String)initParams.get (DOT_PATH);
- if (! UUtils.isEmpty (dotPath))
+ if ( ! UUtils.isEmpty (dotPath) && ! "\"\"".equals (dotPath) )
dotProg = dotPath + System.getProperty ("file.separator") + dotProg;
// depending on the cache implementation we may ask
More information about the MOBY-guts
mailing list