Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

84349: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      84240: MNT-12407/MNT-11511 : Reverse Merge V4.2-BUG-FIX (4.2.4)
         77501 : Merged DEV to V4.2-BUG-FIX (4.2.4)
            76291 : MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
               - Using tagscope api at search for tags quantity in repository


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

config/alfresco/bootstrap/spaces.xml

@@ -17,9 +17,6 @@
 		<app:icon>space-icon-default</app:icon>
 		<cm:title>${spaces.company_home.name}</cm:title>
 		<cm:description>${spaces.company_home.description}</cm:description>
-                <view:aspects>
-                   <cm:tagscope/>
-                </view:aspects>
 		<cm:contains>
 			<cm:folder view:childName="${spaces.dictionary.childname}">
             <view:acl view:inherit="false">

config/alfresco/messages/patch-service.properties

@@ -458,9 +458,6 @@ patch.asynchrounse.checking=Checking for the asynchronous patch ...
 patch.renameSiteAuthorityDisplayName.description=Update authority display name for sites
 patch.renameSiteAuthorityDisplayName.result=Updating of display names was completed
 
-patch.addTagScopeAspect.description=Add tagscode aspect to the Company Home folder
-patch.addTagScopeAspect.result=tagscope aspect added to the Company Home folder successfully
-
 patch.db-V5.0-upgrade-to-activiti-5.16.2.description=Update Activiti tables from 5.14 to 5.16.2
 patch.db-V5.0-upgrade-to-activiti-5.16.2.result=Activiti tables updated
 

config/alfresco/patch/patch-services-context.xml

@@ -3205,36 +3205,6 @@
         </property>
     </bean>
     
-    <bean id="patch.addTagScopeAspect"
-        class="org.alfresco.repo.admin.patch.impl.AddTagScopeAspect"
-        parent="basePatch">
-        <!-- Patch is disabled, see MNT-11511 -->
-        <property name="ignored">
-            <value>true</value>
-        </property>
-        <property name="id">
-            <value>patch.addTagScopeAspect</value>
-        </property>
-        <property name="description">
-            <value>patch.addTagScopeAspect.description</value>
-        </property>
-        <property name="fixesFromSchema">
-            <value>0</value>
-        </property>
-        <property name="fixesToSchema">
-            <value>8001</value>
-        </property>
-        <property name="targetSchema">
-            <value>8002</value>
-        </property>
-        <property name="repository">
-            <ref bean="repositoryHelper"/>
-        </property>
-        <property name="taggingService">
-            <ref bean="TaggingService"/>
-        </property>
-    </bean>
-    
     <bean id="patch.siteAdministrators" class="org.alfresco.repo.admin.patch.impl.AddGroupAuthorityPatch" parent="basePatch" >
         <property name="id"><value>patch.siteAdministrators</value></property>
         <property name="description"><value>patch.siteAdministrators.description</value></property>

source/java/org/alfresco/repo/admin/patch/impl/AddTagScopeAspect.java

@@ -1,45 +0,0 @@
-package org.alfresco.repo.admin.patch.impl;
-
-import org.alfresco.repo.admin.patch.AbstractPatch;
-import org.alfresco.repo.model.Repository;
-import org.alfresco.service.cmr.tagging.TaggingService;
-import org.springframework.extensions.surf.util.I18NUtil;
-
-public class AddTagScopeAspect  extends AbstractPatch
-{
-    /** The title we give to the batch process in progress messages / JMX. */
-    private static final String SUCCESS_MSG = "patch.addTagScopeAspect.result";
-    
-    /** Services */
-    private TaggingService taggingService;
-    
-    /** Repository object */
-    private Repository repository;
-
-    
-    /**
-     * Sets the tagging service.
-     * 
-     * @param taggingService
-     *            the tagging service
-     */
-    public void setTaggingService(TaggingService taggingService)
-    {
-        this.taggingService = taggingService;
-    }
-    
-    /**
-     * @param repository    repository object
-     */
-    public void setRepository(Repository repository)
-    {
-        this.repository = repository;
-    }
-
-    @Override
-    protected String applyInternal() throws Exception
-    {
-        taggingService.addTagScope(repository.getCompanyHome());
-        return I18NUtil.getMessage(SUCCESS_MSG);
-    }
-}