Merged 5.2.N (5.2.1) to HEAD (5.2)

125783 rmunteanu: 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/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 16:45:04 +00:00
parent da8101a5ba
commit 19fcf2c411
325 changed files with 59952 additions and 59952 deletions

View File

@@ -1,24 +1,24 @@
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;
import org.alfresco.rest.framework.resource.parameters.Parameters;
import org.json.JSONException;
public interface Activities
{
static final String APP_TOOL = "restapi";
static final Client RESTAPI_CLIENT = Client.asType(Client.ClientType.restapi);
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.Client;
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
{
static final String APP_TOOL = "restapi";
static final Client RESTAPI_CLIENT = Client.asType(Client.ClientType.restapi);
public static enum ActivityWho
{
me, others;
};
public Map<String, Object> getActivitySummary(ActivityFeedEntity entity) throws JSONException;
public CollectionWithPagingInfo<Activity> getUserActivities(String personId, final Parameters parameters);
}