Web services status checking servlets, new clustalo x32 binary from Fabian, other...

[jabaws.git] / WEB-INF / web.xml

diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
index 99f45b7..efe8bf6 100644 (file)
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -10,73 +10,198 @@
                <listener-class>compbio.ws.server.ShutdownEngines</listener-class>\r
        </listener>\r
     <listener>\r
+        <listener-class>compbio.stat.servlet.StatisticCollector</listener-class>\r
+     </listener>\r
+     <listener>\r
+        <listener-class>compbio.ws.server.SetExecutableFlag</listener-class>\r
+     </listener>\r
+     <listener>\r
         <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>\r
-    </listener>\r
+     </listener>\r
     \r
        <!-- Session timeout in minutes -->\r
        <session-config>\r
                <session-timeout>20</session-timeout>\r
     </session-config>\r
+ \r
+     <servlet>\r
+        <display-name>This is a standard tomcat 'default' servlet for making listings</display-name>\r
+        <servlet-name>listings</servlet-name>\r
+        <servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>\r
+        <init-param>\r
+            <param-name>debug</param-name>\r
+            <param-value>0</param-value>\r
+        </init-param>\r
+        <init-param>\r
+            <param-name>readonly</param-name>\r
+            <param-value>true</param-value>\r
+        </init-param>\r
+        <init-param>\r
+            <param-name>listings</param-name>\r
+            <param-value>true</param-value>\r
+        </init-param>\r
+        <load-on-startup>1</load-on-startup>\r
+    </servlet>\r
 \r
     <servlet>\r
+       <description>Display pre-calculated accounting info</description>\r
+       <servlet-name>DisplayStat</servlet-name>\r
+       <servlet-class>compbio.stat.servlet.DisplayStat</servlet-class>\r
+    </servlet>\r
+  \r
+   <servlet>\r
+       <description>WebServices Status</description>\r
+       <servlet-name>ServiceStatus</servlet-name>\r
+       <servlet-class>compbio.stat.servlet.ServiceStatus</servlet-class>\r
+    </servlet>\r
+   \r
+    <servlet>\r
+       <description>WebService Status with no UI. Accepts web service name as a parameter</description>\r
+       <servlet-name>HttpCodeResponseServiceStatus</servlet-name>\r
+       <servlet-class>compbio.stat.servlet.HttpCodeResponseServiceStatus</servlet-class>\r
+    </servlet>\r
+    \r
+    <servlet>\r
+       <description>Display job list</description>\r
+       <servlet-name>Joblist</servlet-name>\r
+       <servlet-class>compbio.stat.servlet.Joblist</servlet-class>\r
+    </servlet>\r
+    \r
+    <servlet>\r
+       <description>Display monthly summary statistics</description>\r
+       <servlet-name>AnnualStat</servlet-name>\r
+       <servlet-class>compbio.stat.servlet.AnnualStat</servlet-class>\r
+    </servlet>\r
+    \r
+     <servlet>\r
+       <description>Display monthly summary statistics with no links to details</description>\r
+       <servlet-name>PublicAnnualStat</servlet-name>\r
+       <servlet-class>compbio.stat.servlet.AnnualStat</servlet-class>\r
+    </servlet>\r
+    \r
+    <servlet>\r
+        <servlet-name>RegistryWS</servlet-name>\r
+        <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
+        <load-on-startup>1</load-on-startup>\r
+    </servlet>\r
+    \r
+    <servlet>\r
         <servlet-name>ClustalWS</servlet-name>\r
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
-        <load-on-startup/>\r
+        <load-on-startup>1</load-on-startup>\r
+    </servlet>\r
+    \r
+    <servlet>\r
+        <servlet-name>ClustalOWS</servlet-name>\r
+        <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
+        <load-on-startup>1</load-on-startup>\r
     </servlet>\r
     \r
     <servlet>\r
         <servlet-name>MuscleWS</servlet-name>\r
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
-        <load-on-startup/>\r
+        <load-on-startup>1</load-on-startup>\r
     </servlet>\r
     \r
     <servlet>\r
         <servlet-name>MafftWS</servlet-name>\r
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
-        <load-on-startup/>\r
+        <load-on-startup>1</load-on-startup>\r
     </servlet>\r
     \r
     <servlet>\r
         <servlet-name>TcoffeeWS</servlet-name>\r
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
-        <load-on-startup/>\r
+        <load-on-startup>1</load-on-startup>\r
     </servlet>\r
      \r
     <servlet>\r
         <servlet-name>ProbconsWS</servlet-name>\r
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
-        <load-on-startup/>\r
+        <load-on-startup>1</load-on-startup>\r
     </servlet>\r
     \r
      <servlet>\r
         <servlet-name>AAConWS</servlet-name>\r
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
-        <load-on-startup/>\r
+        <load-on-startup>1</load-on-startup>\r
     </servlet>\r
    \r
      <servlet>\r
         <servlet-name>JronnWS</servlet-name>\r
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
-        <load-on-startup/>\r
+        <load-on-startup>1</load-on-startup>\r
     </servlet>\r
 \r
      <servlet>\r
         <servlet-name>DisemblWS</servlet-name>\r
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
-        <load-on-startup/>\r
+               <load-on-startup>1</load-on-startup>\r
     </servlet>\r
     \r
     <servlet>\r
         <servlet-name>GlobPlotWS</servlet-name>\r
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
-        <load-on-startup/>\r
+        <load-on-startup>1</load-on-startup>\r
+    </servlet>\r
+    \r
+     <servlet>\r
+        <servlet-name>IUPredWS</servlet-name>\r
+        <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
+        <load-on-startup>1</load-on-startup>\r
     </servlet>\r
