Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-04-26 13:03:25 +00:00
parent 9a889c69ea
commit 386a4aca06
327 changed files with 55062 additions and 55062 deletions

View File

@@ -1,20 +1,20 @@
package org.alfresco.rest.api;
import java.util.Map;
import org.alfresco.repo.domain.activities.ActivityFeedEntity;
import org.alfresco.rest.api.model.Activity;
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
import org.alfresco.rest.framework.resource.parameters.Parameters;
import org.json.JSONException;
public interface Activities
{
public static enum ActivityWho
{
me, others;
};
public Map<String, Object> getActivitySummary(ActivityFeedEntity entity) throws JSONException;
public CollectionWithPagingInfo<Activity> getUserActivities(String personId, final Parameters parameters);
}
package org.alfresco.rest.api;
import java.util.Map;
import org.alfresco.repo.domain.activities.ActivityFeedEntity;
import org.alfresco.rest.api.model.Activity;
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
import org.alfresco.rest.framework.resource.parameters.Parameters;
import org.json.JSONException;
public interface Activities
{
public static enum ActivityWho
{
me, others;
};
public Map<String, Object> getActivitySummary(ActivityFeedEntity entity) throws JSONException;
public CollectionWithPagingInfo<Activity> getUserActivities(String personId, final Parameters parameters);
}