From 9ae53d677075fee0aef4306f94d023b4ec571ac0 Mon Sep 17 00:00:00 2001
From: Ancuta Morarasu <ancuta.morarasu@ness.com>
Date: Wed, 11 May 2016 12:19:29 +0000
Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1)    126604 jkaabimofrad:
 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)       124980 gjames: RA-910:
 Added a "restapi" clientType to alfresco-events

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126949 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/rest/api/Activities.java     | 4 ++++
 source/java/org/alfresco/rest/api/impl/NodesImpl.java | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/source/java/org/alfresco/rest/api/Activities.java b/source/java/org/alfresco/rest/api/Activities.java
index e7089dc72c..903c2e94bf 100644
--- a/source/java/org/alfresco/rest/api/Activities.java
+++ b/source/java/org/alfresco/rest/api/Activities.java
@@ -27,6 +27,7 @@ package org.alfresco.rest.api;
 
 import java.util.Map;
 
+import org.alfresco.repo.Client;
 import org.alfresco.repo.domain.activities.ActivityFeedEntity;
 import org.alfresco.rest.api.model.Activity;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
@@ -35,6 +36,9 @@ import org.json.JSONException;
 
 public interface Activities
 {
+	static final String APP_TOOL = "API";
+	static final Client RESTAPI_CLIENT = Client.asType(Client.ClientType.restapi);
+
 	public static enum ActivityWho
 	{
 		me, others;
diff --git a/source/java/org/alfresco/rest/api/impl/NodesImpl.java b/source/java/org/alfresco/rest/api/impl/NodesImpl.java
index 5cc1e15e9f..2318c3069a 100644
--- a/source/java/org/alfresco/rest/api/impl/NodesImpl.java
+++ b/source/java/org/alfresco/rest/api/impl/NodesImpl.java
@@ -69,6 +69,7 @@ import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.version.VersionModel;
 import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.api.Activities;
 import org.alfresco.rest.api.Nodes;
 import org.alfresco.rest.api.QuickShareLinks;
 import org.alfresco.rest.api.model.ContentInfo;
@@ -170,7 +171,7 @@ import org.springframework.http.MediaType;
 public class NodesImpl implements Nodes
 {
     private static final Log logger = LogFactory.getLog(NodesImpl.class);
-    private static final String APP_TOOL = "API";
+
 
     private enum Type
     {
@@ -1579,7 +1580,7 @@ public class NodesImpl implements Nodes
             if (aSync)
             {
                 ActivitiesTransactionListener txListener = new ActivitiesTransactionListener(activityType, activityInfo,
-                        TenantUtil.getCurrentDomain(), APP_TOOL, Client.asType(Client.ClientType.script),
+                        TenantUtil.getCurrentDomain(), Activities.APP_TOOL, Activities.RESTAPI_CLIENT,
                         poster, retryingTransactionHelper);
                 AlfrescoTransactionSupport.bindListener(txListener);
             }
@@ -1587,7 +1588,7 @@ public class NodesImpl implements Nodes
             {
                 poster.postFileFolderActivity(activityType, null, TenantUtil.getCurrentDomain(),
                         activityInfo.getSiteId(), activityInfo.getParentNodeRef(), activityInfo.getNodeRef(),
-                        activityInfo.getFileName(), APP_TOOL, Client.asType(Client.ClientType.script),
+                        activityInfo.getFileName(), Activities.APP_TOOL, Activities.RESTAPI_CLIENT,
                         activityInfo.getFileInfo());
             }
         }