Index: /gs3-extensions/i-jetty/trunk/src/resources/web.xml
===================================================================
--- /gs3-extensions/i-jetty/trunk/src/resources/web.xml	(revision 25623)
+++ /gs3-extensions/i-jetty/trunk/src/resources/web.xml	(revision 25624)
@@ -1,206 +1,266 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app
-   	xmlns="http://java.sun.com/xml/ns/javaee" 
-   	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" 
-   	version="3.0"> 
-  <!-- General description of your web application -->
-  
-  <display-name>GSDL3</display-name>
-  <description>
-    Greenstone digital library version 3.
-  </description>
-    
-  <context-param>
-    <param-name>webmaster</param-name>
-    <param-value>greenstone3@list.scms.waikato.ac.nz</param-value>
-    <description>
-      The EMAIL address of the administrator to whom questions
-      and comments about this application should be addressed.
-    </description>
-  </context-param>
-  
-  
-  
-   <servlet>
-    <servlet-name>dev</servlet-name>
-    <description>A new skin engine still in development based on the standard gsdl3 library program</description>
-    <servlet-class>org.greenstone.gsdl3.LibraryServlet</servlet-class>
-    <init-param>
-      <param-name>library_name</param-name>
-      <param-value>dev</param-value>
-    </init-param>
-    <init-param>
-      <param-name>site_name</param-name>
-      <param-value>localsite</param-value>
-    </init-param>
-    <init-param>
-      <param-name>interface_name</param-name>
-      <param-value>oran</param-value>
-    </init-param>
-    <init-param>
-      <param-name>receptionist_class</param-name>
-      <param-value>DefaultReceptionist</param-value>
-    </init-param>
-    <init-param>
-      <param-name>default_lang</param-name>
-      <param-value>en</param-value>
-    </init-param>
+<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+<!-- this is based on a sample web.xml file provided by 
+http://jakarta.apache.org/tomcat/tomcat-4.0-doc/appdev/web.xml.txt
+-->
+<web-app>
+	<display-name>GSDL3</display-name>
+	<description>
+		Greenstone digital library version 3.
+	</description>
+  
+	<filter>
+		<filter-name>Greenstone URL Filter</filter-name>
+		<filter-class>org.greenstone.gsdl3.core.URLFilter</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>Greenstone URL Filter</filter-name>
+		<url-pattern>*</url-pattern>
+	</filter-mapping>
+  
+	<!-- Context initialization parameters that define shared
+	String constants used within your application, which
+	can be customized by the system administrator who is
+	installing your application.  The values actually
+	assigned to these parameters can be retrieved in a
+	servlet or JSP page by calling:
+
+	String value =
+	getServletContext().getInitParameter("name");
+
+	where "name" matches the <param-name> element of
+	one of these initialization parameters.
+
+	You can define any number of context initialization
+	parameters, including zero.
+	-->
+  
+	<context-param>
+		<param-name>webmaster</param-name>
+		<param-value>greenstone3@list.scms.waikato.ac.nz</param-value>
+		<description>
+			The EMAIL address of the administrator to whom questions
+			and comments about this application should be addressed.
+		</description>
+	</context-param>
+  
+
+	<!-- Servlet definitions for the servlets that make up
+	your web application, including initialization
+	parameters.  With Tomcat, you can also send requests
+	to servlets not listed here with a request like this:
+
+	http://localhost:8080/{context-path}/servlet/{classname}
+
+	but this usage is not guaranteed to be portable.  It also
+	makes relative references to images and other resources
+	required by your servlet more complicated, so defining
+	all of your servlets (and defining a mapping to them with
+	a servlet-mapping element) is recommended.
+
+	Servlet initialization parameters can be retrieved in a
+	servlet or JSP page by calling:
+
+	String value =
+	getServletConfig().getInitParameter("name");
+
+	where "name" matches the <param-name> element of
+	one of these initialization parameters.
+
+	You can define any number of servlets, including zero.
+	-->
+
+	<servlet>
+		<servlet-name>tester</servlet-name>
+		<description>a test servlet</description>
+		<servlet-class>TestServlet</servlet-class>
+	</servlet>
+  
+	<!-- For client side text fetching -->
+	<servlet>
+		<servlet-name>grabtext</servlet-name>
+		<description>Grabs text for client-side display with minimal overhead.</description>
+		<servlet-class>org.greenstone.gsdl3.ClientSideServlet</servlet-class>
+	</servlet>
+  
+  
+	<servlet>
+		<servlet-name>library</servlet-name>
+		<description>A new skin engine still in development based on the standard gsdl3 library program</description>
+		<servlet-class>org.greenstone.gsdl3.LibraryServlet</servlet-class>
+		<init-param>
+			<param-name>library_name</param-name>
+			<param-value>library</param-value>
+		</init-param>
+		<init-param>
+			<param-name>site_name</param-name>
+			<param-value>localsite</param-value>
+		</init-param>
+		<init-param>
+			<param-name>interface_name</param-name>
+			<param-value>oran</param-value>
+		</init-param>
+		<init-param>
+			<param-name>receptionist_class</param-name>
+			<param-value>DefaultReceptionist</param-value>
+		</init-param>
+		<init-param>
+			<param-name>default_lang</param-name>
+			<param-value>en</param-value>
+		</init-param>
+	</servlet>
+  
+	<servlet>
+		<servlet-name>gs2-library</servlet-name>
+		<description>Greenstone 2 lookalike library program: uses localsite with the gs2 interface</description>
+		<servlet-class>org.greenstone.gsdl3.LibraryServlet</servlet-class>
+		<init-param>
+			<param-name>library_name</param-name>
+			<param-value>gs2-library</param-value>
+		</init-param>
+		<init-param>
+			<param-name>site_name</param-name>
+			<param-value>localsite</param-value>
+		</init-param>
+		<init-param>
+			<param-name>interface_name</param-name>
+			<param-value>gs2</param-value>
+		</init-param>
+		<init-param>
+			<param-name>default_lang</param-name>
+			<param-value>en</param-value>
+		</init-param>
+		<init-param>
+			<param-name>session_expiration</param-name>
+			<param-value>1800</param-value>
+		</init-param>
+		<init-param>
+			<param-name>params_class</param-name>
+			<param-value>GS2Params</param-value>
+		</init-param>
+	</servlet>
+  
+	<servlet>
+		<servlet-name>nzdl-library</servlet-name>
+		<description>gsdl3 library program</description>
+		<servlet-class>org.greenstone.gsdl3.LibraryServlet</servlet-class>
+		<init-param>
+			<param-name>library_name</param-name>
+			<param-value>nzdl</param-value>
+		</init-param>
+		<init-param>
+			<param-name>site_name</param-name>
+			<param-value>nzdl</param-value>
+		</init-param>
+		<init-param>
+			<param-name>interface_name</param-name>
+			<param-value>nzdl</param-value>
+		</init-param>
+		<init-param>
+			<param-name>default_lang</param-name>
+			<param-value>en</param-value>
+		</init-param>
+		<init-param>
+			<param-name>params_class</param-name>
+			<param-value>NZDLParams</param-value>
+		</init-param>
+		<init-param>
+			<param-name>session_expiration</param-name>
+			<param-value>600</param-value>
+		</init-param>
   </servlet>
 
