different corrections

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

diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
index b03b1fe..9fccaaf 100644 (file)
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -12,21 +12,60 @@
     <listener>\r
         <listener-class>compbio.stat.servlet.StatisticCollector</listener-class>\r
      </listener>\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
+       <servlet-name>DownloadRedirector</servlet-name>\r
+       <servlet-class>compbio.stat.servlet.DownloadRedirector</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
@@ -39,6 +78,18 @@
        <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
@@ -46,6 +97,12 @@
     </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>1</load-on-startup>\r
@@ -92,27 +149,70 @@
         <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>\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
+    <servlet-mapping>\r
+       <servlet-name>listings</servlet-name>\r
+       <url-pattern>/</url-pattern>\r
+       </servlet-mapping>\r
+       \r
+            \r
+    <servlet-mapping>\r
+       <servlet-name>DownloadRedirector</servlet-name>\r
+       <url-pattern>/download</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
@@ -153,6 +253,11 @@
        <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
@@ -166,6 +271,10 @@
                <url-pattern>/testsrc/*</url-pattern>\r
                <url-pattern>/lib/*</url-pattern>\r
                <url-pattern>/test-output/*</url-pattern>\r
+               <!-- Uncomment this to secure services status checker \r
+               <url-pattern>/HttpCodeResponseServiceStatus/*</url-pattern>\r
+               <url-pattern>/ServiceStatus</url-pattern>\r
+                -->\r
        <!-- No http-method means all methods are constrained -->\r
     </web-resource-collection>\r
     <auth-constraint>\r
@@ -181,7 +290,6 @@
             <http-method>PUT</http-method>\r
             <http-method>DELETE</http-method>\r
             <http-method>TRACE</http-method>\r
-            <http-method>HEAD</http-method>\r
             <http-method>OPTIONS</http-method>\r
         </web-resource-collection>\r
         <auth-constraint/>\r
@@ -200,4 +308,4 @@
     <role-name>admin</role-name>\r
   </security-role>\r
   \r
-</web-app>
\ No newline at end of file
+</web-app>\r