First working Spring-based version

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

diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
index 1c53caf..a3ec7a2 100644 (file)
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -4,125 +4,39 @@
  version="2.4">\r
 \r
 <display-name>ProteoCache</display-name>\r
-<description>ProteoCache - Results repository for the Dundee Resource</description>\r
+       <description>ProteoCache - caching framework for Jpred and other program in Dundee Resource</description>\r
 \r
        <welcome-file-list>\r
-               <welcome-file>Index.jsp</welcome-file>\r
+               <welcome-file>index.jsp</welcome-file>\r
        </welcome-file-list>\r
 \r
-       <!-- ProteoCache listeners -->\r
-       <listener>\r
-               <listener-class>compbio.listeners.ContextListener</listener-class>\r
-       </listener>\r
-\r
-               <!-- Session timeout in minutes -->\r
-       <session-config>\r
-               <session-timeout>20</session-timeout>\r
-       </session-config>\r
-\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
+               <servlet-name>proteocache</servlet-name>\r
+               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>\r
                <init-param>\r
-                       <param-name>readonly</param-name>\r
-                       <param-value>true</param-value>\r
+                       <param-name>contextClass</param-name>\r
+                       <param-value>org.springframework.web.context.support.AnnotationConfigWebApplicationContext</param-value>\r
                </init-param>\r
                <init-param>\r
-                       <param-name>listings</param-name>\r
-                       <param-value>true</param-value>\r
+                       <param-name>contextConfigLocation</param-name>\r
+                       <param-value>compbio.spring</param-value>\r
                </init-param>\r
                <load-on-startup>1</load-on-startup>\r
        </servlet>\r
 \r
-       <servlet>\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
-       <servlet>\r
-               <description>\r
-               </description>\r
-               <display-name>ServletByJobSequence</display-name>\r
-               <servlet-name>ServletByJobSequence</servlet-name>\r
-               <servlet-class>compbio.listeners.ServletByJobSequence</servlet-class>\r
-       </servlet>\r
-       <servlet>\r
-               <description>\r
-               </description>\r
-               <display-name>ServletJobsByDay</display-name>\r
-               <servlet-name>ServletJobsByDay</servlet-name>\r
-               <servlet-class>compbio.listeners.ServletJobsByDay</servlet-class>\r
-       </servlet>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>ServletDeleteRecord</servlet-name>\r
-               <url-pattern>/ServletDeleteRecord</url-pattern>\r
-       </servlet-mapping>\r
-       <servlet-mapping>\r
-               <servlet-name>ServletByJobSequence</servlet-name>\r
-               <url-pattern>/ServletByJobSequence</url-pattern>\r
-       </servlet-mapping>\r
        <servlet-mapping>\r
-               <servlet-name>ServletJobsByDay</servlet-name>\r
-               <url-pattern>/ServletJobsByDay</url-pattern>\r
+               <servlet-name>proteocache</servlet-name>\r
+               <url-pattern>/</url-pattern>\r
        </servlet-mapping>\r
 \r
+       <!-- ProteoCache listeners -->\r
+       <listener>\r
+               <listener-class>compbio.listeners.ContextListener</listener-class>\r
+       </listener>\r
 \r
-\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>/conf/*</url-pattern>\r
-                       <url-pattern>/testsrc/*</url-pattern>\r
-                       <url-pattern>/lib/*</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
-                       <role-name>admin</role-name>\r
-               </auth-constraint>\r
-       </security-constraint>\r
-\r
-\r
-       <!-- unsupported HTTP methods -->\r
-       <security-constraint>\r
-               <web-resource-collection>\r
-                       <web-resource-name>unsupported HTTP methods</web-resource-name>\r
-                       <url-pattern>/*</url-pattern>\r
-                       <http-method>PUT</http-method>\r
-                       <http-method>DELETE</http-method>\r
-                       <http-method>TRACE</http-method>\r
-                       <http-method>OPTIONS</http-method>\r
-               </web-resource-collection>\r
-               <auth-constraint/>\r
-       </security-constraint>\r
-\r
-       <!-- Define the Login Configuration for this Application -->\r
-       <login-config>\r
-               <auth-method>BASIC</auth-method>\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 ProteCache internals</description>\r
-               <role-name>admin</role-name>\r
-       </security-role>\r
+       <!-- Session timeout in minutes -->\r
+       <session-config>\r
+               <session-timeout>20</session-timeout>\r
+       </session-config>\r
 \r
 </web-app>\r