Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.15.2.1 -r1.15.2.2
--- lams_admin/web/WEB-INF/struts/struts-config.xml	12 Mar 2007 00:40:42 -0000	1.15.2.1
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	7 Jun 2007 01:26:11 -0000	1.15.2.2
@@ -47,6 +47,8 @@
 	<form-property name="courseAdminCanAddNewUsers" type="java.lang.Boolean" initial="false"/>
 	<form-property name="courseAdminCanBrowseAllUsers" type="java.lang.Boolean" initial="false"/>
 	<form-property name="courseAdminCanChangeStatusOfCourse" type="java.lang.Boolean" initial="false"/>
+	<form-property name="canJoinJointLessons" type="java.lang.Boolean" initial="false"/>
+	<form-property name="canOfferJointLessons" type="java.lang.Boolean" initial="false"/>
 </form-bean>
 
 <form-bean name="UserRolesForm" type="org.apache.struts.action.DynaActionForm">
@@ -144,6 +146,18 @@
 	<form-property name="userno" type="java.lang.Integer" />
 	<form-property name="public" type="java.lang.Boolean" initial="true" />
 </form-bean>
+
+<form-bean name="FederationServerForm" type="org.apache.struts.action.DynaActionForm">
+	<form-property name="name" type="java.lang.String" />
+	<form-property name="institution" type="java.lang.String" />
+	<form-property name="url" type="java.lang.String" />
+	<form-property name="privateKey" type="java.lang.String" />
+	<form-property name="submitted" type="java.lang.Integer" />
+</form-bean>
+
+<form-bean name="CleanupForm" type="org.apache.struts.action.DynaActionForm">
+	<form-property name="numDays" type="java.lang.Integer" />
+</form-bean>
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
@@ -278,8 +292,32 @@
         path="/sysadminstart.do"
         redirect="false"
       />
+      <forward
+        name="import"
+        path="/importexcel.do"
+        redirect="false"
+      />
     </action>
     <action
+      path="/cleanup"
+      type="org.lamsfoundation.lams.admin.web.action.CleanupTempFilesAction"
+      name="CleanupForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="cleanup"
+        path=".cleanup"
+        redirect="false"
+      />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/usersave"
       type="org.lamsfoundation.lams.admin.web.UserSaveAction"
       name="UserForm"
@@ -310,6 +348,20 @@
       />
     </action>
     <action
+      path="/federation"
+      type="org.lamsfoundation.lams.admin.web.action.FederationAction"
+      name="FederationServerForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="federation"
+        path=".federation"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/serversave"
       type="org.lamsfoundation.lams.admin.web.ServerSaveAction"
       name="ServerOrgMapForm"
@@ -355,6 +407,11 @@
         path="/sysadminstart.do"
         redirect="false"
       />
+      <forward
+        name="importv1"
+        path="/importv1.do"
+        redirect="false"
+      />
     </action>
     <action
       path="/userroles"