Index: lams_central/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/web.xml,v
diff -u -r1.29.2.1 -r1.29.2.2
--- lams_central/web/WEB-INF/web.xml	12 Mar 2007 01:30:05 -0000	1.29.2.1
+++ lams_central/web/WEB-INF/web.xml	25 May 2007 05:49:05 -0000	1.29.2.2
@@ -17,13 +17,19 @@
 				classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/web/webApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/integrationContext.xml
+				classpath:/org/lamsfoundation/lams/federationContext.xml
 				<!--  Needed to communicate with the tools -->
 				classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
 				<!--  Add tool contexts after this -->
 	</param-value>
 </context-param>
 
+<context-param>
+	<param-name>org.gomba.dataSource</param-name>
+	<param-value>jdbc/lams-ds</param-value>
+</context-param>
+
     <filter>
     <filter-name>SystemSessionFilter</filter-name>
          <filter-class>
@@ -297,6 +303,57 @@
 	</servlet-class>
 </servlet>
 
+<servlet>
+	<servlet-name>ShibLogin</servlet-name>
+	<display-name>ShibLogin Servlet For Shibboleth Users</display-name>
+	<servlet-class>
+		org.lamsfoundation.lams.web.ShibLoginServlet
+	</servlet-class>
+</servlet>
+
+<servlet>
+    <servlet-name>FederationGroups</servlet-name>
+    <servlet-class>org.gomba.XMLServlet</servlet-class>
+    <init-param>
+      <param-name>query</param-name>
+      <param-value>
+      select distinct o.organisation_id,o.name from lams_organisation o, lams_fed_server s 
+      where can_join_joint_lessons=1
+	  and sha1(s.privatekey)=${param.h}
+      </param-value>
+    </init-param>
+    <init-param>
+      <param-name>response-headers</param-name>
+      <param-value>
+      Last-Modified: Mon, 24 May 1976 00:00:00 GMT
+      </param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+</servlet>
+
+<servlet>
+    <servlet-name>FederationLessons</servlet-name>
+    <servlet-class>org.gomba.XMLServlet</servlet-class>
+    <init-param>
+      <param-name>query</param-name>
+      <param-value>
+      select distinct l.lesson_id, l.name from lams_fed_lesson fl, lams_lesson l, lams_fed_server s 
+      where fl.lesson_id=l.lesson_id
+      and fl.ext_org_id=${param.orgId java.lang.Integer}
+      and s.name=${param.name}
+      and fl.server_sid=s.sid
+	  and sha1(s.privatekey)=${param.h}
+      </param-value>
+    </init-param>
+    <init-param>
+      <param-name>response-headers</param-name>
+      <param-value>
+      Last-Modified: Mon, 24 May 1976 00:00:00 GMT
+      </param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+</servlet>
+
   <servlet-mapping>
 	<servlet-name>action</servlet-name>
 	<url-pattern>*.do</url-pattern>
@@ -327,6 +384,21 @@
 	<url-pattern>/LoginRequest</url-pattern>
 </servlet-mapping>
 
+<servlet-mapping>
+	<servlet-name>ShibLogin</servlet-name>
+	<url-pattern>/ShibLogin</url-pattern>
+</servlet-mapping>
+
+<servlet-mapping>
+    <servlet-name>FederationGroups</servlet-name>
+    <url-pattern>/federation/groups</url-pattern>
+</servlet-mapping>
+
+<servlet-mapping>
+    <servlet-name>FederationLessons</servlet-name>
+    <url-pattern>/federation/lessons/*</url-pattern>
+</servlet-mapping>
+
    <servlet-mapping>
       <servlet-name>storeLD</servlet-name>
       <url-pattern>/servlet/authoring/storeLearningDesignDetails</url-pattern>
@@ -453,6 +525,13 @@
 
 	</jsp-config>
 
+ <resource-ref>
+	<description>DB Connection</description>
+	<res-ref-name>jdbc/lams-ds</res-ref-name>
+	<res-type>javax.sql.DataSource</res-type>
+	<res-auth>Container</res-auth>
+</resource-ref>
+
   	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>