Index: lams_central/src/java/org/lamsfoundation/lams/themes/web/StoreThemeServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/themes/web/StoreThemeServlet.java,v
diff -u -r1.3 -r1.4
--- lams_central/src/java/org/lamsfoundation/lams/themes/web/StoreThemeServlet.java	3 Apr 2006 23:28:16 -0000	1.3
+++ lams_central/src/java/org/lamsfoundation/lams/themes/web/StoreThemeServlet.java	12 Sep 2006 05:51:53 -0000	1.4
@@ -37,7 +37,7 @@
  * @author Fiona Malikoff
  *
  * @web:servlet name="storeTheme"
- * @web:servlet-mapping url-pattern="/themes/storeTheme"
+ * @web:servlet-mapping url-pattern="/themes/servlet/storeTheme"
  */
 public class StoreThemeServlet extends AbstractStoreWDDXPacketServlet {
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/FlashCrashDumpServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/FlashCrashDumpServlet.java,v
diff -u -r1.5 -r1.6
--- lams_central/src/java/org/lamsfoundation/lams/web/FlashCrashDumpServlet.java	3 Apr 2006 23:28:17 -0000	1.5
+++ lams_central/src/java/org/lamsfoundation/lams/web/FlashCrashDumpServlet.java	12 Sep 2006 05:52:21 -0000	1.6
@@ -50,7 +50,7 @@
  * @author Fiona Malikoff
  * 
  * @web:servlet name="flashCrashDump"
- * @web:servlet-mapping url-pattern="/flashCrashDump"
+ * @web:servlet-mapping url-pattern="/servlet/flashCrashDump"
 
  */
 public class FlashCrashDumpServlet extends AbstractStoreWDDXPacketServlet {
Index: lams_central/src/java/org/lamsfoundation/lams/web/ReportWddxStructureServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/ReportWddxStructureServlet.java,v
diff -u -r1.1 -r1.2
--- lams_central/src/java/org/lamsfoundation/lams/web/ReportWddxStructureServlet.java	20 Jul 2006 07:11:39 -0000	1.1
+++ lams_central/src/java/org/lamsfoundation/lams/web/ReportWddxStructureServlet.java	12 Sep 2006 05:52:21 -0000	1.2
@@ -49,7 +49,7 @@
  * @author Fiona Malikoff
  * 
  * @web:servlet name="dumpWDDX"
- * @web:servlet-mapping url-pattern="/dumpWDDX"
+ * @web:servlet-mapping url-pattern="/servlet/dumpWDDX"
 
  */
 public class ReportWddxStructureServlet extends AbstractStoreWDDXPacketServlet {
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.26 -r1.27
--- lams_central/web/WEB-INF/web.xml	24 Aug 2006 04:01:39 -0000	1.26
+++ lams_central/web/WEB-INF/web.xml	12 Sep 2006 05:51:39 -0000	1.27
@@ -45,18 +45,78 @@
 	         </filter-class>
 	</filter>
 
-    <filter-mapping>
+     <filter-mapping>
     <filter-name>SystemSessionFilter</filter-name>
-     <url-pattern>/*</url-pattern> 
-  </filter-mapping>
+     <url-pattern>*.do</url-pattern> 
+   </filter-mapping>
    <filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>*.jsp</url-pattern> 
+   </filter-mapping>
+   <filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>*.xml</url-pattern> 
+   </filter-mapping>
+   <filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>*.swf</url-pattern> 
+   </filter-mapping>
+   <filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>/servlet/*</url-pattern> 
+   </filter-mapping>
+   <filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>/fckeditor/*</url-pattern> 
+   </filter-mapping>
+   <filter-mapping>
     <filter-name>hibernateFilter</filter-name>
-     <url-pattern>/*</url-pattern>
+     <url-pattern>*.do</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+    <filter-name>hibernateFilter</filter-name>
+     <url-pattern>*.jsp</url-pattern>
   </filter-mapping>
+   <filter-mapping>
+    <filter-name>hibernateFilter</filter-name>
+     <url-pattern>*.xml</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+    <filter-name>hibernateFilter</filter-name>
+     <url-pattern>*.swf</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+    <filter-name>hibernateFilter</filter-name>
+     <url-pattern>/servlet/*</url-pattern>
+   </filter-mapping>
   <filter-mapping>
+    <filter-name>hibernateFilter</filter-name>
+     <url-pattern>/fckeditor/*</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
     <filter-name>LocaleFilter</filter-name>
-     <url-pattern>/*</url-pattern>
+     <url-pattern>*.do</url-pattern>
    </filter-mapping>
+   <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>*.jsp</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>*.xml</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>*.swf</url-pattern>
+   </filter-mapping>
+   <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>/servlet/*</url-pattern>
+   </filter-mapping>
+    <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>/fckeditor/*</url-pattern>
+   </filter-mapping>
 
   <listener>
 	<listener-class>
@@ -156,76 +216,117 @@
    </servlet>
 
  <servlet>
-    <servlet-name>action</servlet-name>
-    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-    <init-param>
-      <param-name>config</param-name>
-      <param-value>/WEB-INF/struts/struts-config.xml</param-value>
-    </init-param>
-    <init-param>
-      <param-name>debug</param-name>
-      <param-value>999</param-value>
-    </init-param>
-    <init-param>
-      <param-name>detail</param-name>
-      <param-value>2</param-value>
-    </init-param>
-    <init-param>
-      <param-name>validate</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
+	<servlet-name>action</servlet-name>
+	<servlet-class>
+		org.apache.struts.action.ActionServlet
+	</servlet-class>
+	<init-param>
+		<param-name>config</param-name>
+		<param-value>/WEB-INF/struts/struts-config.xml</param-value>
+	</init-param>
+	<init-param>
+		<param-name>debug</param-name>
+		<param-value>999</param-value>
+	</init-param>
+	<init-param>
+		<param-name>detail</param-name>
+		<param-value>2</param-value>
+	</init-param>
+	<init-param>
+		<param-name>validate</param-name>
+		<param-value>true</param-value>
+	</init-param>
+	<load-on-startup>1</load-on-startup>
 </servlet>
 
 <servlet>
-		<description>Instructions Download</description>
-		<display-name>Instructions Download</display-name>
-		<servlet-name>download</servlet-name>
-		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
-	    <init-param>
-	      <param-name>toolContentHandlerBeanName</param-name>
-	      <param-value>centralToolContentHandler</param-value>
-	    </init-param>
-	    <load-on-startup>3</load-on-startup>
+	<description>Instructions Download</description>
+	<display-name>Instructions Download</display-name>
+	<servlet-name>download</servlet-name>
+	<servlet-class>
+		org.lamsfoundation.lams.contentrepository.client.ToolDownload
+	</servlet-class>
+	<init-param>
+		<param-name>toolContentHandlerBeanName</param-name>
+		<param-value>centralToolContentHandler</param-value>
+	</init-param>
+	<load-on-startup>3</load-on-startup>
 </servlet>
 
+<servlet>
+	<servlet-name>AxisServlet</servlet-name>
+	<display-name>Apache-Axis Servlet</display-name>
+	<servlet-class>
+		org.apache.axis2.transport.http.AxisServlet
+	</servlet-class>
+	<load-on-startup>2</load-on-startup>
+</servlet>
+
+<servlet>
+	<servlet-name>AxisRESTServlet</servlet-name>
+	<display-name>Apache-Axis Servlet (REST)</display-name>
+	<servlet-class>
+		org.apache.axis2.transport.http.AxisRESTServlet
+	</servlet-class>
+</servlet>
+
   <servlet-mapping>
 	<servlet-name>action</servlet-name>
-    <url-pattern>*.do</url-pattern>
+	<url-pattern>*.do</url-pattern>
 </servlet-mapping>
 
 <servlet-mapping>
-  <servlet-name>download</servlet-name>
-  <url-pattern>/download/*</url-pattern>
+	<servlet-name>download</servlet-name>
+	<url-pattern>/download/*</url-pattern>
 </servlet-mapping>
 
+<servlet-mapping>
+	<servlet-name>AxisRESTServlet</servlet-name>
+	<url-pattern>/rest/*</url-pattern>
+</servlet-mapping>
+
+<servlet-mapping>
+	<servlet-name>AxisServlet</servlet-name>
+	<url-pattern>/servlet/AxisServlet</url-pattern>
+</servlet-mapping>
+
+<servlet-mapping>
+	<servlet-name>AxisServlet</servlet-name>
+	<url-pattern>*.jws</url-pattern>
+</servlet-mapping>
+
+<servlet-mapping>
+	<servlet-name>AxisServlet</servlet-name>
+	<url-pattern>/services/*</url-pattern>
+</servlet-mapping>
+
    <servlet-mapping>
       <servlet-name>storeLD</servlet-name>
-      <url-pattern>/authoring/storeLearningDesignDetails</url-pattern>
+      <url-pattern>/servlet/authoring/storeLearningDesignDetails</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>storeTheme</servlet-name>
-      <url-pattern>/themes/storeTheme</url-pattern>
+      <url-pattern>/themes/servlet/storeTheme</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>dumpWDDX</servlet-name>
-      <url-pattern>/dumpWDDX</url-pattern>
+      <url-pattern>/servlet/dumpWDDX</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>storeNotebookEntry</servlet-name>
-      <url-pattern>/notebook/storeNotebookEntry</url-pattern>
+      <url-pattern>/servlet/notebook/storeNotebookEntry</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>Connector</servlet-name>
       <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>flashCrashDump</servlet-name>
-      <url-pattern>/flashCrashDump</url-pattern>
+      <url-pattern>/servlet/flashCrashDump</url-pattern>
    </servlet-mapping>
 
    <session-config>
@@ -328,7 +429,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     	    <role-name>COURSE MANAGER</role-name>
     		<role-name>COURSE ADMIN</role-name>
@@ -351,7 +452,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -363,7 +464,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     	    <role-name>COURSE MANAGER</role-name>
     		<role-name>COURSE ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -394,7 +495,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
     <security-role>