inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

Browse Source 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/service/cmr/activities/ActivityService.java
View File

@@ -47,7 +47,7 @@ public interface ActivityService extends ActivityPostService
* @return list of JSON feed entries
*/
@NotAuditable
public List<String> getUserFeedEntries(String userId, String format, String siteId);
public List<String> getUserFeedEntries(String userId, String siteId);
/**
* Retrieve user feed with optional site filter and optional user filters
@@ -68,7 +68,7 @@ public interface ActivityService extends ActivityPostService
* @return list of JSON feed entries
*/
@NotAuditable
public List<String> getUserFeedEntries(String userId, String format, String siteId, boolean excludeThisUser, boolean excludeOtherUsers);
public List<String> getUserFeedEntries(String userId, String siteId, boolean excludeThisUser, boolean excludeOtherUsers);
/**
@@ -92,7 +92,7 @@ public interface ActivityService extends ActivityPostService
* @return list of JSON feed entries
*/
@NotAuditable
public List<String> getUserFeedEntries(String userId, String format, String siteId, boolean excludeThisUser, boolean excludeOtherUsers, Set<String> userFilter, Set<String> actvityFilter);
public List<String> getUserFeedEntries(String userId, String siteId, boolean excludeThisUser, boolean excludeOtherUsers, Set<String> userFilter, Set<String> actvityFilter);
/**
* Retrieve user feed with optional site filter and optional user filters and optional min feed DB id
@@ -115,7 +115,7 @@ public interface ActivityService extends ActivityPostService
* @return list of JSON feed entries
*/
@NotAuditable
public List<ActivityFeedEntity> getUserFeedEntries(String feedUserId, String format, String siteId, boolean excludeThisUser, boolean excludeOtherUsers, long minFeedId);
public List<ActivityFeedEntity> getUserFeedEntries(String feedUserId, String siteId, boolean excludeThisUser, boolean excludeOtherUsers, long minFeedId);
/**
* Retrieve user feed with optional site filter and optional user filters and optional min feed DB id
@@ -140,10 +140,10 @@ public interface ActivityService extends ActivityPostService
* @return list of JSON feed entries
*/
@NotAuditable
public List<ActivityFeedEntity> getUserFeedEntries(String feedUserId, String format, String siteId, boolean excludeThisUser, boolean excludeOtherUsers, Set<String> userFilter, Set<String> actvityFilter, long minFeedId);
public List<ActivityFeedEntity> getUserFeedEntries(String feedUserId, String siteId, boolean excludeThisUser, boolean excludeOtherUsers, Set<String> userFilter, Set<String> actvityFilter, long minFeedId);
@NotAuditable
public PagingResults<ActivityFeedEntity> getPagedUserFeedEntries(String feedUserId, String format, String siteId, boolean excludeThisUser, boolean excludeOtherUsers, long minFeedId, PagingRequest pagingRequest);
public PagingResults<ActivityFeedEntity> getPagedUserFeedEntries(String feedUserId, String siteId, boolean excludeThisUser, boolean excludeOtherUsers, long minFeedId, PagingRequest pagingRequest);
/**
* Retrieve site feed
@@ -153,7 +153,7 @@ public interface ActivityService extends ActivityPostService
* @return list of JSON feed entries
*/
@NotAuditable
public List<String> getSiteFeedEntries(String siteId, String format);
public List<String> getSiteFeedEntries(String siteId);
/**