From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Thu, 12 Sep 2013 08:43:50 +0000 (+0100)
Subject: Remove un-necessary Axis servlets
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8b26fefcaefead85e2fb442f6c82a2c24a23dbe6;p=jabaws.git

Remove un-necessary Axis servlets
---

diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
index 6a3cea7..22df95e 100644
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -21,6 +21,7 @@
 		<listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
 	</listener>
 
+
 	<!-- Session timeout in minutes -->
 	<session-config>
 		<session-timeout>20</session-timeout>
@@ -160,26 +161,14 @@
 		<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-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>
-		<display-name>Apache-Axis Servlet</display-name>
-		<servlet-name>AxisServlet</servlet-name>
-		<servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<display-name>Axis Admin Servlet</display-name>
-		<servlet-name>AdminServlet</servlet-name>
-		<servlet-class>org.apache.axis.transport.http.AdminServlet</servlet-class>
-		<load-on-startup>100</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>JpredWS</servlet-name>
+		<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>
@@ -284,33 +273,17 @@
 		<servlet-name>IUPredWS</servlet-name>
 		<url-pattern>/IUPredWS</url-pattern>
 	</servlet-mapping>
-	
-	<servlet-mapping>
-		<servlet-name>RNAalifoldWS</servlet-name>
-		<url-pattern>/RNAalifoldWS</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>AxisServlet</servlet-name>
-		<url-pattern>/servlet/AxisServlet</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>AxisServlet</servlet-name>
-		<url-pattern>*.jws</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>AxisServlet</servlet-name>
-		<url-pattern>/services/*</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>AdminServlet</servlet-name>
-		<url-pattern>/servlet/AdminServlet</url-pattern>
-	</servlet-mapping>
 
 	<servlet-mapping>
 		<servlet-name>JpredWS</servlet-name>
 		<url-pattern>/JpredWS</url-pattern>
 	</servlet-mapping>
 
+	<servlet-mapping>
+		<servlet-name>RNAalifoldWS</servlet-name>
+		<url-pattern>/RNAalifoldWS</url-pattern>
+	</servlet-mapping>
+
 
 	<!-- JABAWS security constraints -->
 	<security-constraint>