From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Fri, 6 Sep 2013 15:25:57 +0000 (+0100)
Subject: Switch to olde namespace
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a48ecc5f78c22682774e01d66aa9636d2d483431;p=jabaws.git

Switch to olde namespace
---

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<ClustalO> {
 
 	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<Jpred> {
 
 	private static Logger log = Logger.getLogger(JpredWS.class);
 
 	private static final RunnerConfig<Jpred> jpredOptions = Util.getSupportedOptions(Jpred.class);
-
 	private static final PresetManager<Jpred> jpredPresets = Util.getPresets(Jpred.class);
-
 	private static final LimitsManager<Jpred> limitMan = compbio.engine.client.Util.getLimits(new Jpred().getType());
 
 	@Override
@@ -74,15 +72,15 @@ public class JpredWS implements MsaWS<Jpred> {
 		jpred.setInput(SkeletalExecutable.INPUT);
 		jpred.setOutput(SkeletalExecutable.OUTPUT);
 		jpred.setError(SkeletalExecutable.ERROR);
-		ConfiguredExecutable<Jpred> confClust = Configurator.configureExecutable(jpred, dataSet);
+		ConfiguredExecutable<Jpred> 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