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 BRANCHES/DEV/CLOUD1_SP to HEAD:

Browse Source 
40846: CLOUD-28: made activity "appTool" parameter a configurable value.

Also relates to ALF-15557 (sharepoint to create activity posts)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40852 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2012-08-24 11:32:45 +00:00
parent ff90965b05
commit 9cbb72adeb
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ public class ActivityPosterImpl implements ActivityPoster
private static final String FILE_ADDED = "org.alfresco.documentlibrary.file-added"; private static final String FILE_ADDED = "org.alfresco.documentlibrary.file-added";
private static final String FILE_UPDATED = "org.alfresco.documentlibrary.file-updated"; private static final String FILE_UPDATED = "org.alfresco.documentlibrary.file-updated";
private static final String FILE_DELETED = "org.alfresco.documentlibrary.file-deleted"; private static final String FILE_DELETED = "org.alfresco.documentlibrary.file-deleted";
private static final String APP_TOOL = "WebDAV"; private String appTool;
private ActivityService activityService; private ActivityService activityService;
private NodeService nodeService; private NodeService nodeService;
private PersonService personService; private PersonService personService;
@@ -59,12 +59,14 @@ public class ActivityPosterImpl implements ActivityPoster
/** /**
* Constructor * Constructor
* *
* @param appTool
* @param activityService * @param activityService
* @param nodeService * @param nodeService
* @param personService * @param personService
*/ */
public ActivityPosterImpl(ActivityService activityService, NodeService nodeService, PersonService personService) public ActivityPosterImpl(String appTool, ActivityService activityService, NodeService nodeService, PersonService personService)
{ {
this.appTool = appTool;
this.activityService = activityService; this.activityService = activityService;
this.nodeService = nodeService; this.nodeService = nodeService;
this.personService = personService; this.personService = personService;
@@ -126,7 +128,7 @@ public class ActivityPosterImpl implements ActivityPoster
activityService.postActivity( activityService.postActivity(
activityType, activityType,
siteId, siteId,
APP_TOOL, appTool,
json.toString()); json.toString());
} }
@@ -201,6 +203,10 @@ public class ActivityPosterImpl implements ActivityPoster
return new Pair<String, String>(firstName, lastName); return new Pair<String, String>(firstName, lastName);
} }
public void setAppTool(String appTool)
{
this.appTool = appTool;
}
public void setActivityService(ActivityService activityService) public void setActivityService(ActivityService activityService)
{ {

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

@@ -321,7 +321,7 @@ public class WebDAVServlet extends HttpServlet
singletonCache = (SimpleCache<String, NodeRef>)context.getBean("immutableSingletonCache"); singletonCache = (SimpleCache<String, NodeRef>)context.getBean("immutableSingletonCache");
// Collaborator used by WebDAV methods to create activity posts. // Collaborator used by WebDAV methods to create activity posts.
activityPoster = new ActivityPosterImpl(activityService, nodeService, personService); activityPoster = new ActivityPosterImpl("WebDAV", activityService, nodeService, personService);
// Create the WebDAV helper // Create the WebDAV helper
m_davHelper = (WebDAVHelper) context.getBean("webDAVHelper"); m_davHelper = (WebDAVHelper) context.getBean("webDAVHelper");