mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Reverse-merged /alfresco/BRANCHES/DEV/IMAP3:r14500,14521,14560,14563,14632
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -41,7 +41,6 @@ import org.alfresco.service.cmr.view.ImporterService;
|
||||
import org.alfresco.service.cmr.view.Location;
|
||||
import org.springframework.context.MessageSource;
|
||||
import org.springframework.core.io.ClassPathResource;
|
||||
|
||||
/**
|
||||
* Builds folders tree necessary for IMAP functionality and imports email action scripts.
|
||||
*
|
||||
@@ -177,7 +176,6 @@ public class ImapFoldersPatch extends AbstractPatch
|
||||
throw new PatchException("XPath returned too many results: \n" + " root: " + storeRootNodeRef + "\n" + " xpath: " + xpath + "\n" + " results: " + nodeRefs);
|
||||
}
|
||||
this.dictionaryNodeRef = nodeRefs.get(0);
|
||||
|
||||
sb.append("/").append(scriptsChildName);
|
||||
xpath = sb.toString();
|
||||
nodeRefs = searchService.selectNodes(storeRootNodeRef, xpath, null, namespaceService, false);
|
||||
@@ -190,7 +188,6 @@ public class ImapFoldersPatch extends AbstractPatch
|
||||
throw new PatchException("XPath returned too many results: \n" + " root: " + storeRootNodeRef + "\n" + " xpath: " + xpath + "\n" + " results: " + nodeRefs);
|
||||
}
|
||||
this.scriptsNodeRef = nodeRefs.get(0);
|
||||
|
||||
// get the ImapConfig node
|
||||
sb.delete((sb.length() - (scriptsChildName.length() + 1)), sb.length());
|
||||
sb.append("/").append(imapConfigChildName);
|
||||
|
Reference in New Issue
Block a user