Index: jobscheduler/scheduler-tool/src/webapp/WEB-INF/web.xml
===================================================================
--- jobscheduler/scheduler-tool/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ jobscheduler/scheduler-tool/src/webapp/WEB-INF/web.xml	(working copy)
@@ -8,7 +8,7 @@
 
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>server</param-value>
+        <param-value>client</param-value>
     </context-param>
 
     <context-param>
Index: userauditservice/tool/src/webapp/WEB-INF/web.xml
===================================================================
--- userauditservice/tool/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ userauditservice/tool/src/webapp/WEB-INF/web.xml	(working copy)
@@ -10,7 +10,7 @@
 
   <context-param>
     <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-    <param-value>server</param-value>
+    <param-value>client</param-value>
   </context-param>
 
   <context-param>
Index: chat/chat-tool/tool/src/webapp/WEB-INF/web.xml
===================================================================
--- chat/chat-tool/tool/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ chat/chat-tool/tool/src/webapp/WEB-INF/web.xml	(working copy)
@@ -66,8 +66,11 @@
     </listener>
     
 	<!-- the faces handling xml -->
-	
     <context-param>
+        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+        <param-value>client</param-value>
+    </context-param>
+    <context-param>
         <param-name>com.sun.faces.validateXml</param-name>
         <param-value>true</param-value>
     </context-param>
Index: podcasts/podcasts-app/src/webapp/WEB-INF/web.xml
===================================================================
--- podcasts/podcasts-app/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ podcasts/podcasts-app/src/webapp/WEB-INF/web.xml	(working copy)
@@ -7,7 +7,7 @@
 
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>server</param-value>
+        <param-value>client</param-value>
     </context-param>
  
     <context-param>
@@ -122,4 +122,4 @@
 	    <welcome-file>index.html</welcome-file>
   	</welcome-file-list>
 
-</web-app>
\ No newline at end of file
+</web-app>
Index: help/help-tool/src/webapp/WEB-INF/web.xml
===================================================================
--- help/help-tool/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ help/help-tool/src/webapp/WEB-INF/web.xml	(working copy)
@@ -8,7 +8,7 @@
 
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>server</param-value>
+        <param-value>client</param-value>
     </context-param>
 
     <context-param>
Index: syllabus/syllabus-app/src/webapp/WEB-INF/web.xml
===================================================================
--- syllabus/syllabus-app/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ syllabus/syllabus-app/src/webapp/WEB-INF/web.xml	(working copy)
@@ -7,7 +7,7 @@
 
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>server</param-value>
+        <param-value>client</param-value>
     </context-param>
     
 <!--sakai-->
@@ -122,4 +122,4 @@
 	    <welcome-file>index.html</welcome-file>
   	</welcome-file-list>
 
-</web-app>
\ No newline at end of file
+</web-app>
Index: calendar/calendar-summary-tool/tool/src/webapp/WEB-INF/web.xml
===================================================================
--- calendar/calendar-summary-tool/tool/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ calendar/calendar-summary-tool/tool/src/webapp/WEB-INF/web.xml	(working copy)
@@ -8,7 +8,7 @@
 
 	<context-param>
 		<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-		<param-value>server</param-value>
+		<param-value>client</param-value>
 	</context-param>
 
 	<context-param>
Index: profile/profile-app/src/webapp/WEB-INF/web.xml
===================================================================
--- profile/profile-app/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ profile/profile-app/src/webapp/WEB-INF/web.xml	(working copy)
@@ -8,7 +8,7 @@
     <description>Sakai Profile</description>
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>server</param-value>
+        <param-value>client</param-value>
     </context-param>
     <context-param>
 	 <!-- Ordering changed to meet DTD - PAFH 8/30/2006 -->
Index: postem/postem-app/src/webapp/WEB-INF/web.xml
===================================================================
--- postem/postem-app/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ postem/postem-app/src/webapp/WEB-INF/web.xml	(working copy)
@@ -7,7 +7,7 @@
 
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>server</param-value>
+        <param-value>client</param-value>
     </context-param>
     
 <!--sakai-->
Index: site-manage/site-association-tool/tool/src/webapp/WEB-INF/web.xml
===================================================================
--- site-manage/site-association-tool/tool/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ site-manage/site-association-tool/tool/src/webapp/WEB-INF/web.xml	(working copy)
@@ -10,7 +10,7 @@
 
   <context-param>
     <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-    <param-value>server</param-value>
+    <param-value>client</param-value>
   </context-param>
 
   <context-param>
Index: usermembership/tool/src/webapp/WEB-INF/web.xml
===================================================================
--- usermembership/tool/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ usermembership/tool/src/webapp/WEB-INF/web.xml	(working copy)
@@ -7,7 +7,7 @@
 
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>server</param-value>
+        <param-value>client</param-value>
     </context-param>
 
     <context-param>
