X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJws2Discoverer.java;h=dbcecec707b4801ee7cc653c95a32f4a23d7b49f;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=8089e1a584cbfe41ffb4dcf157e941d0194e53bc;hpb=4674dbf3f27eee61a7e21174649aa4c9ec7a04dd;p=jalview.git
diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java
index 8089e1a..dbcecec 100644
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -1,57 +1,56 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.ws.jws2;
+import jalview.bin.Cache;
+import jalview.gui.AlignFrame;
+import jalview.gui.Desktop;
+import jalview.gui.JvSwingUtils;
+import jalview.util.MessageManager;
+import jalview.ws.WSMenuEntryProviderI;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.params.ParamDatastoreI;
+
import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.io.Closeable;
-import java.net.ConnectException;
+import java.beans.PropertyChangeSupport;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.StringTokenizer;
import java.util.Vector;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
-import javax.swing.event.MenuEvent;
-import javax.swing.event.MenuListener;
-
-import org.apache.log4j.Level;
-import jalview.bin.Cache;
-import jalview.datamodel.AlignmentView;
-import jalview.gui.AlignFrame;
-import jalview.gui.Desktop;
-import jalview.gui.JalviewChangeSupport;
-import jalview.ws.WSMenuEntryProviderI;
-import jalview.ws.params.ParamDatastoreI;
-import compbio.data.msa.MsaWS;
-import compbio.metadata.Option;
-import compbio.metadata.Preset;
-import compbio.metadata.PresetManager;
-import compbio.metadata.RunnerConfig;
-import compbio.ws.client.Jws2Client;
import compbio.ws.client.Services;
/**
@@ -63,9 +62,48 @@ import compbio.ws.client.Services;
*/
public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
{
- private java.beans.PropertyChangeSupport changeSupport = new java.beans.PropertyChangeSupport(
+ public static final String COMPBIO_JABAWS = "http://www.compbio.dundee.ac.uk/jabaws";
+
+ /*
+ * the .jalview_properties entry for JWS2 URLS
+ */
+ final static String JWS2HOSTURLS = "JWS2HOSTURLS";
+
+ /*
+ * Singleton instance
+ */
+ private static Jws2Discoverer discoverer;
+
+ /*
+ * Override for testing only
+ */
+ private static List testUrls = null;
+
+ // preferred url has precedence over others
+ private String preferredUrl;
+
+ private PropertyChangeSupport changeSupport = new PropertyChangeSupport(
this);
+ Vector invalidServiceUrls = null, urlsWithoutServices = null,
+ validServiceUrls = null;
+
+ boolean running = false, aborted = false;
+
+ Thread oldthread = null;
+
+ /**
+ * holds list of services.
+ */
+ protected Vector services;
+
+ /**
+ * Private constructor enforces use of singleton via getDiscoverer()
+ */
+ private Jws2Discoverer()
+ {
+ }
+
/**
* change listeners are notified of "services" property changes
*
@@ -90,8 +128,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
changeSupport.removePropertyChangeListener(listener);
}
- boolean running = false, aborted = false;
-
/**
* @return the aborted
*/
@@ -107,12 +143,11 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
public void setAborted(boolean aborted)
{
this.aborted = aborted;
- }
-
- Thread oldthread = null;
+ }
public void run()
{
+
if (running && oldthread != null && oldthread.isAlive())
{
if (!aborted)
@@ -134,6 +169,17 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
Cache.log.debug("Old discovery thread has finished.");
}
running = true;
+
+ // first set up exclusion list if needed
+ final Set ignoredServices = new HashSet();
+ for (String ignored : Cache.getDefault(
+ "IGNORED_JABAWS_SERVICETYPES", "")
+ .split("\\|"))
+ {
+ ignoredServices.add(ignored);
+ }
+
+ changeSupport.firePropertyChange("services", services, new Vector());
oldthread = Thread.currentThread();
try
{
@@ -160,17 +206,36 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
{
invalidServiceUrls.removeAllElements();
}
+ if (validServiceUrls != null)
+ {
+ validServiceUrls.removeAllElements();
+ }
+ ArrayList svctypes = new ArrayList();
List qrys = new ArrayList();
- for (final String jwsservers : getServiceUrls())
+ for (final String jwsserver : getServiceUrls())
{
- JabaWsServerQuery squery = new JabaWsServerQuery(this, jwsservers);
+ JabaWsServerQuery squery = new JabaWsServerQuery(this, jwsserver);
+ if (svctypes.size() == 0)
+ {
+ // TODO: remove this ugly hack to get Canonical JABA service ordering
+ // for all possible services
+ for (Services sv : squery.JABAWS2SERVERS)
+ {
+ if (!ignoredServices.contains(sv.toString()))
+ {
+ svctypes.add(sv.toString());
+ }
+ }
+
+ }
qrys.add(squery);
new Thread(squery).start();
}
- boolean finished = false;
+ boolean finished = true;
do
{
+ finished = true;
try
{
Thread.sleep(100);
@@ -180,7 +245,10 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
;
for (JabaWsServerQuery squery : qrys)
{
- finished |= !squery.isRunning();
+ if (squery.isRunning())
+ {
+ finished = false;
+ }
}
if (aborted)
{
@@ -192,12 +260,37 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
}
}
} while (!aborted && !finished);
- oldthread = null;
- running = false;
if (!aborted)
{
- changeSupport.firePropertyChange("services", new Vector(), services);
+ // resort services according to order found in jabaws service list
+ // also ensure servics for each host are ordered in same way.
+
+ if (services != null && services.size() > 0)
+ {
+ Jws2Instance[] svcs = new Jws2Instance[services.size()];
+ int[] spos = new int[services.size()];
+ int ipos = 0;
+ List svcUrls = getServiceUrls();
+ for (Jws2Instance svc : services)
+ {
+ svcs[ipos] = svc;
+ spos[ipos++] = 1000 * svcUrls.indexOf(svc.getHost()) + 1
+ + svctypes.indexOf(svc.serviceType);
+ }
+ jalview.util.QuickSort.sort(spos, svcs);
+ services = new Vector();
+ for (Jws2Instance svc : svcs)
+ {
+ if (!ignoredServices.contains(svc.serviceType))
+ {
+ services.add(svc);
+ }
+ }
+ }
}
+ oldthread = null;
+ running = false;
+ changeSupport.firePropertyChange("services", new Vector(), services);
}
/**
@@ -207,317 +300,312 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
* @param srv
* @param service2
*/
- synchronized void addService(String jwsservers, Services srv,
- MsaWS service2)
+ synchronized void addService(String jwsservers, Jws2Instance service)
{
if (services == null)
{
services = new Vector();
}
System.out.println("Discovered service: " + jwsservers + " "
- + srv.toString());
- Jws2Instance service = new Jws2Instance(jwsservers, srv.toString(),
- service2);
+ + service.toString());
+ // Jws2Instance service = new Jws2Instance(jwsservers, srv.toString(),
+ // service2);
services.add(service);
// retrieve the presets and parameter set and cache now
- service.getParamStore().getPresets();
+ ParamDatastoreI pds = service.getParamStore();
+ if (pds != null)
+ {
+ pds.getPresets();
+ }
service.hasParameters();
+ if (validServiceUrls == null)
+ {
+ validServiceUrls = new Vector();
+ }
+ validServiceUrls.add(jwsservers);
}
- public class Jws2Instance
+ /**
+ * attach all available web services to the appropriate submenu in the given
+ * JMenu
+ */
+ public void attachWSMenuEntry(JMenu wsmenu, final AlignFrame alignFrame)
{
- public String hosturl;
-
- public String serviceType;
+ // dynamically regenerate service list.
+ populateWSMenuEntry(wsmenu, alignFrame, null);
+ }
- public MsaWS service;
+ private boolean isRecalculable(String action)
+ {
+ return (action != null && action.equalsIgnoreCase("conservation"));
+ }
- public Jws2Instance(String hosturl, String serviceType, MsaWS service)
+ private void populateWSMenuEntry(JMenu jws2al,
+ final AlignFrame alignFrame, String typeFilter)
+ {
+ if (running || services == null || services.size() == 0)
{
- super();
- this.hosturl = hosturl;
- this.serviceType = serviceType;
- this.service = service;
+ return;
}
-
- PresetManager presets = null;
-
- public JabaParamStore paramStore = null;
-
+ boolean byhost = Cache.getDefault("WSMENU_BYHOST", false), bytype = Cache
+ .getDefault("WSMENU_BYTYPE", false);
/**
- * non thread safe - gets the presets for this service (blocks whilst it
- * calls the service to get the preset set)
- *
- * @return service presets or null if exceptions were raised.
+ * eventually, JWS2 services will appear under the same align/etc submenus.
+ * for moment we keep them separate.
*/
- public PresetManager getPresets()
+ JMenu atpoint;
+ List enumerableServices = new ArrayList();
+ // jws2al.removeAll();
+ Map preferredHosts = new HashMap();
+ Map> alternates = new HashMap>();
+ for (Jws2Instance service : services.toArray(new Jws2Instance[0]))
{
- if (presets == null)
+ if (!isRecalculable(service.action))
{
- try
+ // add 'one shot' services to be displayed using the classic menu
+ // structure
+ enumerableServices.add(service);
+ }
+ else
+ {
+ if (!preferredHosts.containsKey(service.serviceType))
{
- presets = service.getPresets();
- } catch (Exception ex)
+ Jws2Instance preferredInstance = getPreferredServiceFor(
+ alignFrame, service.serviceType);
+ if (preferredInstance != null)
+ {
+ preferredHosts.put(service.serviceType, preferredInstance);
+ }
+ else
+ {
+ preferredHosts.put(service.serviceType, service);
+ }
+ }
+ List ph = alternates.get(service.serviceType);
+ if (preferredHosts.get(service.serviceType) != service)
{
- System.err
- .println("Exception when retrieving presets for service "
- + serviceType + " at " + hosturl);
+ if (ph == null)
+ {
+ ph = new ArrayList();
+ }
+ ph.add(service);
+ alternates.put(service.serviceType, ph);
}
}
- return presets;
- }
- public String getHost()
- {
- return hosturl;
- /*
- * try { URL serviceurl = new URL(hosturl); if (serviceurl.getPort()!=80)
- * { return serviceurl.getHost()+":"+serviceurl.getPort(); } return
- * serviceurl.getHost(); } catch (Exception e) {
- * System.err.println("Failed to parse service URL '" + hosturl +
- * "' as a valid URL!"); } return null;
- */
- }
-
- /**
- * @return short description of what the service will do
- */
- public String getActionText()
- {
- return "Align with " + serviceType;
- }
-
- /**
- * non-thread safe - blocks whilst accessing service to get complete set of
- * available options and parameters
- *
- * @return
- */
- public RunnerConfig getRunnerConfig()
- {
- return service.getRunnerOptions();
}
- @Override
- protected void finalize() throws Throwable
+ // create GUI element for classic services
+ addEnumeratedServices(jws2al, alignFrame, enumerableServices);
+ // and the instantaneous services
+ for (final Jws2Instance service : preferredHosts.values())
{
- if (service != null)
+ atpoint = JvSwingUtils.findOrCreateMenu(jws2al, service.action);
+ JMenuItem hitm;
+ if (atpoint.getItemCount() > 1)
{
- try
- {
- Closeable svc = (Closeable) service;
- service = null;
- svc.close();
- } catch (Exception e)
- {
- }
- ;
+ // previous service of this type already present
+ atpoint.addSeparator();
}
- super.finalize();
- }
-
- public ParamDatastoreI getParamStore()
- {
- if (paramStore == null)
+ atpoint.add(hitm = new JMenuItem(service.getHost()));
+ hitm.setForeground(Color.blue);
+ hitm.addActionListener(new ActionListener()
{
- try
- {
- paramStore = new JabaParamStore(this,
- (Desktop.instance != null ? Desktop
- .getUserParameterStore() : null));
- } catch (Exception ex)
+
+ @Override
+ public void actionPerformed(ActionEvent e)
{
+ Desktop.showUrl(service.getHost());
}
+ });
+ hitm.setToolTipText(JvSwingUtils
+ .wrapTooltip(false, MessageManager.getString("label.open_jabaws_web_page ")));
- }
- return paramStore;
- }
-
- public String getUri()
- {
- // this is only valid for Jaba 1.0 - this formula might have to change!
- return hosturl
- + (hosturl.lastIndexOf("/") == (hosturl.length() - 1) ? "/"
- : "") + serviceType;
- }
-
- private boolean hasParams = false, lookedForParams = false;
-
- public boolean hasParameters()
- {
- if (!lookedForParams)
+ service.attachWSMenuEntry(atpoint, alignFrame);
+ if (alternates.containsKey(service.serviceType))
{
- lookedForParams = true;
- try
- {
- hasParams = (getRunnerConfig().getArguments().size() > 0);
- } catch (Exception e)
+ atpoint.add(hitm = new JMenu(MessageManager.getString("label.switch_server")));
+ hitm.setToolTipText(JvSwingUtils
+ .wrapTooltip(false, MessageManager.getString("label.choose_jabaws_server")));
+ for (final Jws2Instance sv : alternates.get(service.serviceType))
{
+ JMenuItem itm;
+ hitm.add(itm = new JMenuItem(sv.getHost()));
+ itm.setForeground(Color.blue);
+ itm.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent arg0)
+ {
+ new Thread(new Runnable()
+ {
+ public void run()
+ {
+ setPreferredServiceFor(alignFrame, sv.serviceType,
+ sv.action, sv);
+ changeSupport.firePropertyChange("services",
+ new Vector(), services);
+ };
+ }).start();
+
+ }
+ });
}
+ /*
+ * hitm.addActionListener(new ActionListener() {
+ *
+ * @Override public void actionPerformed(ActionEvent arg0) { new
+ * Thread(new Runnable() {
+ *
+ * @Override public void run() { new SetPreferredServer(alignFrame,
+ * service.serviceType, service.action); } }).start(); } });
+ */
}
- return hasParams;
}
- };
-
- /**
- * holds list of services.
- */
- protected Vector services;
+ }
/**
- * find or add a submenu with the given title in the given menu
- *
- * @param menu
- * @param submenu
- * @return the new or existing submenu
+ * add services using the Java 2.5/2.6/2.7 system which optionally creates
+ * submenus to index by host and service program type
*/
- private JMenu findOrCreateMenu(JMenu menu, String submenu)
+ private void addEnumeratedServices(final JMenu jws2al,
+ final AlignFrame alignFrame, List enumerableServices)
{
- JMenu submenuinstance = null;
- for (int i = 0, iSize = menu.getMenuComponentCount(); i < iSize; i++)
+ boolean byhost = Cache.getDefault("WSMENU_BYHOST", false), bytype = Cache
+ .getDefault("WSMENU_BYTYPE", false);
+ /**
+ * eventually, JWS2 services will appear under the same align/etc submenus.
+ * for moment we keep them separate.
+ */
+ JMenu atpoint;
+ MsaWSClient msacl = new MsaWSClient();
+ List hostLabels = new ArrayList();
+ Hashtable lasthostFor = new Hashtable();
+ Hashtable> hosts = new Hashtable>();
+ ArrayList hostlist = new ArrayList();
+ for (Jws2Instance service : enumerableServices)
{
- if (menu.getMenuComponent(i) instanceof JMenu
- && ((JMenu) menu.getMenuComponent(i)).getText().equals(
- submenu))
+ ArrayList hostservices = hosts.get(service.getHost());
+ if (hostservices == null)
{
- submenuinstance = (JMenu) menu.getMenuComponent(i);
+ hosts.put(service.getHost(),
+ hostservices = new ArrayList());
+ hostlist.add(service.getHost());
}
+ hostservices.add(service);
}
- if (submenuinstance == null)
- {
- submenuinstance = new JMenu(submenu);
- menu.add(submenuinstance);
- }
- return submenuinstance;
-
- }
-
- public void attachWSMenuEntry(JMenu wsmenu, final AlignFrame alignFrame)
- {
- // dynamically regenerate service list.
- final JMenu jws2al = new JMenu("JABAWS Alignment");
- jws2al.addMenuListener(new MenuListener()
+ // now add hosts in order of the given array
+ for (String host : hostlist)
{
- // TODO: future: add menu listener to parent menu - so submenus are
- // populated *before* they are selected.
- @Override
- public void menuSelected(MenuEvent e)
- {
- populateWSMenuEntry(jws2al, alignFrame);
- }
-
- @Override
- public void menuDeselected(MenuEvent e)
+ Jws2Instance orderedsvcs[] = hosts.get(host).toArray(
+ new Jws2Instance[1]);
+ String sortbytype[] = new String[orderedsvcs.length];
+ for (int i = 0; i < sortbytype.length; i++)
{
- // TODO Auto-generated method stub
-
+ sortbytype[i] = orderedsvcs[i].serviceType;
}
-
- @Override
- public void menuCanceled(MenuEvent e)
+ jalview.util.QuickSort.sort(sortbytype, orderedsvcs);
+ for (final Jws2Instance service : orderedsvcs)
{
- // TODO Auto-generated method stub
-
- }
-
- });
- wsmenu.add(jws2al);
-
- }
-
- private void populateWSMenuEntry(JMenu jws2al, final AlignFrame alignFrame)
- {
- if (running || services == null || services.size() == 0)
- {
- return;
- }
- boolean byhost = Cache.getDefault("WSMENU_BYHOST", true), bytype = Cache
- .getDefault("WSMENU_BYTYPE", true);
- /**
- * eventually, JWS2 services will appear under the same align/etc submenus.
- * for moment we keep them separate.
- */
- JMenu atpoint;
- MsaWSClient msacl = new MsaWSClient();
- Vector hostLabels = new Vector();
- jws2al.removeAll();
- String lasthost = null;
- for (final Jws2Instance service : services)
- {
- atpoint = jws2al;
- String host = service.getHost();
- String type = service.serviceType;
- if (byhost)
- {
- atpoint = findOrCreateMenu(atpoint, host);
- if (atpoint.getToolTipText() == null)
+ atpoint = JvSwingUtils.findOrCreateMenu(jws2al, service.action);
+ String type = service.serviceType;
+ if (byhost)
{
- atpoint.setToolTipText("Services at " + host);
+ atpoint = JvSwingUtils.findOrCreateMenu(atpoint, host);
+ if (atpoint.getToolTipText() == null)
+ {
+ atpoint.setToolTipText(MessageManager.formatMessage("label.services_at", new String[]{host}));
+ }
}
- }
- if (bytype)
- {
- atpoint = findOrCreateMenu(atpoint, type);
- if (atpoint.getToolTipText() == null)
+ if (bytype)
{
- atpoint.setToolTipText(service.getActionText());
+ atpoint = JvSwingUtils.findOrCreateMenu(atpoint, type);
+ if (atpoint.getToolTipText() == null)
+ {
+ atpoint.setToolTipText(service.getActionText());
+ }
}
- }
- if (!byhost
- && !hostLabels.contains(host + service.serviceType
- + service.getActionText()))
- // !hostLabels.contains(host + (bytype ?
- // service.serviceType+service.getActionText() : "")))
- {
- // add a marker indicating where this service is hosted
- // relies on services from the same host being listed in a contiguous
- // group
- JMenuItem hitm;
- atpoint.addSeparator();
- if (lasthost == null || !lasthost.equals(host))
+ if (!byhost
+ && !hostLabels.contains(host + service.serviceType
+ + service.getActionText()))
+ // !hostLabels.contains(host + (bytype ?
+ // service.serviceType+service.getActionText() : "")))
{
- atpoint.add(hitm = new JMenuItem(host));
- hitm.setForeground(Color.blue);
- lasthost = host;
+ // add a marker indicating where this service is hosted
+ // relies on services from the same host being listed in a
+ // contiguous
+ // group
+ JMenuItem hitm;
+ if (hostLabels.contains(host))
+ {
+ atpoint.addSeparator();
+ }
+ else
+ {
+ hostLabels.add(host);
+ }
+ if (lasthostFor.get(service.action) == null
+ || !lasthostFor.get(service.action).equals(host))
+ {
+ atpoint.add(hitm = new JMenuItem(host));
+ hitm.setForeground(Color.blue);
+ hitm.addActionListener(new ActionListener()
+ {
+
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ Desktop.showUrl(service.getHost());
+ }
+ });
+ hitm.setToolTipText(JvSwingUtils
+ .wrapTooltip(true, MessageManager.getString("label.open_jabaws_web_page")));
+ lasthostFor.put(service.action, host);
+ }
+ hostLabels.add(host + service.serviceType
+ + service.getActionText());
}
- hostLabels.addElement(host + service.serviceType
- + service.getActionText());
- // hostLabels.addElement(host + (bytype ?
- // service.serviceType+service.getActionText() : ""));
+
+ service.attachWSMenuEntry(atpoint, alignFrame);
}
- msacl.attachWSMenuEntry(atpoint, service, alignFrame);
- /*
- * JMenuItem sitem = new JMenuItem(service.serviceType);
- * sitem.setToolTipText("Hosted at " + service.hosturl);
- * sitem.addActionListener(new ActionListener() {
- *
- * @Override public void actionPerformed(ActionEvent e) { AlignmentView
- * msa = alignFrame.gatherSequencesForAlignment(); MsaWSClient client =
- * new MsaWSClient(service, "JWS2 Alignment of " + alignFrame.getTitle(),
- * msa, false, true, alignFrame.getViewport().getAlignment().getDataset(),
- * alignFrame); } });
- */
}
}
public static void main(String[] args)
{
+ if (args.length > 0)
+ {
+ testUrls = new ArrayList();
+ for (String url : args)
+ {
+ testUrls.add(url);
+ }
+ ;
+ }
Thread runner = getDiscoverer().startDiscoverer(
new PropertyChangeListener()
- {
+ {
- public void propertyChange(PropertyChangeEvent evt)
- {
- if (getDiscoverer().services!=null)
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ if (getDiscoverer().services != null)
{
System.out.println("Changesupport: There are now "
- + getDiscoverer().services.size() + " services");
-
- }
- }
- });
+ + getDiscoverer().services.size() + " services");
+ int i = 1;
+ for (Jws2Instance instance : getDiscoverer().services)
+ {
+ System.out.println("Service " + i++ + " "
+ + instance.getClass() + "@"
+ + instance.getHost() + ": "
+ + instance.getActionText());
+ }
+
+ }
+ }
+ });
while (runner.isAlive())
{
try
@@ -528,10 +616,19 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
}
;
}
+ try
+ {
+ Thread.sleep(50);
+ } catch (InterruptedException x)
+ {
+ }
}
- private static Jws2Discoverer discoverer;
-
+ /**
+ * Returns the singleton instance of this class.
+ *
+ * @return
+ */
public static Jws2Discoverer getDiscoverer()
{
if (discoverer == null)
@@ -543,7 +640,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
public boolean hasServices()
{
- // TODO Auto-generated method stub
return !running && services != null && services.size() > 0;
}
@@ -552,24 +648,19 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
return running;
}
- /**
- * the jalview .properties entry for JWS2 URLS
- */
- final static String JWS2HOSTURLS = "JWS2HOSTURLS";
-
- public static void setServiceUrls(Vector urls)
+ public void setServiceUrls(List wsUrls)
{
- if (urls != null)
+ if (wsUrls != null && !wsUrls.isEmpty())
{
- StringBuffer urlbuffer = new StringBuffer();
+ StringBuilder urls = new StringBuilder(128);
String sep = "";
- for (String url : urls)
+ for (String url : wsUrls)
{
- urlbuffer.append(sep);
- urlbuffer.append(url);
+ urls.append(sep);
+ urls.append(url);
sep = ",";
}
- Cache.setProperty(JWS2HOSTURLS, urlbuffer.toString());
+ Cache.setProperty(JWS2HOSTURLS, urls.toString());
}
else
{
@@ -577,11 +668,27 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
}
}
- public static Vector getServiceUrls()
+ /**
+ * Returns web service URLs, in the order in which they should be tried (or an
+ * empty list).
+ *
+ * @return
+ */
+ public List getServiceUrls()
{
- String surls = Cache.getDefault(JWS2HOSTURLS,
- "http://www.compbio.dundee.ac.uk/jabaws");
- Vector urls = new Vector();
+ if (testUrls != null)
+ {
+ // return test urls, if there are any, instead of touching cache
+ return testUrls;
+ }
+ List urls = new ArrayList();
+
+ if (this.preferredUrl != null)
+ {
+ urls.add(preferredUrl);
+ }
+
+ String surls = Cache.getDefault(JWS2HOSTURLS, COMPBIO_JABAWS);
try
{
StringTokenizer st = new StringTokenizer(surls, ",");
@@ -590,40 +697,37 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
String url = null;
try
{
- java.net.URL u = new java.net.URL(url = st.nextToken());
+ url = st.nextToken();
+ new URL(url);
if (!urls.contains(url))
{
urls.add(url);
}
else
{
- jalview.bin.Cache.log.info("Ignoring duplicate url in "
+ Cache.log.warn("Ignoring duplicate url " + url + " in "
+ JWS2HOSTURLS + " list");
}
- } catch (Exception ex)
+ } catch (MalformedURLException ex)
{
- jalview.bin.Cache.log
+ Cache.log
.warn("Problem whilst trying to make a URL from '"
+ ((url != null) ? url : "") + "'");
- jalview.bin.Cache.log
+ Cache.log
.warn("This was probably due to a malformed comma separated list"
+ " in the "
+ JWS2HOSTURLS
+ " entry of $(HOME)/.jalview_properties)");
- jalview.bin.Cache.log.debug("Exception was ", ex);
+ Cache.log.debug("Exception was ", ex);
}
}
} catch (Exception ex)
{
- jalview.bin.Cache.log.warn(
+ Cache.log.warn(
"Error parsing comma separated list of urls in "
+ JWS2HOSTURLS + " preference.", ex);
}
- if (urls.size() >= 0)
- {
- return urls;
- }
- return null;
+ return urls;
}
public Vector getServices()
@@ -657,6 +761,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
e.printStackTrace();
return false;
}
+
return true;
}
@@ -680,8 +785,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
return thr;
}
- Vector invalidServiceUrls = null, urlsWithoutServices = null;
-
/**
* @return the invalidServiceUrls
*/
@@ -699,7 +802,8 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
}
/**
- * add an 'empty' JABA server to the list
+ * add an 'empty' JABA server to the list. Only servers not already in the
+ * 'bad URL' list will be added to this list.
*
* @param jwsservers
*/
@@ -709,7 +813,10 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
{
urlsWithoutServices = new Vector();
}
- if (!urlsWithoutServices.contains(jwsservers))
+
+ if ((invalidServiceUrls == null || !invalidServiceUrls
+ .contains(jwsservers))
+ && !urlsWithoutServices.contains(jwsservers))
{
urlsWithoutServices.add(jwsservers);
}
@@ -746,7 +853,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
if (getInvalidServiceUrls() != null
&& getInvalidServiceUrls().size() > 0)
{
- ermsg.append("Invalid Service URLS: \n");
+ ermsg.append("URLs that could not be contacted: \n");
for (String svcurl : getInvalidServiceUrls())
{
if (list)
@@ -783,4 +890,144 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
return null;
}
+ public int getServerStatusFor(String url)
+ {
+ if (validServiceUrls != null && validServiceUrls.contains(url))
+ {
+ return 1;
+ }
+ if (urlsWithoutServices != null && urlsWithoutServices.contains(url))
+ {
+ return 0;
+ }
+ if (invalidServiceUrls != null && invalidServiceUrls.contains(url))
+ {
+ return -1;
+ }
+ return -2;
+ }
+
+ /**
+ * pick the user's preferred service based on a set of URLs (jaba server
+ * locations) and service URIs (specifying version and service interface
+ * class)
+ *
+ * @param serviceURL
+ * @return null or best match for given uri/ls.
+ */
+ public Jws2Instance getPreferredServiceFor(String[] serviceURLs)
+ {
+ HashSet urls = new HashSet();
+ urls.addAll(Arrays.asList(serviceURLs));
+ Jws2Instance match = null;
+ if (services != null)
+ {
+ for (Jws2Instance svc : services)
+ {
+ if (urls.contains(svc.getServiceTypeURI()))
+ {
+ if (match == null)
+ {
+ // for moment we always pick service from server ordered first in
+ // user's preferences
+ match = svc;
+ }
+ if (urls.contains(svc.getUri()))
+ {
+ // stop and return - we've matched type URI and URI for service
+ // endpoint
+ return svc;
+ }
+ }
+ }
+ }
+ return match;
+ }
+
+ Map> preferredServiceMap = new HashMap>();;
+
+ /**
+ * get current preferred service of the given type, or global default
+ *
+ * @param af
+ * null or a specific alignFrame
+ * @param serviceType
+ * Jws2Instance.serviceType for service
+ * @return null if no service of this type is available, the preferred service
+ * for the serviceType and af if specified and if defined.
+ */
+ public Jws2Instance getPreferredServiceFor(AlignFrame af,
+ String serviceType)
+ {
+ String serviceurl = null;
+ synchronized (preferredServiceMap)
+ {
+ String afid = (af == null) ? "" : af.getViewport().getSequenceSetId();
+ Map prefmap = preferredServiceMap.get(afid);
+ if (afid.length() > 0 && prefmap == null)
+ {
+ // recover global setting, if any
+ prefmap = preferredServiceMap.get("");
+ }
+ if (prefmap != null)
+ {
+ serviceurl = prefmap.get(serviceType);
+ }
+
+ }
+ Jws2Instance response = null;
+ for (Jws2Instance svc : services)
+ {
+ if (svc.serviceType.equals(serviceType))
+ {
+ if (serviceurl == null || serviceurl.equals(svc.getHost()))
+ {
+ response = svc;
+ break;
+ }
+ }
+ }
+ return response;
+ }
+
+ public void setPreferredServiceFor(AlignFrame af, String serviceType,
+ String serviceAction, Jws2Instance selectedServer)
+ {
+ String afid = (af == null) ? "" : af.getViewport().getSequenceSetId();
+ if (preferredServiceMap == null)
+ {
+ preferredServiceMap = new HashMap>();
+ }
+ Map prefmap = preferredServiceMap.get(afid);
+ if (prefmap == null)
+ {
+ prefmap = new HashMap();
+ preferredServiceMap.put(afid, prefmap);
+ }
+ prefmap.put(serviceType, selectedServer.getHost());
+ prefmap.put(serviceAction, selectedServer.getHost());
+ }
+
+ public void setPreferredServiceFor(String serviceType,
+ String serviceAction, Jws2Instance selectedServer)
+ {
+ setPreferredServiceFor(null, serviceType, serviceAction, selectedServer);
+ }
+
+ /**
+ * Set a URL to try before any others. For use with command-line parameter to
+ * configure a local Jabaws installation without the need to add to property
+ * files.
+ *
+ * @param value
+ * @throws MalformedURLException
+ */
+ public void setPreferredUrl(String value) throws MalformedURLException
+ {
+ if (value != null && value.trim().length() > 0)
+ {
+ new URL(value);
+ preferredUrl = value;
+ }
+ }
}