Merged V4.0 to HEAD

33056: Fix for ALF-12280: Upgrading from version 3.4.7 to 4.0.0 failed with MS SQL database
    - Added dialect-specific script for SQL Server
   33059: Fix for ALF-12127, ALF-11161, ALF-11988
      Merged BRANCHES/DEV/THOR1 to BRANCHES/V4.0
         33049: Fixed follow issues on THOR-839 & THOR-826
                - Following webscripts now sets "Content-Type" response header to application/json
                - which makes people search display follow buttons for people correctly
      Fix for ALF-12077
         Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
            32999: Fix for ALF-12050 - IE specific handling of Ajax requests does not correctly respect no-cache setting, need to set Expires header also
   33060: Fix for ALF-12208 - group name encoding
   33073: Fix for ALF-12295 - CLONE - Upload issue ? - Failed to get content ... (No such file or directory) ... x22
   33087: Calendar: Permissions updates, fixes: ALF-12179 & makes the permissions flag boolean.
   33088: FIXED : ALF-11862: An error message appears when you open the "edit task", to request to join the "moderated site"
   Now handles null value
   33102: Fix for ACT #15024-37148 (will update with JIRA no. once available) 
   - issue where in a load balanced Share environment (multiple web-tiers behind a reverse proxy) the modification to the template layout selection for a site or user dashboard would not be reflected in all servers.
   33105: Bitrock license notice file.
   33110: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0:
      33109: ALF-11479: When upgrading from Alfresco Community 3.4.d to 4.0.b, some nodes that are blocked and have versions fail after the upgrade
   33114: Merged DEV to V4.0
      33067: Fix ALF-12206: CMIS: Error getting association information referencing archived node
   33122: Fix for ALF-12316 Repo -> SOLR query uses HTTPClient that only supports 2 simultaneous connections
   - configurable via spring (default if unconfigured is 40 connections to one host and 40 max connections)
   33142: ALF-12339: Prevents ArrayOutOfBoundsException that can occur with concurrent access of i18n bundle in WebScript
   33320: (RECORD ONLY) Merged BRANCHES\DEV\V4.0-BUG-FIX to BRANCHESV4.0
       33305: ALF-12463 Error querying database was detected during upgrade process from 3.1 to 4.0.0.
   33326: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
       33277    ALF-12468 CLONE - Regression. Searches cause database server to thrash CPU - ALF-12426
   33331: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\V4.0
       33301: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
           33299: ALF-12281: Memory leak in ReferenceCountingReadOnlyIndexReaderFactory
       33303: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
           33302: ALF-12281: Correction to previous checkin - deal with the initial reference created by the constructor and cleared by closeIfRequired()


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

source/java/org/alfresco/web/ui/repo/component/property/BaseAssociationEditor.java

@@ -741,7 +741,7 @@ public abstract class BaseAssociationEditor extends UIInput
             groupDisplayName = group.substring(PermissionService.GROUP_PREFIX.length());
          }
          
-         out.write(groupDisplayName);
+         out.write(Utils.encode(groupDisplayName));
       }
       else
       {
@@ -894,8 +894,7 @@ public abstract class BaseAssociationEditor extends UIInput
                else if (ContentModel.TYPE_AUTHORITY_CONTAINER.equals(nodeService.getType(item)))
                {
                   // if the node represents a group, show the authority display name instead of the name
-                  String groupDisplayName = (String)nodeService.getProperty(item, 
+                  String groupDisplayName = (String)nodeService.getProperty(item, ContentModel.PROP_AUTHORITY_DISPLAY_NAME);
-                           ContentModel.PROP_AUTHORITY_DISPLAY_NAME);
                   if (groupDisplayName == null || groupDisplayName.length() == 0)
                   {
                      String group = (String)nodeService.getProperty(item, 
@@ -906,11 +905,8 @@ public abstract class BaseAssociationEditor extends UIInput
                   out.write("<option value='");
                   out.write(item.toString());
                   out.write("'>");
-                  out.write(groupDisplayName);
+                  out.write(Utils.encode(groupDisplayName));
                   out.write("</option>");
-                  
-                  
-                  
                }
                else
                {

source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java

@@ -186,7 +186,7 @@ public class UIAssociationEditor extends BaseAssociationEditor
                      groupDisplayName = group.substring(PermissionService.GROUP_PREFIX.length());
                   }
                   
-                  out.write(groupDisplayName);
+                  out.write(Utils.encode(groupDisplayName));
                }
                else
                {

source/java/org/alfresco/web/ui/repo/component/property/UIChildAssociationEditor.java

@@ -176,7 +176,7 @@ public class UIChildAssociationEditor extends BaseAssociationEditor
                   groupDisplayName = group.substring(PermissionService.GROUP_PREFIX.length());
                }
                
-               out.write(groupDisplayName);
+               out.write(Utils.encode(groupDisplayName));
             }
             else
             {