-  <servlet>
-    <servlet-name>Format</servlet-name>
-    <description>A new skin engine still in development based on the standard gsdl3 library program</description>
-    <servlet-class>org.greenstone.gsdl3.LibraryServlet</servlet-class>
-    <init-param>
-      <param-name>library_name</param-name>
-      <param-value>format</param-value>
-    </init-param>
-    <init-param>
-      <param-name>site_name</param-name>
-      <param-value>localsite</param-value>
-    </init-param>
-    <init-param>
-      <param-name>interface_name</param-name>
-      <param-value>oran</param-value>
-    </init-param>
-    <init-param>
-      <param-name>receptionist_class</param-name>
-      <param-value>FormatReceptionist</param-value>
-    </init-param>
-    <init-param>
-      <param-name>default_lang</param-name>
-      <param-value>en</param-value>
-    </init-param>
-  </servlet>
-
-  
-  <servlet>
-    <servlet-name>gs2library</servlet-name>
-    <description>Greenstone 2 lookalike library program: uses localsite with the gs2 interface</description>
-    <servlet-class>org.greenstone.gsdl3.LibraryServlet</servlet-class>
-    <init-param>
-      <param-name>library_name</param-name>
-      <param-value>library</param-value>
-    </init-param>
-    <init-param>
-      <param-name>site_name</param-name>
-      <param-value>localsite</param-value>
-    </init-param>
-    <init-param>
-      <param-name>interface_name</param-name>
-      <param-value>gs2</param-value>
-    </init-param>
-    <init-param>
-      <param-name>default_lang</param-name>
-      <param-value>en</param-value>
-    </init-param>
-    <init-param>
-      <param-name>session_expiration</param-name>
-      <param-value>1800</param-value>
-    </init-param>
-    <init-param>
-      <param-name>params_class</param-name>
-      <param-value>GS2Params</param-value>
-    </init-param>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>nzdl-library</servlet-name>
-    <description>gsdl3 library program</description>
-    <servlet-class>org.greenstone.gsdl3.LibraryServlet</servlet-class>
-    <init-param>
-      <param-name>library_name</param-name>
-      <param-value>nzdl</param-value>
-    </init-param>
-    <init-param>
-      <param-name>site_name</param-name>
-      <param-value>nzdl</param-value>
-    </init-param>
-    <init-param>
-      <param-name>interface_name</param-name>
-      <param-value>nzdl</param-value>
-    </init-param>
-    <init-param>
-      <param-name>default_lang</param-name>
-      <param-value>en</param-value>
-    </init-param>
-    <init-param>
-      <param-name>params_class</param-name>
-      <param-value>NZDLParams</param-value>
-    </init-param>
-    <init-param>
-      <param-name>session_expiration</param-name>
-      <param-value>600</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>gateway</servlet-name>
-    <description>gsdl3 library based on gateway site and default interface. It uses SOAP to talk to localsite</description>
-    <servlet-class>org.greenstone.gsdl3.LibraryServlet</servlet-class>
-    <init-param>
-      <param-name>library_name</param-name>
-      <param-value>gateway</param-value>
-    </init-param>
-    <init-param>
-      <param-name>site_name</param-name>
-      <param-value>gateway</param-value>
-    </init-param>
-    <init-param>
-      <param-name>interface_name</param-name>
-      <param-value>default</param-value>
-    </init-param>
-    <init-param>
-      <param-name>default_lang</param-name>
-      <param-value>en</param-value>
-    </init-param>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>gs3library</servlet-name>
-    <description>standard gsdl3 library program: uses localsite and the default interface</description>
-    <servlet-class>org.greenstone.gsdl3.LibraryServlet</servlet-class>
-    <init-param>
-      <param-name>library_name</param-name>
-      <param-value>gs3library</param-value>
-    </init-param>
-    <init-param>
-      <param-name>site_name</param-name>
-      <param-value>localsite</param-value>
-    </init-param>
-    <init-param>
-      <param-name>interface_name</param-name>
-      <param-value>default</param-value>
-    </init-param>
-    <init-param>
-      <param-name>default_lang</param-name>
-      <param-value>en</param-value>
-    </init-param>
-	<init-param>
-	 <param-name>allow_client_side_xslt</param-name>
-	 <param-value>true</param-value>
-	</init-param>
-  </servlet>
-
-  <!-- For client side text fetching -->
-  <servlet>
-    <servlet-name>grabtext</servlet-name>
-    <description>Grabs text for client-side display with minimal overhead.</description>
-    <servlet-class>org.greenstone.gsdl3.ClientSideServlet</servlet-class>
-  </servlet>
-  
-
+	<servlet>
+		<servlet-name>gateway</servlet-name>
+		<description>gsdl3 library based on gateway site and default interface. It uses SOAP to talk to localsite</description>
+		<servlet-class>org.greenstone.gsdl3.LibraryServlet</servlet-class>
+		<init-param>
+			<param-name>library_name</param-name>
+			<param-value>gateway</param-value>
+		</init-param>
+		<init-param>
+			<param-name>site_name</param-name>
+			<param-value>gateway</param-value>
+		</init-param>
+		<init-param>
+			<param-name>interface_name</param-name>
+			<param-value>default</param-value>
+		</init-param>
+		<init-param>
+			<param-name>default_lang</param-name>
+			<param-value>en</param-value>
+		</init-param>
+	</servlet>
+  
+	<servlet>
+		<servlet-name>gs3-library</servlet-name>
+		<description>standard gsdl3 library program: uses localsite and the default interface</description>
+		<servlet-class>org.greenstone.gsdl3.LibraryServlet</servlet-class>
+		<init-param>
+			<param-name>library_name</param-name>
+			<param-value>gs3-library</param-value>
+		</init-param>
+		<init-param>
+			<param-name>site_name</param-name>
+			<param-value>localsite</param-value>
+		</init-param>
+		<init-param>
+			<param-name>interface_name</param-name>
+			<param-value>default</param-value>
+		</init-param>
+		<init-param>
+			<param-name>default_lang</param-name>
+			<param-value>en</param-value>
+		</init-param>
+		<!--<init-param>
+			<param-name>allow_client_side_xslt</param-name>
+			<param-value>true</param-value>
+		</init-param>-->
+	</servlet>
+
+	<!-- axis servlets -->
 <!--
