From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Thu, 5 Sep 2013 09:52:55 +0000 (+0100)
Subject: Other necessary changes
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=106ac6887581e5d4fc734158e0258b409f563637;p=jabaws.git

Other necessary changes
---

diff --git a/webservices/compbio/stat/servlet/ServiceStatus.java b/webservices/compbio/stat/servlet/ServiceStatus.java
index 7b1d5ed..01b538f 100644
--- a/webservices/compbio/stat/servlet/ServiceStatus.java
+++ b/webservices/compbio/stat/servlet/ServiceStatus.java
@@ -35,8 +35,7 @@ public class ServiceStatus extends HttpServlet {
 			throws ServletException, IOException {
 
 		StringBuffer jabawspath = req.getRequestURL();
-		jabawspath = jabawspath.delete(jabawspath.lastIndexOf("/"),
-				jabawspath.length());
+		jabawspath = jabawspath.delete(jabawspath.lastIndexOf("/"), jabawspath.length());
 		String serverPath = jabawspath.toString();
 
 		List<ServiceTestResult> testResults = new ArrayList<ServiceTestResult>();
@@ -50,8 +49,8 @@ public class ServiceStatus extends HttpServlet {
 				result.failed = tester.checkService(service);
 			} catch (Exception e) {
 				log.info(e, e.getCause());
-				writer.println("Fails to connect to a web service: " + service
-						+ " With " + e.getLocalizedMessage() + "\nDetails: ");
+				String mess = "Fails to connect to the web service: " + service + ". Reason: ";
+				writer.println(mess + e.getLocalizedMessage() + "\nDetails: ");
 				e.printStackTrace(writer);
 			} finally {
 				writer.close();
@@ -60,8 +59,7 @@ public class ServiceStatus extends HttpServlet {
 			testResults.add(result);
 		}
 		req.setAttribute("results", testResults);
-		RequestDispatcher rd = req
-				.getRequestDispatcher("statpages/ServicesStatus.jsp");
+		RequestDispatcher rd = req.getRequestDispatcher("statpages/ServicesStatus.jsp");
 		rd.forward(req, resp);
 	}
 
diff --git a/webservices/compbio/ws/server/JpredWS.java b/webservices/compbio/ws/server/JpredWS.java
index 61ec773..edf17a1 100644
--- a/webservices/compbio/ws/server/JpredWS.java
+++ b/webservices/compbio/ws/server/JpredWS.java
@@ -20,7 +20,6 @@
 package compbio.ws.server;
 
 import java.io.File;
-import java.util.Arrays;
 import java.util.List;
 
 import javax.jws.WebService;
@@ -41,7 +40,7 @@ import compbio.metadata.UnsupportedRuntimeException;
 import compbio.metadata.WrongParameterException;
 import compbio.runner.predictors.Jpred;
 
-@WebService(endpointInterface = "compbio.data.msa.SequenceAnnotation", targetNamespace = JABAService.V2_SERVICE_NAMESPACE, serviceName = "JpredWS")
+@WebService(endpointInterface = "compbio.data.msa.SequenceAnnotation", targetNamespace = JABAService.V3_SERVICE_NAMESPACE, serviceName = "JpredWS")
 public class JpredWS extends SequenceAnnotationService<Jpred>
 		implements SequenceAnnotation<Jpred> {
 
diff --git a/webservices/compbio/ws/server/WSUtil.java b/webservices/compbio/ws/server/WSUtil.java
index ebf4b3e..e6dd02d 100644
--- a/webservices/compbio/ws/server/WSUtil.java
+++ b/webservices/compbio/ws/server/WSUtil.java
@@ -173,7 +173,6 @@ public final class WSUtil {
 		for (FastaSequence fs : sequences) {
 			if (len == 0) {
 				len = fs.getLength();
-				System.out.println("1st FASTA rec: id = " + fs.getId() + ": seq = " + fs.getSequence());
 				continue;
 			}
 			if (fs.getLength() != len) {
diff --git a/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd b/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
index 1b7e031..94b5696 100644
--- a/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
@@ -9,6 +9,10 @@
 
   <xs:element name="getLastTestedResponse" type="tns:getLastTestedResponse"/>
 
+  <xs:element name="getNonoperatedServices" type="tns:getNonoperatedServices"/>
+
+  <xs:element name="getNonoperatedServicesResponse" type="tns:getNonoperatedServicesResponse"/>
+
   <xs:element name="getServiceCategories" type="tns:getServiceCategories"/>
 
   <xs:element name="getServiceCategoriesResponse" type="tns:getServiceCategoriesResponse"/>
@@ -77,6 +81,16 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="getNonoperatedServices">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getNonoperatedServicesResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:services" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getServiceCategories">
     <xs:sequence/>
   </xs:complexType>