Other necessary changes

diff --git a/webservices/compbio/stat/servlet/ServiceStatus.java b/webservices/compbio/stat/servlet/ServiceStatus.java
index 7b1d5ed..01b538f 100644 (file)
--- 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 {\r
 \r
                StringBuffer jabawspath = req.getRequestURL();\r
-               jabawspath = jabawspath.delete(jabawspath.lastIndexOf("/"),\r
-                               jabawspath.length());\r
+               jabawspath = jabawspath.delete(jabawspath.lastIndexOf("/"), jabawspath.length());\r
                String serverPath = jabawspath.toString();\r
 \r
                List<ServiceTestResult> testResults = new ArrayList<ServiceTestResult>();\r
@@ -50,8 +49,8 @@ public class ServiceStatus extends HttpServlet {
                                result.failed = tester.checkService(service);\r
                        } catch (Exception e) {\r
                                log.info(e, e.getCause());\r
-                               writer.println("Fails to connect to a web service: " + service\r
-                                               + " With " + e.getLocalizedMessage() + "\nDetails: ");\r
+                               String mess = "Fails to connect to the web service: " + service + ". Reason: ";\r
+                               writer.println(mess + e.getLocalizedMessage() + "\nDetails: ");\r
                                e.printStackTrace(writer);\r
                        } finally {\r
                                writer.close();\r
@@ -60,8 +59,7 @@ public class ServiceStatus extends HttpServlet {
                        testResults.add(result);\r
                }\r
                req.setAttribute("results", testResults);\r
-               RequestDispatcher rd = req\r
-                               .getRequestDispatcher("statpages/ServicesStatus.jsp");\r
+               RequestDispatcher rd = req.getRequestDispatcher("statpages/ServicesStatus.jsp");\r
                rd.forward(req, resp);\r
        }\r
 \r

diff --git a/webservices/compbio/ws/server/JpredWS.java b/webservices/compbio/ws/server/JpredWS.java
index 61ec773..edf17a1 100644 (file)
--- a/webservices/compbio/ws/server/JpredWS.java
+++ b/webservices/compbio/ws/server/JpredWS.java
@@ -20,7 +20,6 @@
 package compbio.ws.server;\r
 \r
 import java.io.File;\r
-import java.util.Arrays;\r
 import java.util.List;\r
 \r
 import javax.jws.WebService;\r
@@ -41,7 +40,7 @@ import compbio.metadata.UnsupportedRuntimeException;
 import compbio.metadata.WrongParameterException;\r
 import compbio.runner.predictors.Jpred;\r
 \r
-@WebService(endpointInterface = "compbio.data.msa.SequenceAnnotation", targetNamespace = JABAService.V2_SERVICE_NAMESPACE, serviceName = "JpredWS")\r
+@WebService(endpointInterface = "compbio.data.msa.SequenceAnnotation", targetNamespace = JABAService.V3_SERVICE_NAMESPACE, serviceName = "JpredWS")\r
 public class JpredWS extends SequenceAnnotationService<Jpred>\r
                implements SequenceAnnotation<Jpred> {\r
 \r

diff --git a/webservices/compbio/ws/server/WSUtil.java b/webservices/compbio/ws/server/WSUtil.java
index ebf4b3e..e6dd02d 100644 (file)
--- 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) {\r
                        if (len == 0) {\r
                                len = fs.getLength();\r
-                               System.out.println("1st FASTA rec: id = " + fs.getId() + ": seq = " + fs.getSequence());\r
                                continue;\r
                        }\r
                        if (fs.getLength() != len) {\r

diff --git a/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd b/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
index 1b7e031..94b5696 100644 (file)
--- 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>