Index: lams_monitoring/web/WEB-INF/web.xml
===================================================================
diff -u -rc209be8131f22f6fe37bd8d6c14b56425a78b766 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision c209be8131f22f6fe37bd8d6c14b56425a78b766)
+++ lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -69,13 +69,13 @@
 </listener>	
 
    <servlet>
-      <servlet-name>gateExportPortfolio</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.monitoring.web.GateExportPortfolioServlet</servlet-class>
+      <servlet-name>initializeLesson</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.monitoring.web.InitializeLessonServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>createLessonClass</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.monitoring.web.CreateLessonServlet</servlet-class>
+      <servlet-name>performChosenGrouping</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.monitoring.web.PerformChosenGroupingServlet</servlet-class>
 
    </servlet>
    <servlet>
@@ -84,8 +84,8 @@
 
    </servlet>
    <servlet>
-      <servlet-name>performChosenGrouping</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.monitoring.web.PerformChosenGroupingServlet</servlet-class>
+      <servlet-name>gateExportPortfolio</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.monitoring.web.GateExportPortfolioServlet</servlet-class>
 
    </servlet>
    <servlet>
@@ -94,8 +94,8 @@
 
    </servlet>
    <servlet>
-      <servlet-name>initializeLesson</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.monitoring.web.InitializeLessonServlet</servlet-class>
+      <servlet-name>createLessonClass</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.monitoring.web.CreateLessonServlet</servlet-class>
 
    </servlet>
 
@@ -127,34 +127,30 @@
 </servlet-mapping>
 
    <servlet-mapping>
-      <servlet-name>gateExportPortfolio</servlet-name>
-      <url-pattern>/gateExportPortfolio</url-pattern>
+      <servlet-name>initializeLesson</servlet-name>
+      <url-pattern>/initializeLesson</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>createLessonClass</servlet-name>
-      <url-pattern>/createLessonClass</url-pattern>
+      <servlet-name>performChosenGrouping</servlet-name>
+      <url-pattern>/monitoring/performChosenGrouping</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>branchingExportPortfolio</servlet-name>
       <url-pattern>/branchingExportPortfolio</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>performChosenGrouping</servlet-name>
-      <url-pattern>/monitoring/performChosenGrouping</url-pattern>
+      <servlet-name>gateExportPortfolio</servlet-name>
+      <url-pattern>/gateExportPortfolio</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>sequenceExportPortfolio</servlet-name>
       <url-pattern>/sequenceExportPortfolio</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>initializeLesson</servlet-name>
-      <url-pattern>/initializeLesson</url-pattern>
+      <servlet-name>createLessonClass</servlet-name>
+      <url-pattern>/createLessonClass</url-pattern>
    </servlet-mapping>
 
-   <session-config>
-      <session-timeout>120</session-timeout>
-   </session-config>
-
    <!--
    To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
    Organize mime-mappings.xml following this DTD slice:
@@ -238,10 +234,8 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
-    		<role-name>TEACHER</role-name>
     		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
-    		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
 			<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>