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.41.2.1.4.1 -r1.41.2.1.4.2
--- lams_central/web/WEB-INF/web.xml	9 Dec 2009 01:53:59 -0000	1.41.2.1.4.1
+++ lams_central/web/WEB-INF/web.xml	30 Jun 2011 15:58:34 -0000	1.41.2.1.4.2
@@ -176,18 +176,28 @@
 </listener>
 
    <servlet>
+      <servlet-name>insertLearningDesign</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.InsertLDServlet</servlet-class>
+
+   </servlet>
+   <servlet>
+      <servlet-name>GetRecordingServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.webservice.GetRecordingServlet</servlet-class>
+
+   </servlet>
+   <servlet>
       <servlet-name>forgotPasswordServlet</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.ForgotPasswordServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>WhiteboardToSwfServlet</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.webservice.WhiteboardToSwfServlet</servlet-class>
+      <servlet-name>flashCrashDump</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.FlashCrashDumpServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>dumpWDDX</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.web.ReportWddxStructureServlet</servlet-class>
+      <servlet-name>storeLD</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.StoreLDServlet</servlet-class>
 
    </servlet>
    <servlet>
@@ -235,42 +245,38 @@
 
    </servlet>
    <servlet>
+      <servlet-name>copyMultipleToolContent</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.CopyMultipleToolContentServlet</servlet-class>
+
+   </servlet>
+   <servlet>
       <servlet-name>updateCollapsedGroup</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.UpdateCollapsedGroupServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>Connector</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.web.LAMSConnectorServlet</servlet-class>
+      <servlet-name>storeNotebookEntry</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.notebook.web.StoreNBEntryServlet</servlet-class>
 
-      <init-param>
-         <param-name>baseDir</param-name>
-         <param-value>secure</param-value>
-      </init-param>
-      <init-param>
-         <param-name>debug</param-name>
-         <param-value>true</param-value>
-      </init-param>
+   </servlet>
+   <servlet>
+      <servlet-name>lamsStartupServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.LamsStartupServlet</servlet-class>
 
       <load-on-startup>1</load-on-startup>
 
    </servlet>
    <servlet>
-      <servlet-name>BogoPogoServlet</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.webservice.WhiteboardToJpgServlet</servlet-class>
+      <servlet-name>WhiteboardToSwfServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.webservice.WhiteboardToSwfServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>flashCrashDump</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.web.FlashCrashDumpServlet</servlet-class>
+      <servlet-name>storeTheme</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.themes.web.StoreThemeServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>editLD</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.EditOnFlyServlet</servlet-class>
-
-   </servlet>
-   <servlet>
       <servlet-name>competenceServlet</servlet-name>
       <servlet-class>org.lamsfoundation.lams.authoring.web.CompetenceServlet</servlet-class>
 
@@ -281,48 +287,42 @@
 
    </servlet>
    <servlet>
-      <servlet-name>storeLD</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.StoreLDServlet</servlet-class>
+      <servlet-name>Connector</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.LAMSConnectorServlet</servlet-class>
 
+      <init-param>
+         <param-name>baseDir</param-name>
+         <param-value>secure</param-value>
+      </init-param>
+      <init-param>
+         <param-name>debug</param-name>
+         <param-value>true</param-value>
+      </init-param>
+
+      <load-on-startup>1</load-on-startup>
+
    </servlet>
    <servlet>
       <servlet-name>saveLessonOrder</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.LessonOrderServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>storeTheme</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.themes.web.StoreThemeServlet</servlet-class>
+      <servlet-name>editLD</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.EditOnFlyServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>insertLearningDesign</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.InsertLDServlet</servlet-class>
+      <servlet-name>dumpWDDX</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.ReportWddxStructureServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>storeNotebookEntry</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.notebook.web.StoreNBEntryServlet</servlet-class>
+      <servlet-name>BogoPogoServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.webservice.WhiteboardToJpgServlet</servlet-class>
 
    </servlet>
-   <servlet>
-      <servlet-name>lamsStartupServlet</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.web.LamsStartupServlet</servlet-class>
 
