Merged V2.1 to HEAD

6910: Fix for WCM-858, actions for files with an apostrophe in the name emit JavaScript errors
   6916: Fix to layout when My Spaces portlet follows on same page
   6919: Fix for AWC-1367 and AWC-1627
   6923: Added suport for datetime tokens in the lucene inedx
   6925: Fix for WCM-810
   6930: Fix for WCM-854
   Moved schema version to 110 and adjusted patch accordingly.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7343 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/ui/common/Utils.java

@@ -80,6 +80,7 @@ import org.alfresco.web.ui.common.component.UIStatusMessage;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.shared_impl.renderkit.html.HtmlFormRendererBase;
+import org.springframework.util.StringUtils;
 import org.springframework.web.jsf.FacesContextUtils;
 
 /**
@@ -650,7 +651,7 @@ public final class Utils
             buf.append("']['");
             buf.append(name);
             buf.append("'].value='");
-            buf.append(params.get(name));
+            buf.append(StringUtils.replace(params.get(name), "'", "\\'"));
             buf.append("';");
             
             // weak, but this seems to be the way Sun RI do it...