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 
83848: Merged DEV to HEAD-BUG-FIX (5.0)
      83749: ACE-2699: Could not edit documents via WebDAV
       - Set missing poster for ActivityPoster in WebDAVServlet. 
      83839: ACE-2699: Could not edit documents via WebDAV:
       - Replace unused ActivityService with ActivityPoster in ActivityPosterImpl constructor. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2014-09-15 10:23:55 +00:00
parent 4d71bb7de2
commit 7f5633fbdd
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/repo/webdav/ActivityPosterImpl.java
View File

@@ -25,7 +25,6 @@ import org.alfresco.repo.Client;
import org.alfresco.repo.Client.ClientType;
import org.alfresco.repo.activities.ActivityType;
import org.alfresco.service.cmr.activities.ActivityPoster;
import org.alfresco.service.cmr.activities.ActivityService;
import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.repository.NodeRef;
import org.apache.commons.logging.Log;
@@ -55,13 +54,12 @@ public class ActivityPosterImpl implements WebDAVActivityPoster
* Constructor
*
* @param appTool
* @param activityService
* @param nodeService
* @param personService
* @param activityPoster
*/
public ActivityPosterImpl(String appTool, ActivityService activityService)
public ActivityPosterImpl(String appTool, ActivityPoster poster)
{
this.appTool = appTool;
this.poster = poster;
}

6
source/java/org/alfresco/repo/webdav/WebDAVServlet.java
View File

@@ -34,7 +34,7 @@ import org.alfresco.repo.cache.SimpleCache;
import org.alfresco.repo.security.authentication.AuthenticationContext;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.activities.ActivityService;
import org.alfresco.service.cmr.activities.ActivityPoster;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
@@ -264,13 +264,13 @@ public class WebDAVServlet extends HttpServlet
nodeService = (NodeService) context.getBean("NodeService");
searchService = (SearchService) context.getBean("SearchService");
namespaceService = (NamespaceService) context.getBean("NamespaceService");
ActivityService activityService = (ActivityService) context.getBean("activityService");
ActivityPoster poster = (ActivityPoster) context.getBean("activitiesPoster");
singletonCache = (SimpleCache<String, NodeRef>)context.getBean("immutableSingletonCache");
// Collaborator used by WebDAV methods to create activity posts.
activityPoster = new ActivityPosterImpl("WebDAV", activityService);
activityPoster = new ActivityPosterImpl("WebDAV", poster);
// Create the WebDAV helper
m_davHelper = (WebDAVHelper) context.getBean("webDAVHelper");