Index: lams_build/conf/unix/jboss/log4j.xml
===================================================================
diff -u -r6baaf874bfc8fafcc6dc20fc066bbfc845eb62bc -r7672b5a92290fadb9863b022124b4f21bf2578a5
--- lams_build/conf/unix/jboss/log4j.xml	(.../log4j.xml)	(revision 6baaf874bfc8fafcc6dc20fc066bbfc845eb62bc)
+++ lams_build/conf/unix/jboss/log4j.xml	(.../log4j.xml)	(revision 7672b5a92290fadb9863b022124b4f21bf2578a5)
@@ -195,6 +195,12 @@
     <appender-ref ref="LAMSCONSOLE"/>
   </category>
   
+  <category name="org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter" additivity="false">
+    <priority value="INFO"/>
+    <appender-ref ref="LAMSFILE"/>
+    <appender-ref ref="LAMSCONSOLE"/>
+  </category>
+  
   <category name="org.lamsfoundation.lams.util.audit" additivity="false">
     <priority value="INFO"/>
     <appender-ref ref="AUDITFILE"/>
Index: lams_build/conf/windows/jboss/log4j.xml
===================================================================
diff -u -r6baaf874bfc8fafcc6dc20fc066bbfc845eb62bc -r7672b5a92290fadb9863b022124b4f21bf2578a5
--- lams_build/conf/windows/jboss/log4j.xml	(.../log4j.xml)	(revision 6baaf874bfc8fafcc6dc20fc066bbfc845eb62bc)
+++ lams_build/conf/windows/jboss/log4j.xml	(.../log4j.xml)	(revision 7672b5a92290fadb9863b022124b4f21bf2578a5)
@@ -195,6 +195,12 @@
     <appender-ref ref="LAMSCONSOLE"/>
   </category>
   
+  <category name="org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter" additivity="false">
+    <priority value="INFO"/>
+    <appender-ref ref="LAMSFILE"/>
+    <appender-ref ref="LAMSCONSOLE"/>
+  </category>
+  
   <category name="org.lamsfoundation.lams.util.audit" additivity="false">
     <priority value="INFO"/>
     <appender-ref ref="AUDITFILE"/>
Index: lams_common/src/java/org/lamsfoundation/lams/integration/security/SingleSignOn.java
===================================================================
diff -u -r560f582867ff02d1a45a7e85cefe43319337dc91 -r7672b5a92290fadb9863b022124b4f21bf2578a5
--- lams_common/src/java/org/lamsfoundation/lams/integration/security/SingleSignOn.java	(.../SingleSignOn.java)	(revision 560f582867ff02d1a45a7e85cefe43319337dc91)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/security/SingleSignOn.java	(.../SingleSignOn.java)	(revision 7672b5a92290fadb9863b022124b4f21bf2578a5)
@@ -50,15 +50,15 @@
 		request.removeNote(Constants.REQ_SSOID_NOTE);
 
 		// Has a valid user already been authenticated?
-		if (log.isDebugEnabled())
-			log.debug("Process request for '" + request.getRequestURI() + "'");
+//		if (log.isDebugEnabled())
+//			log.debug("Process request for '" + request.getRequestURI() + "'");
 		Principal p = request.getUserPrincipal();
 		String username = null;
 		String password = null;
 		if (request.getUserPrincipal() != null) {
-			if (log.isDebugEnabled())
-				log.debug(" Principal '" + request.getUserPrincipal().getName()
-						+ "' has already been authenticated");
+//			if (log.isDebugEnabled())
+//				log.debug(" Principal '" + request.getUserPrincipal().getName()
+//						+ "' has already been authenticated");
 			getNext().invoke(request, response);
 			return;
 		} else {
@@ -71,8 +71,8 @@
 		}
 
 		// Check for the single sign on cookie
