Index: lams_central/conf/xdoclet/filter-mappings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/filter-mappings.xml,v
diff -u -r1.4 -r1.5
--- lams_central/conf/xdoclet/filter-mappings.xml	15 Feb 2006 05:28:56 -0000	1.4
+++ lams_central/conf/xdoclet/filter-mappings.xml	12 Sep 2006 05:51:07 -0000	1.5
@@ -1,14 +1,89 @@
-  <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>
\ No newline at end of file
Index: lams_central/src/flash/org/lamsfoundation/lams/learner/Scratchpad.as
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/learner/Attic/Scratchpad.as,v
diff -u -r1.4 -r1.5
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/StoreLDServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/web/StoreLDServlet.java,v
diff -u -r1.5 -r1.6
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/StoreLDServlet.java	28 Aug 2006 05:51:28 -0000	1.5
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/StoreLDServlet.java	12 Sep 2006 05:51:07 -0000	1.6
@@ -44,7 +44,7 @@
  * @author Fiona Malikoff
  *
  * @web:servlet name="storeLD"
- * @web:servlet-mapping url-pattern="/authoring/storeLearningDesignDetails"
+ * @web:servlet-mapping url-pattern="/servlet/authoring/storeLearningDesignDetails"
  */
 public class StoreLDServlet extends AbstractStoreWDDXPacketServlet {
 
Index: lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java,v
diff -u -r1.1 -r1.2
--- lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java	31 Jul 2006 08:01:18 -0000	1.1
+++ lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java	12 Sep 2006 05:51:07 -0000	1.2
@@ -43,7 +43,7 @@
  * @author Mitchell Seaton
  *
  * @web:servlet name="storeNotebookEntry"
- * @web:servlet-mapping url-pattern="/notebook/storeNotebookEntry"
+ * @web:servlet-mapping url-pattern="/servlet/notebook/storeNotebookEntry"
  */
 public class StoreNBEntryServlet extends AbstractStoreWDDXPacketServlet {
 
Index: lams_common/src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/flash/org/lamsfoundation/lams/common/dict/Attic/Dictionary.as,v
diff -u -r1.21 -r1.22
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/util/Debugger.as
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/flash/org/lamsfoundation/lams/common/util/Attic/Debugger.as,v
diff -u -r1.12 -r1.13
Binary files differ