Index: lams_build/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.49.2.2 -r1.49.2.3
--- lams_build/build.xml	26 Mar 2007 02:13:15 -0000	1.49.2.2
+++ lams_build/build.xml	25 May 2007 05:49:06 -0000	1.49.2.3
@@ -129,6 +129,7 @@
 					<include name="cglib/*.jar" />
 					<include name="dom4j/*.jar" />
 					<include name="fckeditor/*.jar" />
+					<include name="gomba/*.jar" />
 					<include name="hibernate/*.jar" />
 					<include name="j2ee/*.jar" />
 					<include name="jakarta-commons/*.jar" />
Index: lams_build/conf/j2ee/application.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/j2ee/Attic/application.xml,v
diff -u -r1.32.2.1 -r1.32.2.2
--- lams_build/conf/j2ee/application.xml	12 Mar 2007 00:41:12 -0000	1.32.2.1
+++ lams_build/conf/j2ee/application.xml	25 May 2007 05:49:06 -0000	1.32.2.2
@@ -221,6 +221,9 @@
 		<java>xstream-1.1.jar</java>
 	</module>	
 	<!--  END For xstream -->
+	<module>
+		<java>gomba-0.8.0.jar</java>
+	</module>
     <!--  End Third Party JAR Files -->
     
     <!--  Tools -->
Index: lams_build/lib/gomba/gomba-0.8.0.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/gomba/Attic/gomba-0.8.0.jar,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/conf/xdoclet/ejb-resourcerefs.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/conf/xdoclet/servlet-mappings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/servlet-mappings.xml,v
diff -u -r1.12.2.1 -r1.12.2.2
--- lams_central/conf/xdoclet/servlet-mappings.xml	30 Mar 2007 00:12:31 -0000	1.12.2.1
+++ lams_central/conf/xdoclet/servlet-mappings.xml	25 May 2007 05:49:06 -0000	1.12.2.2
@@ -32,3 +32,13 @@
 	<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>
\ No newline at end of file
Index: lams_central/conf/xdoclet/servlets.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/servlets.xml,v
diff -u -r1.14.2.1 -r1.14.2.2
--- lams_central/conf/xdoclet/servlets.xml	30 Mar 2007 00:12:31 -0000	1.14.2.1
+++ lams_central/conf/xdoclet/servlets.xml	25 May 2007 05:49:06 -0000	1.14.2.2
@@ -69,3 +69,45 @@
 	</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>
\ No newline at end of file
Index: lams_central/conf/xdoclet/web-settings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/web-settings.xml,v
diff -u -r1.14 -r1.14.2.1
--- lams_central/conf/xdoclet/web-settings.xml	20 Sep 2006 02:35:13 -0000	1.14
+++ lams_central/conf/xdoclet/web-settings.xml	25 May 2007 05:49:06 -0000	1.14.2.1
@@ -14,9 +14,15 @@
 				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>
\ No newline at end of file
Index: lams_central/web/WEB-INF/jboss-web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/jboss-web.xml,v
diff -u -r1.4 -r1.4.2.1
--- lams_central/web/WEB-INF/jboss-web.xml	8 Sep 2005 01:54:30 -0000	1.4
+++ lams_central/web/WEB-INF/jboss-web.xml	25 May 2007 05:49:05 -0000	1.4.2.1
@@ -8,4 +8,10 @@
   <!-- application.xml file. -->
    <security-domain>java:/jaas/lams</security-domain>
 
+  <resource-ref>
+      <res-ref-name>jdbc/lams-ds</res-ref-name>
+      <res-type>javax.sql.DataSource</res-type>
+      <jndi-name>java:/jdbc/lams-ds</jndi-name>
+  </resource-ref>
+
 </jboss-web>
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>