From 9cbb72adeb4059bb1926a8d98ce460eb0b5aed06 Mon Sep 17 00:00:00 2001
From: Matt Ward <matt.ward@alfresco.com>
Date: Fri, 24 Aug 2012 11:32:45 +0000
Subject: [PATCH] Merged BRANCHES/DEV/CLOUD1_SP to HEAD:    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
---
 .../alfresco/repo/webdav/ActivityPosterImpl.java   | 14 ++++++++++----
 .../org/alfresco/repo/webdav/WebDAVServlet.java    |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/source/java/org/alfresco/repo/webdav/ActivityPosterImpl.java b/source/java/org/alfresco/repo/webdav/ActivityPosterImpl.java
index 423b1dbc37..b9e4ffbeee 100644
--- a/source/java/org/alfresco/repo/webdav/ActivityPosterImpl.java
+++ b/source/java/org/alfresco/repo/webdav/ActivityPosterImpl.java
@@ -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_UPDATED = "org.alfresco.documentlibrary.file-updated";
     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 NodeService nodeService;
     private PersonService personService;
@@ -58,13 +58,15 @@ public class ActivityPosterImpl implements ActivityPoster
 
     /**
      * Constructor
-     * 
+     *
+     * @param appTool
      * @param activityService
      * @param nodeService
      * @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.nodeService = nodeService;
         this.personService = personService;
@@ -126,7 +128,7 @@ public class ActivityPosterImpl implements ActivityPoster
         activityService.postActivity(
                     activityType,
                     siteId,
-                    APP_TOOL,
+                    appTool,
                     json.toString());
     }
     
@@ -201,6 +203,10 @@ public class ActivityPosterImpl implements ActivityPoster
         return new Pair<String, String>(firstName, lastName);
     }
 
+    public void setAppTool(String appTool)
+    {
+        this.appTool = appTool;
+    }
 
     public void setActivityService(ActivityService activityService)
     {
diff --git a/source/java/org/alfresco/repo/webdav/WebDAVServlet.java b/source/java/org/alfresco/repo/webdav/WebDAVServlet.java
index 32b502486a..60e6dec469 100644
--- a/source/java/org/alfresco/repo/webdav/WebDAVServlet.java
+++ b/source/java/org/alfresco/repo/webdav/WebDAVServlet.java
@@ -321,7 +321,7 @@ public class WebDAVServlet extends HttpServlet
         singletonCache = (SimpleCache<String, NodeRef>)context.getBean("immutableSingletonCache");
         
         // 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
         m_davHelper = (WebDAVHelper) context.getBean("webDAVHelper");