-		if (log.isDebugEnabled())
-			log.debug(" Checking for SSO cookie");
+//		if (log.isDebugEnabled())
+//			log.debug(" Checking for SSO cookie");
 		Cookie cookie = null;
 		Cookie cookies[] = request.getCookies();
 		if (cookies == null)
@@ -84,35 +84,35 @@
 			}
 		}
 		if (cookie == null) {
-			if (log.isDebugEnabled())
-				log.debug(" SSO cookie is not present");
+//			if (log.isDebugEnabled())
+//				log.debug(" SSO cookie is not present");
 			getNext().invoke(request, response);
 			return;
 		}
 
 		// Look up the cached Principal associated with this cookie value
-		if (log.isDebugEnabled())
-			log.debug(" Checking for cached principal for " + cookie.getValue());
+//		if (log.isDebugEnabled())
+//			log.debug(" Checking for cached principal for " + cookie.getValue());
 		// register principal from internal session. This principal is set
 		// in internal session by catalina FormAuthenticator
 		if (p != null) {
-			log.debug("principal - " + p.getName());
+//			log.debug("principal - " + p.getName());
 			register(cookie.getValue(), p, Constants.FORM_METHOD, username, password);
 		}
 		SingleSignOnEntry entry = lookup(cookie.getValue());
 		if (entry != null) {
-			if (log.isDebugEnabled())
-				log.debug(" Found cached principal '" + entry.getPrincipal().getName()
-						+ "' with auth type '" + entry.getAuthType() + "'");
+//			if (log.isDebugEnabled())
+//				log.debug(" Found cached principal '" + entry.getPrincipal().getName()
+//						+ "' with auth type '" + entry.getAuthType() + "'");
 			request.setNote(Constants.REQ_SSOID_NOTE, cookie.getValue());
 			// Only set security elements if reauthentication is not required
 			if (!getRequireReauthentication()) {
 				request.setAuthType(entry.getAuthType());
 				request.setUserPrincipal(entry.getPrincipal());
 			}
 		} else {
-			if (log.isDebugEnabled())
-				log.debug(" No cached principal found, erasing SSO cookie");
+//			if (log.isDebugEnabled())
+//				log.debug(" No cached principal found, erasing SSO cookie");
 			cookie.setMaxAge(0);
 			response.addCookie(cookie);
 		}
Index: lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java
===================================================================
diff -u -rad09c4163bcae7ea249a94278c9d9b9fa93e2fc6 -r7672b5a92290fadb9863b022124b4f21bf2578a5
--- lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java	(.../LocaleFilter.java)	(revision ad09c4163bcae7ea249a94278c9d9b9fa93e2fc6)
+++ lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java	(.../LocaleFilter.java)	(revision 7672b5a92290fadb9863b022124b4f21bf2578a5)
@@ -55,7 +55,7 @@
  */
 public class LocaleFilter extends OncePerRequestFilter {
 	
-	private static Logger log = Logger.getLogger(LocaleFilter.class);
+//	private static Logger log = Logger.getLogger(LocaleFilter.class);
 	private String encoding;
 	
 	public static final String PREFERRED_LOCALE_KEY = "org.apache.struts.action.LOCALE";
@@ -101,12 +101,6 @@
 					// so we may end up with some confusing situations.
 					if(!StringUtils.isEmpty(lang)){
 						preferredLocale = new Locale(lang,country!=null?country:"");
-
-						// TODO Added to debug Chinese problem. To be removed.
-						if ( log.isDebugEnabled() ) {
-							log.debug("Locale set from user lang/country is "+lang+","+country);
-						}
-
 					}
 				}
 			}
@@ -117,11 +111,6 @@
         	preferredLocale = new Locale(defaults[0]!=null?defaults[0]:"",
         								 defaults[1]!=null?defaults[1]:"");
         	
-			// TODO Added to debug Chinese problem. To be removed.
-			if ( log.isDebugEnabled() ) {
-				log.debug("Locale set from server is "+defaults[0]+","+defaults[1]);
-			}
-
 		}
 
 		if(direction == null){