-         \r
+   \r
+    <servlet-mapping>\r
+       <servlet-name>listings</servlet-name>\r
+       <url-pattern>/</url-pattern>\r
+       </servlet-mapping>\r
+            \r
+    <servlet-mapping>\r
+       <servlet-name>DisplayStat</servlet-name>\r
+       <url-pattern>/DisplayStat</url-pattern>\r
+       </servlet-mapping>\r
+       \r
+       <servlet-mapping>\r
+       <servlet-name>ServiceStatus</servlet-name>\r
+       <url-pattern>/ServiceStatus</url-pattern>\r
+       </servlet-mapping>\r
+       \r
+       <servlet-mapping>\r
+       <servlet-name>HttpCodeResponseServiceStatus</servlet-name>\r
+       <url-pattern>/HttpCodeResponseServiceStatus/*</url-pattern>\r
+       </servlet-mapping>\r
+       \r
+        <servlet-mapping>\r
+       <servlet-name>AnnualStat</servlet-name>\r
+       <url-pattern>/AnnualStat</url-pattern>\r
+       </servlet-mapping>  \r
+    \r
+     <servlet-mapping>\r
+       <servlet-name>PublicAnnualStat</servlet-name>\r
+       <url-pattern>/PublicAnnualStat</url-pattern>\r
+       </servlet-mapping>  \r
+    \r
+    \r
+    <servlet-mapping>\r
+       <servlet-name>Joblist</servlet-name>\r
+       <url-pattern>/Joblist</url-pattern>\r
+       </servlet-mapping> \r
+       \r
+    <servlet-mapping>\r
+       <servlet-name>RegistryWS</servlet-name>\r
+       <url-pattern>/RegistryWS</url-pattern>\r
+    </servlet-mapping>\r
+    \r
     <servlet-mapping>\r
        <servlet-name>ClustalWS</servlet-name>\r
        <url-pattern>/ClustalWS</url-pattern>\r
     </servlet-mapping>\r
     \r
+     <servlet-mapping>\r
+       <servlet-name>ClustalOWS</servlet-name>\r
+       <url-pattern>/ClustalOWS</url-pattern>\r
+    </servlet-mapping>\r
+    \r
     <servlet-mapping>\r
        <servlet-name>MuscleWS</servlet-name>\r
        <url-pattern>/MuscleWS</url-pattern>\r
@@ -117,16 +242,26 @@
        <url-pattern>/GlobPlotWS</url-pattern>\r
    </servlet-mapping>\r
    \r
+    <servlet-mapping>\r
+       <servlet-name>IUPredWS</servlet-name>\r
+       <url-pattern>/IUPredWS</url-pattern>\r
+   </servlet-mapping>\r
+   \r
    <security-constraint>\r
     <web-resource-collection>\r
        <web-resource-name>Administrator pages</web-resource-name>\r
                <!-- Prohibit access to any resources -->\r
+       <url-pattern>/</url-pattern>\r
+       <url-pattern>/DisplayStat</url-pattern>\r
+       <url-pattern>/Joblist</url-pattern>\r
+       <url-pattern>/AnnualStat</url-pattern>\r
        <url-pattern>/conf/*</url-pattern>\r
                <url-pattern>/binaries/*</url-pattern>\r
                <url-pattern>/jobsout/*</url-pattern>\r
                <url-pattern>/testsrc/*</url-pattern>\r
                <url-pattern>/lib/*</url-pattern>\r
                <url-pattern>/test-output/*</url-pattern>\r
+               <url-pattern>/HttpCodeResponseServiceStatus/*</url-pattern>\r
        <!-- No http-method means all methods are constrained -->\r
     </web-resource-collection>\r
     <auth-constraint>\r