-      <load-on-startup>1</load-on-startup>
-
-   </servlet>
-   <servlet>
-      <servlet-name>GetRecordingServlet</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.webservice.GetRecordingServlet</servlet-class>
-
-   </servlet>
-   <servlet>
-      <servlet-name>copyMultipleToolContent</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.CopyMultipleToolContentServlet</servlet-class>
-
-   </servlet>
-
  <servlet>
 	<servlet-name>action</servlet-name>
 	<servlet-class>
@@ -453,40 +453,52 @@
 </servlet-mapping>
 
    <servlet-mapping>
+      <servlet-name>insertLearningDesign</servlet-name>
+      <url-pattern>/servlet/authoring/insertLearningDesign</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>GetRecordingServlet</servlet-name>
+      <url-pattern>/GetRecording</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>forgotPasswordServlet</servlet-name>
       <url-pattern>/ForgotPasswordRequest</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>WhiteboardToSwfServlet</servlet-name>
-      <url-pattern>/WhiteboardToSwf</url-pattern>
+      <servlet-name>flashCrashDump</servlet-name>
+      <url-pattern>/servlet/flashCrashDump</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>dumpWDDX</servlet-name>
-      <url-pattern>/servlet/dumpWDDX</url-pattern>
+      <servlet-name>storeLD</servlet-name>
+      <url-pattern>/servlet/authoring/storeLearningDesignDetails</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>SimpleUploader</servlet-name>
       <url-pattern>/fckeditor/editor/filemanager/upload/simpleuploader</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>copyMultipleToolContent</servlet-name>
+      <url-pattern>/servlet/authoring/copyMultipleToolContent</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>updateCollapsedGroup</servlet-name>
       <url-pattern>/servlet/updateCollapsedGroup</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>Connector</servlet-name>
-      <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+      <servlet-name>storeNotebookEntry</servlet-name>
+      <url-pattern>/servlet/notebook/storeNotebookEntry</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>BogoPogoServlet</servlet-name>
-      <url-pattern>/BogoPogo</url-pattern>
+      <servlet-name>lamsStartupServlet</servlet-name>
+      <url-pattern>/lamsstartupservlet</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>flashCrashDump</servlet-name>
-      <url-pattern>/servlet/flashCrashDump</url-pattern>
+      <servlet-name>WhiteboardToSwfServlet</servlet-name>
+      <url-pattern>/WhiteboardToSwf</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>editLD</servlet-name>
-      <url-pattern>/eof/authoring/editLearningDesign</url-pattern>
+      <servlet-name>storeTheme</servlet-name>
+      <url-pattern>/themes/servlet/storeTheme</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>competenceServlet</servlet-name>
@@ -497,37 +509,25 @@
       <url-pattern>/services/xml/LessonJoin/*</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>storeLD</servlet-name>
-      <url-pattern>/servlet/authoring/storeLearningDesignDetails</url-pattern>
+      <servlet-name>Connector</servlet-name>
+      <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>saveLessonOrder</servlet-name>
       <url-pattern>/servlet/saveLessonOrder</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>storeTheme</servlet-name>
-      <url-pattern>/themes/servlet/storeTheme</url-pattern>
+      <servlet-name>editLD</servlet-name>
+      <url-pattern>/eof/authoring/editLearningDesign</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>insertLearningDesign</servlet-name>
-      <url-pattern>/servlet/authoring/insertLearningDesign</url-pattern>
+      <servlet-name>dumpWDDX</servlet-name>
+      <url-pattern>/servlet/dumpWDDX</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>storeNotebookEntry</servlet-name>
-      <url-pattern>/servlet/notebook/storeNotebookEntry</url-pattern>
+      <servlet-name>BogoPogoServlet</servlet-name>
+      <url-pattern>/BogoPogo</url-pattern>
    </servlet-mapping>
-   <servlet-mapping>
-      <servlet-name>lamsStartupServlet</servlet-name>
-      <url-pattern>/lamsstartupservlet</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
-      <servlet-name>GetRecordingServlet</servlet-name>
-      <url-pattern>/GetRecording</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
-      <servlet-name>copyMultipleToolContent</servlet-name>
-      <url-pattern>/servlet/authoring/copyMultipleToolContent</url-pattern>
-   </servlet-mapping>
 
    <session-config>
       <session-timeout>120</session-timeout>
@@ -695,6 +695,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>MONITOR</role-name>
+    		<role-name>GROUP MANAGER</role-name>
     	</auth-constraint>
     </security-constraint>