X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJabaWsServerQuery.java;h=84aa1a68dc3cb4445dd88c8fd1943f23ff3484e6;hb=bc1a3842b31a35a7794f4afec4911ad421c7c3e4;hp=5831df860f1ae584ecbfacbc1291e5c6a51ec8a0;hpb=cb8e52fbbc5f725e3f7f48c672cdddb0690bd978;p=jalview.git diff --git a/src/jalview/ws/jws2/JabaWsServerQuery.java b/src/jalview/ws/jws2/JabaWsServerQuery.java index 5831df8..84aa1a6 100644 --- a/src/jalview/ws/jws2/JabaWsServerQuery.java +++ b/src/jalview/ws/jws2/JabaWsServerQuery.java @@ -117,7 +117,7 @@ public class JabaWsServerQuery implements Runnable registry = Jws2Client.connectToRegistry(jwsserver); if (registry != null) { - // System.err.println("Test Services Output\n" + // jalview.bin.Console.errPrintln("Test Services Output\n" // + registry.testAllServices()); // TODO: enumerate services and test those that haven't been tested // in the last n-days/hours/etc. @@ -126,23 +126,25 @@ public class JabaWsServerQuery implements Runnable srv_set = registry.getSupportedServices(); // dan test - System.out.println( + jalview.bin.Console.outPrintln( "registry.getSupportedServices: " + srv_set.toString()); svccategories = registry.getServiceCategories(); // dan test - // System.out.println("registry.getServiceCategories: " + + // jalview.bin.Console.outPrintln("registry.getServiceCategories: " + // + // svccategories.toString()); } } catch (Exception ex) { - System.err.println("Exception whilst trying to get at registry:"); + jalview.bin.Console.errPrintln( + "Exception whilst trying to get at registry:"); ex.printStackTrace(); // if that failed, then we are probably working with a JABAWS1 server. // in that case, look for each service endpoint - System.err.println("JWS2 Discoverer: " + jwsserver + jalview.bin.Console.errPrintln("JWS2 Discoverer: " + jwsserver + " is a JABAWS1 server. Using hardwired list."); for (Services srv : JABAWS1SERVERS) { @@ -169,8 +171,9 @@ public class JabaWsServerQuery implements Runnable service = Jws2Client.connect(jwsserver, srv); } catch (Exception e) { - System.err.println("Jws2 Discoverer: Problem on " + jwsserver - + " with service " + srv + ":\n" + e.getMessage()); + jalview.bin.Console.errPrintln("Jws2 Discoverer: Problem on " + + jwsserver + " with service " + srv + ":\n" + + e.getMessage()); if (!(e instanceof javax.xml.ws.WebServiceException)) { e.printStackTrace(); @@ -245,12 +248,12 @@ public class JabaWsServerQuery implements Runnable result = true; } catch (MalformedURLException e) { - System.err.println("Invalid server URL: " + server); + jalview.bin.Console.errPrintln("Invalid server URL: " + server); result = false; } catch (IOException e) { - System.err.println("Error connecting to server: " + server + ": " - + e.toString()); + jalview.bin.Console.errPrintln("Error connecting to server: " + + server + ": " + e.toString()); result = false; } }