X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=WEB-INF%2Fweb.xml;h=794c4cb65dda23a189972cee2b43e95a68aa41e2;hb=9f81a03cf11728726a45917773e3c42195b471c2;hp=090a9786b2b72d72983170d796e1476cfa32ce09;hpb=535359a3d592ee41bda72e7356f0181f6cee9d07;p=jabaws.git

diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
index 090a978..794c4cb 100644
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -3,13 +3,16 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
     version="2.4">
 
-    <display-name>Jalview Web Services</display-name>
-    <description>Jalview Web Services v2.0</description>
+    <display-name>JABAWS</display-name>
+    <description>JAva Bioinformatics Analysis Web Services (JABAWS) v.2</description>
 
 	<listener>
 		<listener-class>compbio.ws.server.ShutdownEngines</listener-class>
 	</listener>
     <listener>
+        <listener-class>compbio.stat.servlet.StatisticCollector</listener-class>
+     </listener>
+    <listener>
         <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
     </listener>
     
@@ -17,42 +20,163 @@
 	<session-config>
    		<session-timeout>20</session-timeout>
     </session-config>
+ 
+     <servlet>
+        <display-name>This is a standard tomcat 'default' servlet for making listings</display-name>
+        <servlet-name>listings</servlet-name>
+        <servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
+        <init-param>
+            <param-name>debug</param-name>
+            <param-value>0</param-value>
+        </init-param>
+        <init-param>
+            <param-name>readonly</param-name>
+            <param-value>true</param-value>
+        </init-param>
+        <init-param>
+            <param-name>listings</param-name>
+            <param-value>true</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
 
     <servlet>
+    	<description>Display pre-calculated accounting info</description>
+    	<servlet-name>DisplayStat</servlet-name>
+    	<servlet-class>compbio.stat.servlet.DisplayStat</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/>
+        <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/>
+        <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/>
+        <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/>
+        <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/>
+        <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-mapping>
+    	<servlet-name>listings</servlet-name>
+    	<url-pattern>/</url-pattern>
+  	</servlet-mapping>
+  	     
+    <servlet-mapping>
+    	<servlet-name>DisplayStat</servlet-name>
+    	<url-pattern>/DisplayStat</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>
@@ -72,12 +196,40 @@
     	<servlet-name>ProbconsWS</servlet-name>
     	<url-pattern>/ProbconsWS</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>
    
    <security-constraint>
     <web-resource-collection>
     	<web-resource-name>Administrator pages</web-resource-name>
    		<!-- Prohibit access to any resources -->
+    	<url-pattern>/</url-pattern>
+    	<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>/jobsout/*</url-pattern>
@@ -107,13 +259,13 @@
       <!-- Define the Login Configuration for this Application -->
   <login-config>
    	 <auth-method>BASIC</auth-method>
-  	 <realm-name>JWS2 admins</realm-name>
+  	 <realm-name>JABAWS administrators</realm-name>
   </login-config>
   
     <!-- Security roles referenced by this web application -->
   <security-role>
     <description>
-      The role that is required to log in and view JWS2 internals
+      The role that is required to log in and view JABAWS internals
     </description>
     <role-name>admin</role-name>
   </security-role>