Index: lams_openid/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_openid/web/WEB-INF/web.xml,v
diff -u -r1.1 -r1.2
--- lams_openid/web/WEB-INF/web.xml	5 Feb 2009 04:51:16 -0000	1.1
+++ lams_openid/web/WEB-INF/web.xml	9 Feb 2009 00:08:08 -0000	1.2
@@ -1,23 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
 
+<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">
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>
+			classpath:/org/lamsfoundation/lams/applicationContext.xml
+			classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
+			classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
+			classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
+			classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
+			classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
+			classpath:/org/lamsfoundation/lams/web/webApplicationContext.xml
+			classpath:/org/lamsfoundation/lams/integrationContext.xml
+			classpath:/org/lamsfoundation/lams/usermanagement/ldapContext.xml
+			classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
+			classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
+			classpath:/org/lamsfoundation/lams/openid/openIdApplicationContext.xml
+		</param-value>
+	</context-param>
+
 	<filter>
+		<filter-name>SystemSessionFilter</filter-name>
+		<filter-class>
+			org.lamsfoundation.lams.web.session.SystemSessionFilter
+		</filter-class>
+	</filter>
+	<filter>
+		<filter-name>HibernateFilter</filter-name>
+		<filter-class>
+			org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter
+		</filter-class>
+		<init-param>
+			<param-name>sessionFactoryBeanName</param-name>
+			<param-value>coreSessionFactory</param-value>
+		</init-param>
+		<init-param>
+			<param-name>singleSession</param-name>
+			<param-value>true</param-value>
+		</init-param>
+	</filter>
+	
+	<filter-mapping>
+		<filter-name>SystemSessionFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+	<filter-mapping>
+		<filter-name>HibernateFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<filter>
 		<filter-name>OpenIdFilter</filter-name>
-		<description>
-			This filter (for Consumer side) automatically parses OpenID
-			responses and sets the user's identity in the session.
-		</description>
 		<filter-class>
 			org.verisign.joid.consumer.OpenIdFilter
 		</filter-class>
 		<init-param>
 			<param-name>saveInCookie</param-name>
 			<param-value>true</param-value>
-			<description>
-				Optional. Will store the identity url in a cookie under
-				"openid.identity" if set to true.
-			</description>
 		</init-param>
 		<!--
 			<init-param>
@@ -29,12 +71,14 @@
 		<init-param>
 			<param-name>ignorePaths</param-name>
 			<param-value>/login,/server,/echo</param-value>
-			<description>
-				Optional. Will not apply filter to the paths set here.
-				Comma delimited.
-			</description>
 		</init-param>
 	</filter>
+	<filter-mapping>
+		<filter-name>OpenIdFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<!--  
 	<filter>
 		<filter-name>UserUrlFilter</filter-name>
 		<description>
@@ -51,16 +95,27 @@
 			</description>
 		</init-param>
 	</filter>
-
 	<filter-mapping>
-		<filter-name>OpenIdFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
 		<filter-name>UserUrlFilter</filter-name>
 		<url-pattern>/user/*</url-pattern>
 	</filter-mapping>
+	
+	
+	
+	-->
 
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
+	<listener>
+		<listener-class>
+			org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+		</listener-class>
+	</listener>
+
+	<!--  
 	<servlet>
 		<servlet-name>joid</servlet-name>
 		<servlet-class>examples.server.OpenIdServlet</servlet-class>
@@ -79,35 +134,22 @@
 		<init-param>
 			<param-name>endPointUrl</param-name>
 			<param-value>http://localhost:8080/joid/login</param-value>
-			<description>Change this to your endpoint url.</description>
 		</init-param>
 		<init-param>
 			<param-name>loginPage</param-name>
 			<param-value>login.jsp</param-value>
-			<description>
-				Change this to your login page where the user enters
-				their username and password and/or approves the
-				authentication for the site.
-			</description>
 		</init-param>
 		<init-param>
 			<param-name>storeClassName</param-name>
 			<param-value>
 				org.verisign.joid.server.MemoryStore
 			</param-value>
-			<description>
-				Specify the className for your Store implementation.
-			</description>
 		</init-param>
 		<init-param>
 			<param-name>userManagerClassName</param-name>
 			<param-value>
 				org.verisign.joid.server.MemoryUserManager
 			</param-value>
-			<description>
-				Specify the className for your UserManager
-				implementation.
-			</description>
 		</init-param>
 	</servlet>
 
@@ -125,10 +167,10 @@
 		<servlet-name>loginServlet</servlet-name>
 		<url-pattern>/login</url-pattern>
 	</servlet-mapping>
+	-->
 
 	<servlet>
 		<servlet-name>LoginUsingOpenId</servlet-name>
-		<display-name>LoginUsingOpenId Servlet For OpenID</display-name>
 		<servlet-class>
 			org.lamsfoundation.lams.openid.web.LamsOpenIdServlet
 		</servlet-class>
@@ -138,13 +180,18 @@
 		<servlet-name>LoginUsingOpenId</servlet-name>
 		<url-pattern>/LoginUsingOpenId</url-pattern>
 	</servlet-mapping>
-	
-	<context-param> 
-	<param-name>contextConfigLocation</param-name>
-	<param-value>
-				classpath:/org/lamsfoundation/lams/integrationContext.xml
-	</param-value>
-</context-param>
 
+	<servlet>
+		<servlet-name>RegisterOpenId</servlet-name>
+		<servlet-class>
+			org.lamsfoundation.lams.openid.web.LamsOpenIdRegisterServlet
+		</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>RegisterOpenId</servlet-name>
+		<url-pattern>/RegisterOpenId</url-pattern>
+	</servlet-mapping>
+
 </web-app>