From 5d13c9c9a9be1aac68cfb36a1856d3b1c3084741 Mon Sep 17 00:00:00 2001
From: Natasha Sherstneva <n.shertneva@gmail.com>
Date: Tue, 10 Dec 2013 22:08:39 +0000
Subject: [PATCH] Lost file for committed not-working WS

---
 WEB-INF/web.xml                               |   12 ++++++++++++
 datadb/compbio/cassandra/CassandraReader.java |    2 +-
 server/compbio/ws/jpred/JpredWS.java          |    4 +---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
index 2032623..937633c 100644
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -58,6 +58,18 @@
 	<listener>
 		<listener-class>compbio.listeners.ContextListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
+	</listener>
+	<servlet>
+		<servlet-name>JpredWS</servlet-name>
+		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>JpredWS</servlet-name>
+		<url-pattern>/JpredWS</url-pattern>
+	</servlet-mapping>
 
 	<!-- Session timeout in minutes -->
 	<session-config>
diff --git a/datadb/compbio/cassandra/CassandraReader.java b/datadb/compbio/cassandra/CassandraReader.java
index 00a9f27..81add8f 100644
--- a/datadb/compbio/cassandra/CassandraReader.java
+++ b/datadb/compbio/cassandra/CassandraReader.java
@@ -118,7 +118,7 @@ public class CassandraReader {
 		String com = "SELECT JobID, Predictions FROM ProteinRow WHERE Protein = '" + queryProtein + "';";
 		System.out.println("Command: " + com);
 		ResultSet results = session.execute(com);
-		if (results.isExhausted())
+		if (results.isExhausted()) 
 			return null;
 		final long queryTime = System.currentTimeMillis();
 		List<Row> rows = results.all();
diff --git a/server/compbio/ws/jpred/JpredWS.java b/server/compbio/ws/jpred/JpredWS.java
index 32b5399..2f208ad 100644
--- a/server/compbio/ws/jpred/JpredWS.java
+++ b/server/compbio/ws/jpred/JpredWS.java
@@ -5,9 +5,7 @@ import javax.jws.WebService;
 import compbio.cassandra.CassandraNativeConnector;
 import compbio.statistic.CassandraRequester;
 
-
-@WebService(endpointInterface = "compbio.ws.jpred.Jpred", 
-targetNamespace = "http://server.ws.compbio", serviceName = "JpredWS")
+@WebService(endpointInterface = "compbio.ws.jpred.Jpred", targetNamespace = "http://server.ws.compbio", serviceName = "JpredWS")
 public class JpredWS implements Jpred {
 
 	@Override
-- 
1.7.10.2