Index: msgcntr/messageforums-app/src/webapp/WEB-INF/web.xml
===================================================================
--- msgcntr/messageforums-app/src/webapp/WEB-INF/web.xml	(revision 134084)
+++ msgcntr/messageforums-app/src/webapp/WEB-INF/web.xml	(working copy)
@@ -9,7 +9,7 @@
     <description>Sakai Message Forums</description>
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>server</param-value>
+        <param-value>client</param-value>
     </context-param>
     <context-param>
     	<!-- Changed ordering - PAFH 8/24/2006 -->
Index: samigo/samigo-app/sakai-samigo/webapp/WEB-INF/web.xml
===================================================================
--- samigo/samigo-app/sakai-samigo/webapp/WEB-INF/web.xml	(revision 134043)
+++ samigo/samigo-app/sakai-samigo/webapp/WEB-INF/web.xml	(working copy)
@@ -10,6 +10,11 @@
 
   <!-- BEGIN SAMIGO JSF CONTEXT PARAM-->
     <context-param>
+        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+        <param-value>client</param-value>
+    </context-param>
+
+    <context-param>
         <description>
             Set this flag to true if you want the JavaServer Faces
             Reference Implementation to validate the XML in your
Index: tool/tool-tool/su/src/webapp/WEB-INF/web.xml
===================================================================
--- tool/tool-tool/su/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ tool/tool-tool/su/src/webapp/WEB-INF/web.xml	(working copy)
@@ -7,7 +7,7 @@
 
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>server</param-value>
+        <param-value>client</param-value>
     </context-param>
 
     <context-param>
Index: user/user-tool-prefs/tool/src/webapp/WEB-INF/web.xml
===================================================================
--- user/user-tool-prefs/tool/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ user/user-tool-prefs/tool/src/webapp/WEB-INF/web.xml	(working copy)
@@ -7,7 +7,7 @@
 
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>server</param-value>
+        <param-value>client</param-value>
     </context-param>
 
     <context-param>
Index: user/user-tool-admin-prefs/admin-prefs/src/webapp/WEB-INF/web.xml
===================================================================
--- user/user-tool-admin-prefs/admin-prefs/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ user/user-tool-admin-prefs/admin-prefs/src/webapp/WEB-INF/web.xml	(working copy)
@@ -7,7 +7,7 @@
 
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>server</param-value>
+        <param-value>client</param-value>
     </context-param>
 
     <context-param>
Index: osp/wizard/tool/src/webapp/WEB-INF/web.xml
===================================================================
--- osp/wizard/tool/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ osp/wizard/tool/src/webapp/WEB-INF/web.xml	(working copy)
@@ -10,7 +10,7 @@
     
    <context-param>
        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-       <param-value>server</param-value>
+       <param-value>client</param-value>
    </context-param>
    
     <context-param>
@@ -184,4 +184,4 @@
      <url-pattern>/repository/*</url-pattern>
   </servlet-mapping>
 -->
-</web-app>
\ No newline at end of file
+</web-app>
Index: osp/matrix/tool/src/webapp/WEB-INF/web.xml
===================================================================
--- osp/matrix/tool/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ osp/matrix/tool/src/webapp/WEB-INF/web.xml	(working copy)
@@ -5,6 +5,11 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
+    <context-param>
+        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+        <param-value>client</param-value>
+    </context-param>
+
 	<context-param>
       <param-name>contextConfigLocation</param-name>
       <param-value>/WEB-INF/components.xml</param-value>
Index: osp/presentation/tool/src/webapp/WEB-INF/web.xml
===================================================================
--- osp/presentation/tool/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ osp/presentation/tool/src/webapp/WEB-INF/web.xml	(working copy)
@@ -15,7 +15,7 @@
    
    <context-param>
        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-       <param-value>server</param-value>
+       <param-value>client</param-value>
    </context-param>
 
   <!--sakai-->
@@ -195,4 +195,4 @@
      <url-pattern>/repository/*</url-pattern>
   </servlet-mapping>
 
-</web-app>
\ No newline at end of file
+</web-app>
Index: osp/portal/tool/src/webapp/WEB-INF/web.xml
===================================================================
--- osp/portal/tool/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ osp/portal/tool/src/webapp/WEB-INF/web.xml	(working copy)
@@ -40,7 +40,7 @@
 
    <context-param>
        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-       <param-value>server</param-value>
+       <param-value>client</param-value>
    </context-param>
 
   <!--sakai-->
@@ -112,4 +112,4 @@
       <url-pattern>*.jsf</url-pattern>
    </servlet-mapping>
 
-</web-app>
\ No newline at end of file
+</web-app>
Index: osp/common/tool/src/webapp/WEB-INF/web.xml
===================================================================
--- osp/common/tool/src/webapp/WEB-INF/web.xml	(revision 134043)
+++ osp/common/tool/src/webapp/WEB-INF/web.xml	(working copy)
@@ -15,7 +15,7 @@
    
    <context-param>
        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-       <param-value>server</param-value>
+       <param-value>client</param-value>
    </context-param>
 
   <!--sakai-->