Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -rb495ec47552a05d4e14f2b3e402ea5a8521c8542 -rab19db088359a46353cc92e806c40ff5cff818b9
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision b495ec47552a05d4e14f2b3e402ea5a8521c8542)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision ab19db088359a46353cc92e806c40ff5cff818b9)
@@ -44,119 +44,170 @@
 	<param-value>context.central</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>
+	<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>
-   </filter>
-	<filter>
-		<filter-name>LocaleFilter</filter-name>
-	         <filter-class>
-			   org.lamsfoundation.lams.web.filter.LocaleFilter
-	         </filter-class>
-	</filter>
+</filter>
 
-     <filter-mapping>
-    <filter-name>SystemSessionFilter</filter-name>
-     <url-pattern>*.do</url-pattern> 
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>SystemSessionFilter</filter-name>
-     <url-pattern>*.jsp</url-pattern> 
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>SystemSessionFilter</filter-name>
-     <url-pattern>*.xml</url-pattern> 
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>SystemSessionFilter</filter-name>
-     <url-pattern>*.swf</url-pattern> 
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>SystemSessionFilter</filter-name>
-     <url-pattern>/servlet/*</url-pattern> 
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>SystemSessionFilter</filter-name>
-     <url-pattern>/fckeditor/*</url-pattern> 
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>SystemSessionFilter</filter-name>
-     <url-pattern>/eof/*</url-pattern> 
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>hibernateFilter</filter-name>
-     <url-pattern>*.do</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>hibernateFilter</filter-name>
-     <url-pattern>*.jsp</url-pattern>
-  </filter-mapping>
-   <filter-mapping>
-    <filter-name>hibernateFilter</filter-name>
-     <url-pattern>*.xml</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>hibernateFilter</filter-name>
-     <url-pattern>*.swf</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>hibernateFilter</filter-name>
-     <url-pattern>/servlet/*</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>hibernateFilter</filter-name>
-     <url-pattern>/services/*</url-pattern>
-   </filter-mapping>
+<filter>
+	<filter-name>LocaleFilter</filter-name>
+	<filter-class>
+		org.lamsfoundation.lams.web.filter.LocaleFilter
+	</filter-class>
+</filter>
 
+<filter>
+	<filter-name>OpenIdFilter</filter-name>
+	<filter-class>org.verisign.joid.consumer.OpenIdFilter</filter-class>
+	<init-param>
+		<param-name>saveInCookie</param-name>
+		<param-value>true</param-value>
+	</init-param>
+	<!--
+		<init-param>
+		<param-name>cookieDomain</param-name>
+		<param-value>www.mydomain.com</param-value>
+		<description>Optional. Domain to store cookie based on RFC 2109. Defaults to current context.</description>
+		</init-param>
+	-->
+	<init-param>
+		<param-name>ignorePaths</param-name>
+		<param-value>/login,/server,/echo</param-value>
+	</init-param>
+</filter>
+
   <filter-mapping>
-    <filter-name>hibernateFilter</filter-name>
-     <url-pattern>/fckeditor/*</url-pattern>
-   </filter-mapping>
+	<filter-name>SystemSessionFilter</filter-name>
+	<url-pattern>*.do</url-pattern>
+</filter-mapping>
 
-   <filter-mapping>
+<filter-mapping>
+	<filter-name>SystemSessionFilter</filter-name>
+	<url-pattern>*.jsp</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>SystemSessionFilter</filter-name>
+	<url-pattern>*.xml</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>SystemSessionFilter</filter-name>
+	<url-pattern>*.swf</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>SystemSessionFilter</filter-name>
+	<url-pattern>/servlet/*</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>SystemSessionFilter</filter-name>
+	<url-pattern>/fckeditor/*</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>SystemSessionFilter</filter-name>
+	<url-pattern>/eof/*</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>hibernateFilter</filter-name>
+	<url-pattern>*.do</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>hibernateFilter</filter-name>
+	<url-pattern>*.jsp</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>hibernateFilter</filter-name>
+	<url-pattern>*.xml</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>hibernateFilter</filter-name>
+	<url-pattern>*.swf</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>hibernateFilter</filter-name>
+	<url-pattern>/servlet/*</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>hibernateFilter</filter-name>
+	<url-pattern>/services/*</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>hibernateFilter</filter-name>
+	<url-pattern>/fckeditor/*</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>hibernateFilter</filter-name>
+	<url-pattern>/LoginRequest</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>hibernateFilter</filter-name>
+	<url-pattern>/ForgotPasswordRequest</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>LocaleFilter</filter-name>
+	<url-pattern>*.do</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>LocaleFilter</filter-name>
+	<url-pattern>*.jsp</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>LocaleFilter</filter-name>
+	<url-pattern>*.xml</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>LocaleFilter</filter-name>
+	<url-pattern>*.swf</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>LocaleFilter</filter-name>
+	<url-pattern>/servlet/*</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>LocaleFilter</filter-name>
+	<url-pattern>/fckeditor/*</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
+	<filter-name>OpenIdFilter</filter-name>
+<url-pattern>/*</url-pattern>
+</filter-mapping>
+
+<filter-mapping>
     <filter-name>hibernateFilter</filter-name>
-     <url-pattern>/LoginRequest</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>hibernateFilter</filter-name>
-     <url-pattern>/ForgotPasswordRequest</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>LocaleFilter</filter-name>
-     <url-pattern>*.do</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>LocaleFilter</filter-name>
-     <url-pattern>*.jsp</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>LocaleFilter</filter-name>
-     <url-pattern>*.xml</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>LocaleFilter</filter-name>
-     <url-pattern>*.swf</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-    <filter-name>LocaleFilter</filter-name>
-     <url-pattern>/servlet/*</url-pattern>
-   </filter-mapping>
-    <filter-mapping>
-    <filter-name>LocaleFilter</filter-name>
-     <url-pattern>/fckeditor/*</url-pattern>
-   </filter-mapping>
+    <url-pattern>/OpenIDServlet</url-pattern>
+</filter-mapping>
 
   <listener>
 	<listener-class>
@@ -408,6 +459,13 @@
     <servlet-class>org.jabber.JabberHTTPBind.JHBServlet</servlet-class>
 </servlet>
 
+<servlet>
+	<servlet-name>OpenIDServlet</servlet-name>
+	<servlet-class>
+		org.lamsfoundation.lams.web.SIFOpenIDServlet
+</servlet-class>
+</servlet>
+
   <servlet-mapping>
 	<servlet-name>action</servlet-name>
 	<url-pattern>*.do</url-pattern>
@@ -453,6 +511,11 @@
 	<url-pattern>/JHB/*</url-pattern>
 </servlet-mapping>
 
+<servlet-mapping>
+    <servlet-name>OpenIDServlet</servlet-name>
+    <url-pattern>/OpenIDServlet</url-pattern>
+</servlet-mapping>
+
    <servlet-mapping>
       <servlet-name>forgotPasswordServlet</servlet-name>
       <url-pattern>/ForgotPasswordRequest</url-pattern>