inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
82415: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80297: Publishes an event on WebDav.GET, does not write an activity feed entry.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-04 07:04:24 +00:00
parent 0e73462102
commit 673ba419e9
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/java/org/alfresco/repo/webdav/WebDAVHelper.java
View File

@@ -32,10 +32,14 @@ import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.alfresco.events.types.ContentEvent;
import org.alfresco.events.types.ContentEventImpl;
import org.alfresco.events.types.Event;
import org.alfresco.jlan.util.IPAddress;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.Client;
import org.alfresco.repo.Client.ClientType;
import org.alfresco.repo.events.EventPreparator;
import org.alfresco.repo.events.EventPublisher;
import org.alfresco.repo.lock.LockUtils;
import org.alfresco.repo.model.filefolder.HiddenAspect;
@@ -1099,29 +1103,19 @@ public class WebDAVHelper
if (!StringUtils.hasText(range))
{
//Its not a range request
SiteService siteService = getServiceRegistry().getSiteService();
final String siteId = siteService.getSiteShortName(realNodeInfo.getNodeRef());
poster.postFileFolderActivity(ActivityPoster.DOWNLOADED, null, m_tenantService.getCurrentUserDomain(),
siteId, null, realNodeInfo.getNodeRef(), realNodeInfo.getName(),
"webdav", Client.asType(ClientType.webdav), null);
}
// eventPublisher.publishEvent(new EventPreparator(){
// @Override
// public Event prepareEvent(String user, String networkId, String transactionId)
// {
//
//
// if (StringUtils.hasText(range))
// {
// return new ContentReadRangeEvent(user, networkId, transactionId, realNodeInfo.getNodeRef().getId(),
// siteId, realNodeInfo.getType().toString(), Client.asType(ClientType.webdav), realNodeInfo.getName(), mimetype, size, contentEncoding, range);
// }
// }
// });
// Its not a range request
eventPublisher.publishEvent(new EventPreparator()
{
@Override
public Event prepareEvent(String user, String networkId, String transactionId)
{
return new ContentEventImpl(ContentEvent.DOWNLOAD, user, networkId, transactionId, realNodeInfo.getNodeRef().getId(), null,
realNodeInfo.getType().toString(), Client.asType(ClientType.webdav), realNodeInfo.getName(), mimetype,
size, contentEncoding);
}
});
}
}
public String getRepositoryPath(HttpServletRequest request)