git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Some tweaks with Reporting JSPs
[proteocache.git] / WEB-INF / web.xml
diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
index cec1884..3f4654f 100644 (file)
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -3,26 +3,19 @@
  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"\r
  version="2.4">\r
 \r
-<display-name>JABAWS</display-name>\r
-<description>JAva Bioinformatics Analysis Web Services (JABAWS) v.2</description>\r
+<display-name>ProteoCache</display-name>\r
+<description>ProteoCache - Results repository for the Dundee Resource</description>\r
 \r
+       <welcome-file-list>\r
+               <welcome-file>Index.jsp</welcome-file>\r
+       </welcome-file-list>\r
 \r
-       <!-- JABAWS listeners -->\r
+       <!-- ProteoCache listeners -->\r
        <listener>\r
-               <listener-class>compbio.ws.server.MainManager</listener-class>\r
+               <listener-class>compbio.listeners.ContextListener</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
-\r
 \r
-       <!-- Session timeout in minutes -->\r
+               <!-- Session timeout in minutes -->\r
        <session-config>\r
                <session-timeout>20</session-timeout>\r
        </session-config>\r
@@ -47,280 +40,31 @@
                <load-on-startup>1</load-on-startup>\r
        </servlet>\r
 \r
-\r
-       <!-- JABAWS servlets -->\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
-               <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>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>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>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>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>1</load-on-startup>\r
-       </servlet>\r
-\r
-       <servlet>\r
-               <servlet-name>MSAprobsWS</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>GLprobsWS</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>AAConWS</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>JronnWS</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>DisemblWS</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>GlobPlotWS</servlet-name>\r
-               <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
-               <load-on-startup>1</load-on-startup>\r
+               <description>\r
+               </description>\r
+               <display-name>ServletDeleteRecord</display-name>\r
+               <servlet-name>ServletDeleteRecord</servlet-name>\r
+               <servlet-class>compbio.listeners.ServletDeleteRecord</servlet-class>\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
-       <servlet>\r
-               <servlet-name>JpredWS</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
-       <servlet>\r
-               <servlet-name>RNAalifoldWS</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
-       <!-- JABAWS servlet mappings -->\r
-       <servlet-mapping>\r
-               <servlet-name>listings</servlet-name>\r
-               <url-pattern>/</url-pattern>\r
-       </servlet-mapping>\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
        <servlet-mapping>\r
-               <servlet-name>Joblist</servlet-name>\r
-               <url-pattern>/Joblist</url-pattern>\r
+               <servlet-name>ServletDeleteRecord</servlet-name>\r
+               <url-pattern>/ServletDeleteRecord</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
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>MafftWS</servlet-name>\r
-               <url-pattern>/MafftWS</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>TcoffeeWS</servlet-name>\r
-               <url-pattern>/TcoffeeWS</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>ProbconsWS</servlet-name>\r
-               <url-pattern>/ProbconsWS</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>MSAprobsWS</servlet-name>\r
-               <url-pattern>/MSAprobsWS</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>GLprobsWS</servlet-name>\r
-               <url-pattern>/GLprobsWS</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>AAConWS</servlet-name>\r
-               <url-pattern>/AAConWS</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>JronnWS</servlet-name>\r
-               <url-pattern>/JronnWS</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>DisemblWS</servlet-name>\r
-               <url-pattern>/DisemblWS</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>GlobPlotWS</servlet-name>\r
-               <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
-       <servlet-mapping>\r
-               <servlet-name>JpredWS</servlet-name>\r
-               <url-pattern>/JpredWS</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>RNAalifoldWS</servlet-name>\r
-               <url-pattern>/RNAalifoldWS</url-pattern>\r
-       </servlet-mapping>\r
-\r
-\r
-       <!-- JABAWS security constraints -->\r
+       <!-- ProteoCache security constraints -->\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>/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
                        <!-- Uncomment this to secure services status checker \r
                        <url-pattern>/HttpCodeResponseServiceStatus/*</url-pattern>\r
                        <url-pattern>/ServiceStatus</url-pattern>\r
@@ -346,17 +90,16 @@
                <auth-constraint/>\r
        </security-constraint>\r
 \r
-\r
        <!-- Define the Login Configuration for this Application -->\r
        <login-config>\r
                <auth-method>BASIC</auth-method>\r
-               <realm-name>JABAWS administrators</realm-name>\r
+               <realm-name>ProteCache administrators</realm-name>\r
        </login-config>\r
 \r
 \r
        <!-- Security roles referenced by this web application -->\r
        <security-role>\r
-               <description>The role that is required to log in and view JABAWS internals</description>\r
+               <description>The role that is required to log in and view ProteCache internals</description>\r
                <role-name>admin</role-name>\r
        </security-role>\r
 \r