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 (5.2) to 5.2.N (5.2.1)

Browse Source 
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
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:19:29 +00:00
parent 8a87a94931
commit 9ae53d6770
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/rest/api/Activities.java
View File

@@ -27,6 +27,7 @@ package org.alfresco.rest.api;
import java.util.Map; import java.util.Map;
import org.alfresco.repo.Client;
import org.alfresco.repo.domain.activities.ActivityFeedEntity; import org.alfresco.repo.domain.activities.ActivityFeedEntity;
import org.alfresco.rest.api.model.Activity; import org.alfresco.rest.api.model.Activity;
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
@@ -35,6 +36,9 @@ import org.json.JSONException;
public interface Activities public interface Activities
{ {
static final String APP_TOOL = "API";
static final Client RESTAPI_CLIENT = Client.asType(Client.ClientType.restapi);
public static enum ActivityWho public static enum ActivityWho
{ {
me, others; me, others;

7
source/java/org/alfresco/rest/api/impl/NodesImpl.java
View File

@@ -69,6 +69,7 @@ import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.version.VersionModel; import org.alfresco.repo.version.VersionModel;
import org.alfresco.rest.antlr.WhereClauseParser; import org.alfresco.rest.antlr.WhereClauseParser;
import org.alfresco.rest.api.Activities;
import org.alfresco.rest.api.Nodes; import org.alfresco.rest.api.Nodes;
import org.alfresco.rest.api.QuickShareLinks; import org.alfresco.rest.api.QuickShareLinks;
import org.alfresco.rest.api.model.ContentInfo; import org.alfresco.rest.api.model.ContentInfo;
@@ -170,7 +171,7 @@ import org.springframework.http.MediaType;
public class NodesImpl implements Nodes public class NodesImpl implements Nodes
{ {
private static final Log logger = LogFactory.getLog(NodesImpl.class); private static final Log logger = LogFactory.getLog(NodesImpl.class);
private static final String APP_TOOL = "API";
private enum Type private enum Type
{ {
@@ -1579,7 +1580,7 @@ public class NodesImpl implements Nodes
if (aSync) if (aSync)
{ {
ActivitiesTransactionListener txListener = new ActivitiesTransactionListener(activityType, activityInfo, 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); poster, retryingTransactionHelper);
AlfrescoTransactionSupport.bindListener(txListener); AlfrescoTransactionSupport.bindListener(txListener);
} }
@@ -1587,7 +1588,7 @@ public class NodesImpl implements Nodes
{ {
poster.postFileFolderActivity(activityType, null, TenantUtil.getCurrentDomain(), poster.postFileFolderActivity(activityType, null, TenantUtil.getCurrentDomain(),
activityInfo.getSiteId(), activityInfo.getParentNodeRef(), activityInfo.getNodeRef(), 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()); activityInfo.getFileInfo());
} }
} }