Switch to olde namespace

diff --git a/webservices/compbio/ws/server/ClustalOWS.java b/webservices/compbio/ws/server/ClustalOWS.java
index 0ea6f39..898b3ad 100644 (file)
--- 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;\r
 import compbio.runner.msa.ClustalO;\r
 \r
-@WebService(endpointInterface = "compbio.data.msa.MsaWS", targetNamespace = JABAService.V2_SERVICE_NAMESPACE, serviceName = "ClustalOWS")\r
+@WebService(endpointInterface = "compbio.data.msa.MsaWS", targetNamespace = JABAService.SERVICE_NAMESPACE, serviceName = "ClustalOWS")\r
 public class ClustalOWS implements MsaWS<ClustalO> {\r
 \r
        private static Logger log = Logger.getLogger(ClustalOWS.class);\r

diff --git a/webservices/compbio/ws/server/JpredWS.java b/webservices/compbio/ws/server/JpredWS.java
index eebc96f..42529fc 100644 (file)
--- 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;\r
 import compbio.runner.predictors.Jpred;\r
 \r
-@WebService(endpointInterface = "compbio.data.msa.MsaWS", targetNamespace = JABAService.V2_SERVICE_NAMESPACE, serviceName = "JpredWS")\r
+@WebService(endpointInterface = "compbio.data.msa.MsaWS", targetNamespace = JABAService.SERVICE_NAMESPACE, serviceName = "JpredWS")\r
 public class JpredWS implements MsaWS<Jpred> {\r
 \r
        private static Logger log = Logger.getLogger(JpredWS.class);\r
 \r
        private static final RunnerConfig<Jpred> jpredOptions = Util.getSupportedOptions(Jpred.class);\r
-\r
        private static final PresetManager<Jpred> jpredPresets = Util.getPresets(Jpred.class);\r
-\r
        private static final LimitsManager<Jpred> limitMan = compbio.engine.client.Util.getLimits(new Jpred().getType());\r
 \r
        @Override\r
@@ -74,15 +72,15 @@ public class JpredWS implements MsaWS<Jpred> {
                jpred.setInput(SkeletalExecutable.INPUT);\r
                jpred.setOutput(SkeletalExecutable.OUTPUT);\r
                jpred.setError(SkeletalExecutable.ERROR);\r
-               ConfiguredExecutable<Jpred> confClust = Configurator.configureExecutable(jpred, dataSet);\r
+               ConfiguredExecutable<Jpred> confJpred = Configurator.configureExecutable(jpred, dataSet);\r
                // Set the number of threads for the cluster execution from conf file\r
-               if (confClust.getExecProvider() == Executable.ExecProvider.Cluster) {\r
+               if (confJpred.getExecProvider() == Executable.ExecProvider.Cluster) {\r
                        int clusterCpuNum = SkeletalExecutable.getClusterCpuNum(jpred.getType());\r
                        if (clusterCpuNum != 0) {\r
                                jpred.setNCore(clusterCpuNum);\r
                        }\r
                }\r
-               return confClust;\r
+               return confJpred;\r
        }\r
 \r
        @Override\r