From f8aef1344a6ea29422bf2cb0b34ecfc87b135e5f Mon Sep 17 00:00:00 2001 From: Jamal Kaabi-Mofrad Date: Mon, 2 Jun 2014 04:03:57 +0000 Subject: [PATCH] =?UTF-8?q?ACE-1447:=20Added=20'cm:indexControl'=20aspect?= =?UTF-8?q?=20to=20surf-config=20folder=20and=20its=20children=20so=20they?= =?UTF-8?q?=20wouldn=E2=80=99t=20be=20indexed.=20Also=20added=20an=20async?= =?UTF-8?q?hronous=20patch.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@72733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/bean/ADMRemoteStore.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/bean/ADMRemoteStore.java b/source/java/org/alfresco/repo/web/scripts/bean/ADMRemoteStore.java index f94a3505a4..6cc134f829 100644 --- a/source/java/org/alfresco/repo/web/scripts/bean/ADMRemoteStore.java +++ b/source/java/org/alfresco/repo/web/scripts/bean/ADMRemoteStore.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2013 Alfresco Software Limited. + * Copyright (C) 2005-2014 Alfresco Software Limited. * * This file is part of Alfresco * @@ -27,6 +27,7 @@ import java.net.SocketException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -819,12 +820,23 @@ public class ADMRemoteStore extends BaseRemoteStore { if (create) { + List folders = isFolder ? pathElements : pathElements.subList(0, pathElements.size() - 1); + + List folderDetails = new ArrayList<>(pathElements.size()); + Map prop = new HashMap<>(2); + prop.put(ContentModel.PROP_IS_INDEXED, false); + prop.put(ContentModel.PROP_IS_CONTENT_INDEXED, false); + for (String element : folders) + { + folderDetails.add(new FileFolderUtil.PathElementDetails(element, Collections.singletonMap( + ContentModel.ASPECT_INDEX_CONTROL, prop))); + } // ensure folders exist down to the specified parent // ALF-17729 / ALF-17796 - disable auditable on parent folders result = FileFolderUtil.makeFolders( - this.fileFolderService, + this.fileFolderService,nodeService, surfConfigRef, - isFolder ? pathElements : pathElements.subList(0, pathElements.size() - 1), + folderDetails, ContentModel.TYPE_FOLDER, behaviourFilter, new HashSet(Arrays.asList(new QName[]{ContentModel.ASPECT_AUDITABLE})));