-<filter>
-  <filter-name>UrlRewriteFilter</filter-name>
-  <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
-</filter>
-
-<filter-mapping>
-  <filter-name>UrlRewriteFilter</filter-name>
-  <url-pattern>/*</url-pattern>
-</filter-mapping>
+	<servlet>
+		<servlet-name>AxisServlet</servlet-name>
+		<display-name>Apache-Axis Servlet</display-name>
+		<servlet-class>
+			org.apache.axis.transport.http.AxisServlet
+		</servlet-class>
+	</servlet>
+
+	<servlet>
+		<servlet-name>AdminServlet</servlet-name>
+		<display-name>Axis Admin Servlet</display-name>
+		<servlet-class>
+			org.apache.axis.transport.http.AdminServlet
+		</servlet-class>
+		<load-on-startup>100</load-on-startup>
+	</servlet>
+
+	<servlet>
+		<servlet-name>SOAPMonitorService</servlet-name>
+		<display-name>SOAPMonitorService</display-name>
+		<servlet-class>
+			org.apache.axis.monitor.SOAPMonitorService
+		</servlet-class>
+		<init-param>
+			<param-name>SOAPMonitorPort</param-name>
+			<param-value>5001</param-value>
+		</init-param>
+		<load-on-startup>100</load-on-startup>
+	</servlet>
 -->
+
+<!--	
+	<servlet>
+		<servlet-name>mat</servlet-name>
+		<description>Metadata Analysis Tool</description>
+		<servlet-class>org.greenstone.mat.servlet.MatServlet</servlet-class>
+	</servlet>
+
+-->
+
+
+
  
     <!-- Define mappings that are used by the servlet container to
@@ -217,6 +277,7 @@
          will be mapped to the "controller" servlet.
 
- Note: context path is determined by the servlet container - 
- in Tomcat, specified in server.xml -kjdon
+		Note: context path is determined by the servlet container - 
+		in Tomcat, specified in server.xml -kjdon
+		
          You may define any number of servlet mappings, including zero.
          It is also legal to define more than one mapping for the same
@@ -235,30 +296,40 @@
     </servlet-mapping>
     -->
-  
-  <servlet-mapping>
-    <servlet-name>dev</servlet-name>
-    <url-pattern>/dev</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>Format</servlet-name>
-    <url-pattern>/format</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>gs2library</servlet-name>
-    <url-pattern>/library</url-pattern>
-  </servlet-mapping>
-  
-  
-  <servlet-mapping>
-    <servlet-name>gs3library</servlet-name>
-    <url-pattern>/gs3library</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>grabtext</servlet-name>
-    <url-pattern>/grabtext</url-pattern>
-  </servlet-mapping>
+    
+
+	<servlet-mapping>
+		<servlet-name>nzdl-library</servlet-name>
+		<url-pattern>/nzdl</url-pattern>
+    </servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>tester</servlet-name>
+		<url-pattern>/testing</url-pattern>
+	</servlet-mapping>
+  
+	<servlet-mapping>
+		<servlet-name>library</servlet-name>
+		<url-pattern>/library/*</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>gs2-library</servlet-name>
+		<url-pattern>/gs2-library</url-pattern>
+	</servlet-mapping>
+  
+	<servlet-mapping>
+		<servlet-name>gateway</servlet-name>
+		<url-pattern>/gateway</url-pattern>
+	</servlet-mapping>
+  
+	<servlet-mapping>
+		<servlet-name>gs3-library</servlet-name>
+		<url-pattern>/gs3-library</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>grabtext</servlet-name>
+		<url-pattern>/grabtext</url-pattern>
+	</servlet-mapping>
   
 
@@ -287,5 +358,5 @@
 
   <session-config>
-    <session-timeout>30</session-timeout>    <!-- 30 minutes -->
+    <session-timeout>240</session-timeout>    <!-- 4 hours -->
   </session-config>
 
@@ -302,4 +373,2 @@
 
 </web-app>
-
-
