Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/web.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/web/WEB-INF/web.xml	22 Mar 2006 05:34:55 -0000	1.3
+++ lams_tool_larsrc/web/WEB-INF/web.xml	23 Mar 2006 04:07:54 -0000	1.4
@@ -1,159 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
- <display-name>Shared Resources</display-name>
-<description>
-	Shared Resources tool
-</description>
-<context-param>
-	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-	<param-value>org.lamsfoundation.lams.tool.rsrc.ApplicationResources</param-value>
-</context-param>
-<context-param>
-	<param-name>contextConfigLocation</param-name>
-	<param-value>
-		classpath:/org/lamsfoundation/lams/applicationContext.xml
-		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml	
-		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	
-		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml	
-  		classpath:/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
-	</param-value>
-</context-param>
 
-<listener>
-	<listener-class>
-		org.springframework.web.context.ContextLoaderListener
-	</listener-class>
-</listener>	
+    <!--
+    To use non XDoclet filters, create a filters.xml file that
+    contains the additional filters (eg Sitemesh) and place it in your
+    project's merge dir.  Don't include filter-mappings in this file,
+    include them in a file called filter-mappings.xml and put that in
+    the same directory.
+    -->
 
-    <filter>
-    <filter-name>hibernateFilter</filter-name>
-    <filter-class>
-      org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter
-    </filter-class>
-    <init-param>
-      <param-name>sessionFactoryBeanName</param-name>
-      <param-value>resourceSessionFactory</param-value>
-    </init-param>
-   </filter>
-   <!-- System session filter -->
-   <filter>
-       <filter-name>SystemSessionFilter</filter-name>
-         <filter-class>
-		   org.lamsfoundation.lams.web.session.SystemSessionFilter
-         </filter-class>
-     </filter>
-	<filter>
-	       <filter-name>LocaleFilter</filter-name>
-	         <filter-class>
-			   org.lamsfoundation.lams.web.filter.LocaleFilter
-	         </filter-class>
-	        <init-param>
-            	<param-name>encoding</param-name>
-	            <param-value>UTF-8</param-value>
-	        </init-param>
-	</filter>
+    <!--
+    To use non XDoclet filter-mappings, create a filter-mappings.xml file that
+    contains the additional filter-mappings and place it in your
+    project's merge dir.
+    -->
 
-    <filter-mapping>
-    <filter-name>hibernateFilter</filter-name>
-     <url-pattern>/*</url-pattern>
-  </filter-mapping>
-    <filter-mapping>
-    <filter-name>SystemSessionFilter</filter-name>
-     <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  <filter-mapping>
-    <filter-name>LocaleFilter</filter-name>
-     <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
     <!--
     To use non XDoclet listeners, create a listeners.xml file that
     contains the additional listeners and place it in your
     project's merge dir.
     -->
 
- <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
+  <!--
+  To use non XDoclet servlets, create a servlets.xml file that
+  contains the additional servlets (eg Struts) and place it in your
+  project's merge dir.  Don't include servlet-mappings in this file,
+  include them in a file called servlet-mappings.xml and put that in
+  the same directory.
+  -->
 
-<servlet>
-		<servlet-name>exportPortfolio</servlet-name>
-		<servlet-class>org.lamsfoundation.lams.tool.rsrc.web.action.ExportServlet</servlet-class>
-</servlet>
-
-<servlet>
-    <servlet-name>action</servlet-name>
-    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-    <init-param>
-      <param-name>config</param-name>
-      <param-value>/WEB-INF/struts-config.xml</param-value>
-    </init-param>
-    <init-param>
-      <param-name>debug</param-name>
-      <param-value>999</param-value>
-    </init-param>
-    <init-param>
-      <param-name>detail</param-name>
-      <param-value>2</param-value>
-    </init-param>
-    <init-param>
-      <param-name>validate</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <load-on-startup>2</load-on-startup>
-</servlet>
-
-<servlet>
-		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
-		<init-param>
-			<param-name>baseDir</param-name>
-			<param-value>/UserFiles/</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>false</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-</servlet>
-
-	<!--  The download servlet, reused from the content repository jar -->
-	<servlet>
-		<description>Instructions Download</description>
-		<display-name>Instructions Download</display-name>
-		<servlet-name>download</servlet-name>
-		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
-	    <init-param>
-	      <param-name>toolContentHandlerBeanName</param-name>
-	      <param-value>resourceToolContentHandler</param-value>
-	    </init-param>
-	    <load-on-startup>3</load-on-startup>
-	</servlet>
-
-  <servlet-mapping>
-	<servlet-name>action</servlet-name>
-    <url-pattern>*.do</url-pattern>
-</servlet-mapping>
-
-<servlet-mapping>
-    <servlet-name>Connector</servlet-name>
-    <url-pattern>/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
-</servlet-mapping>
-
-<servlet-mapping>
-	<servlet-name>download</servlet-name>
-	<url-pattern>/download/*</url-pattern>
-</servlet-mapping>
-
-<servlet-mapping>
-	<servlet-name>exportPortfolio</servlet-name>
-	<url-pattern>/exportPortfolio</url-pattern>
-</servlet-mapping>
-
    <session-config>
       <session-timeout>120</session-timeout>
    </session-config>
@@ -165,8 +41,36 @@
    <!ELEMENT mime-mapping (extension, mime-type)>
    -->
 
-  <error-page>
-	<error-code>403</error-code>
-	<location>/403.html</location>
-</error-page>
+   <!--
+   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
+   Organize error-pages.xml following this DTD slice:
+
+   <!ELEMENT error-page ((error-code | exception-type), location)>
+   -->
+
+  <!--
+  To add taglibs by xml, create a file called taglibs.xml and place it
+  in your merge dir.
+  -->
+
+   <!--
+   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
+   Organize web-security.xml following this DTD slice:
+
+   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
+   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
+   <!ELEMENT web-resource-name (#PCDATA)>
+   <!ELEMENT url-pattern (#PCDATA)>
+   <!ELEMENT http-method (#PCDATA)>
+   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
+   <!ELEMENT transport-guarantee (#PCDATA)>
+
+   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
+   <!ELEMENT auth-method (#PCDATA)>
+   <!ELEMENT realm-name (#PCDATA)>
+   <!ELEMENT form-login-config (form-login-page, form-error-page)>
+   <!ELEMENT form-login-page (#PCDATA)>
+   <!ELEMENT form-error-page (#PCDATA)>
+   -->
+
 </web-app>