From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Thu, 21 Nov 2013 12:08:52 +0000 (+0000)
Subject: correct wb.xml
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e56c107357b1ac4c8c01329f467781f45db1ffd7;p=proteocache.git

correct wb.xml
---

diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
index b8436c2..3f4654f 100644
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -14,13 +14,8 @@
 	<listener>
 		<listener-class>compbio.listeners.ContextListener</listener-class>
 	</listener>
-	<servlet-mapping>
-		<servlet-name>ServletDeleteRecord</servlet-name>
-		<url-pattern>/ServletDeleteRecord</url-pattern>
-	</servlet-mapping>
-
 
-	<!-- Session timeout in minutes -->
+		<!-- Session timeout in minutes -->
 	<session-config>
 		<session-timeout>20</session-timeout>
 	</session-config>
@@ -44,6 +39,7 @@
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
+
 	<servlet>
 		<description>
 		</description>
@@ -52,270 +48,11 @@
 		<servlet-class>compbio.listeners.ServletDeleteRecord</servlet-class>
 	</servlet>
 
-
-	<!-- ProteoCache servlets -->
-<!--
-	<servlet>
-		<description>Display pre-calculated accounting info</description>
-		<servlet-name>DisplayStat</servlet-name>
-		<servlet-class>compbio.stat.servlet.DisplayStat</servlet-class>
-	</servlet>
-
-	<servlet>
-		<description>WebServices Status</description>
-		<servlet-name>ServiceStatus</servlet-name>
-		<servlet-class>compbio.stat.servlet.ServiceStatus</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>DownloadRedirector</servlet-name>
-		<servlet-class>compbio.stat.servlet.DownloadRedirector</servlet-class>
-	</servlet>
-
-	<servlet>
-		<description>WebService Status with no UI. Accepts web service name as a parameter</description>
-		<servlet-name>HttpCodeResponseServiceStatus</servlet-name>
-		<servlet-class>compbio.stat.servlet.HttpCodeResponseServiceStatus</servlet-class>
-	</servlet>
-
-	<servlet>
-		<description>Display job list</description>
-		<servlet-name>Joblist</servlet-name>
-		<servlet-class>compbio.stat.servlet.Joblist</servlet-class>
-	</servlet>
-
-	<servlet>
-		<description>Display monthly summary statistics</description>
-		<servlet-name>AnnualStat</servlet-name>
-		<servlet-class>compbio.stat.servlet.AnnualStat</servlet-class>
-	</servlet>
-
-	<servlet>
-		<description>Display monthly summary statistics with no links to details</description>
-		<servlet-name>PublicAnnualStat</servlet-name>
-		<servlet-class>compbio.stat.servlet.AnnualStat</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>RegistryWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>ClustalWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>ClustalOWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>MuscleWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>MafftWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>TcoffeeWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>ProbconsWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>MSAprobsWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>GLprobsWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>AAConWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>JronnWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>DisemblWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>GlobPlotWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>IUPredWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<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>
-		<servlet-name>RNAalifoldWS</servlet-name>
-		<servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
--->
-
-
-
-	<!-- ProteoCache servlet mappings -->
-<!--
-	<servlet-mapping>
-		<servlet-name>listings</servlet-name>
-		<url-pattern>/</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>DownloadRedirector</servlet-name>
-		<url-pattern>/download</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>DisplayStat</servlet-name>
-		<url-pattern>/DisplayStat</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>ServiceStatus</servlet-name>
-		<url-pattern>/ServiceStatus</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>HttpCodeResponseServiceStatus</servlet-name>
-		<url-pattern>/HttpCodeResponseServiceStatus/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>AnnualStat</servlet-name>
-		<url-pattern>/AnnualStat</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>PublicAnnualStat</servlet-name>
-		<url-pattern>/PublicAnnualStat</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>Joblist</servlet-name>
-		<url-pattern>/Joblist</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>RegistryWS</servlet-name>
-		<url-pattern>/RegistryWS</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>ClustalWS</servlet-name>
-		<url-pattern>/ClustalWS</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>ClustalOWS</servlet-name>
-		<url-pattern>/ClustalOWS</url-pattern>
-	</servlet-mapping>
-
 	<servlet-mapping>
-		<servlet-name>MuscleWS</servlet-name>
-		<url-pattern>/MuscleWS</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>MafftWS</servlet-name>
-		<url-pattern>/MafftWS</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>TcoffeeWS</servlet-name>
-		<url-pattern>/TcoffeeWS</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>ProbconsWS</servlet-name>
-		<url-pattern>/ProbconsWS</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>MSAprobsWS</servlet-name>
-		<url-pattern>/MSAprobsWS</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>GLprobsWS</servlet-name>
-		<url-pattern>/GLprobsWS</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>AAConWS</servlet-name>
-		<url-pattern>/AAConWS</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>JronnWS</servlet-name>
-		<url-pattern>/JronnWS</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>DisemblWS</servlet-name>
-		<url-pattern>/DisemblWS</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>GlobPlotWS</servlet-name>
-		<url-pattern>/GlobPlotWS</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>IUPredWS</servlet-name>
-		<url-pattern>/IUPredWS</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>JpredWS</servlet-name>
-		<url-pattern>/JpredWS</url-pattern>
+		<servlet-name>ServletDeleteRecord</servlet-name>
+		<url-pattern>/ServletDeleteRecord</url-pattern>
 	</servlet-mapping>
 
-	<servlet-mapping>
-		<servlet-name>RNAalifoldWS</servlet-name>
-		<url-pattern>/RNAalifoldWS</url-pattern>
-	</servlet-mapping>
--->
 
 
 	<!-- ProteoCache security constraints -->
@@ -325,9 +62,7 @@
 			<!-- Prohibit access to any resources -->
 			<url-pattern>/DisplayStat</url-pattern>
 			<url-pattern>/Joblist</url-pattern>
-			<url-pattern>/AnnualStat</url-pattern>
 			<url-pattern>/conf/*</url-pattern>
-			<url-pattern>/binaries/*</url-pattern>
 			<url-pattern>/testsrc/*</url-pattern>
 			<url-pattern>/lib/*</url-pattern>
 			<!-- Uncomment this to secure services status checker