From a15c91c0fa59eb6f2c399f99a20f9b7126fd6b65 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Fri, 15 Oct 2010 16:50:34 +0000 Subject: [PATCH] Merged DEV/TEMPORARY to HEAD 23160: ALF-4720: Hardcoded folder names in new scheduled persisted actions bootstrap Getting of "Scheduled Actions" is done using getChildAssocs() method. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../ScheduledPersistedActionServiceImpl.java | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/source/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceImpl.java b/source/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceImpl.java index 916d3d3ada..1ef204ee0f 100644 --- a/source/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceImpl.java +++ b/source/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceImpl.java @@ -46,6 +46,7 @@ import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; +import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.transaction.TransactionService; @@ -123,16 +124,22 @@ public class ScheduledPersistedActionServiceImpl implements ScheduledPersistedAc protected void locatePersistanceFolder() { - NodeRef dataDictionary = startupNodeService.getChildByName( - repositoryHelper.getCompanyHome(), - ContentModel.ASSOC_CONTAINS, - "Data Dictionary" - ); - SCHEDULED_ACTION_ROOT_NODE_REF = startupNodeService.getChildByName( - dataDictionary, - ContentModel.ASSOC_CONTAINS, - "Scheduled Actions" - ); + List dictionaryAssocs = startupNodeService.getChildAssocs( + repositoryHelper.getCompanyHome(), + ContentModel.ASSOC_CONTAINS, + QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "dictionary")); + if (dictionaryAssocs.size() > 0) + { + NodeRef dataDictionary = dictionaryAssocs.get(0).getChildRef(); + List scheduledAssocs = startupNodeService.getChildAssocs( + dataDictionary, + ContentModel.ASSOC_CONTAINS, + QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "Scheduled Actions")); + if (scheduledAssocs.size() > 0) + { + SCHEDULED_ACTION_ROOT_NODE_REF = scheduledAssocs.get(0).getChildRef(); + } + } } /**