From a48ecc5f78c22682774e01d66aa9636d2d483431 Mon Sep 17 00:00:00 2001 From: Sasha Sherstnev Date: Fri, 6 Sep 2013 16:25:57 +0100 Subject: [PATCH] Switch to olde namespace --- webservices/compbio/ws/server/ClustalOWS.java | 2 +- webservices/compbio/ws/server/JpredWS.java | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/webservices/compbio/ws/server/ClustalOWS.java b/webservices/compbio/ws/server/ClustalOWS.java index 0ea6f39..898b3ad 100644 --- a/webservices/compbio/ws/server/ClustalOWS.java +++ b/webservices/compbio/ws/server/ClustalOWS.java @@ -48,7 +48,7 @@ import compbio.metadata.WrongParameterException; import compbio.runner.Util; import compbio.runner.msa.ClustalO; -@WebService(endpointInterface = "compbio.data.msa.MsaWS", targetNamespace = JABAService.V2_SERVICE_NAMESPACE, serviceName = "ClustalOWS") +@WebService(endpointInterface = "compbio.data.msa.MsaWS", targetNamespace = JABAService.SERVICE_NAMESPACE, serviceName = "ClustalOWS") public class ClustalOWS implements MsaWS { private static Logger log = Logger.getLogger(ClustalOWS.class); diff --git a/webservices/compbio/ws/server/JpredWS.java b/webservices/compbio/ws/server/JpredWS.java index eebc96f..42529fc 100644 --- a/webservices/compbio/ws/server/JpredWS.java +++ b/webservices/compbio/ws/server/JpredWS.java @@ -48,15 +48,13 @@ import compbio.metadata.WrongParameterException; import compbio.runner.Util; import compbio.runner.predictors.Jpred; -@WebService(endpointInterface = "compbio.data.msa.MsaWS", targetNamespace = JABAService.V2_SERVICE_NAMESPACE, serviceName = "JpredWS") +@WebService(endpointInterface = "compbio.data.msa.MsaWS", targetNamespace = JABAService.SERVICE_NAMESPACE, serviceName = "JpredWS") public class JpredWS implements MsaWS { private static Logger log = Logger.getLogger(JpredWS.class); private static final RunnerConfig jpredOptions = Util.getSupportedOptions(Jpred.class); - private static final PresetManager jpredPresets = Util.getPresets(Jpred.class); - private static final LimitsManager limitMan = compbio.engine.client.Util.getLimits(new Jpred().getType()); @Override @@ -74,15 +72,15 @@ public class JpredWS implements MsaWS { jpred.setInput(SkeletalExecutable.INPUT); jpred.setOutput(SkeletalExecutable.OUTPUT); jpred.setError(SkeletalExecutable.ERROR); - ConfiguredExecutable confClust = Configurator.configureExecutable(jpred, dataSet); + ConfiguredExecutable confJpred = Configurator.configureExecutable(jpred, dataSet); // Set the number of threads for the cluster execution from conf file - if (confClust.getExecProvider() == Executable.ExecProvider.Cluster) { + if (confJpred.getExecProvider() == Executable.ExecProvider.Cluster) { int clusterCpuNum = SkeletalExecutable.getClusterCpuNum(jpred.getType()); if (clusterCpuNum != 0) { jpred.setNCore(clusterCpuNum); } } - return confClust; + return confJpred; } @Override -- 1.7.10.2