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

95986: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94456: Merged DEV (5.0.1) to 5.0.N (5.0.1)
         94352: MNT-12995: Items are not accessible using the urls received via IMAP
         Changed the URLs in IMAP templates to point to Share instead of Explorer(EOL).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-02-04 07:42:57 +00:00
parent b76731eade
commit 7d2b335d5d
35 changed files with 246 additions and 142 deletions

View File

@@ -29,6 +29,7 @@ import javax.mail.internet.MimeMessage;
import org.alfresco.repo.imap.AlfrescoImapConst.ImapViewMode;
import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import com.icegreen.greenmail.store.SimpleStoredMessage;
@@ -285,12 +286,20 @@ public interface ImapService
public String getDefaultEmailBodyTemplate(EmailBodyFormat type);
/**
* Determine if provided node belongs to Sites.
* Get the node's site container if it belongs to Sites.
*
* @param nodeRef nodeRef
* @return true if provided node belongs to sites.
* @return nodeRef of the node's site container or null if provided node does not belong to sites.
*/
public boolean isNodeInSitesLibrary(NodeRef nodeRef);
public NodeRef getNodeSiteContainer(NodeRef nodeRef);
/**
* Get the web URL for the document's parent folder
*
* @param siteContainerNodeRef or null if the document is not from site
* @return url for the content folder
*/
public String getContentFolderUrl(NodeRef siteContainerNodeRef);
/**
* Determines whether the IMAP server is enabled.
@@ -341,4 +350,10 @@ public interface ImapService
* @return path for node relatively to site root
*/
public String getPathFromSites(NodeRef nodeRef);
/**
* @param assocRef an association between the node and it's parent
* @return path for node relatively to repository
*/
public String getPathFromRepo(ChildAssociationRef assocRef);
}