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 THOR1_SPRINTS to HEAD

Browse Source 
Performance improvement: prevent unnecessary 304 revalidation requests for thumbnails in detailed view of My-Documents and Recently Modified Documents dashlets
   Fixed bean config problem (caused by r34662)
   Fix build break
   Refactored revalidation code to remove previously added WebScripts that are now surplus to requirements
   Performance improvement: prevent unnecessary 304 revalidation for avatars on site colleagues dashlet
   Performance improvement: prevent unnecessary 304 revalidation for avatars on following/follwers pages
   Performance improvement: prevent unnecessary 304 revalidation for avatars in activity feeds
   Performance improvement: prevent unecessary 304 revalidation for user avatar thumbnails in header WebScript
   Prevent 304 revalidations for unchanged thumbnails in document library, web preview and search

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Draper
2012-03-22 16:44:48 +00:00
parent 728d0a5458
commit 508c880dea
6 changed files with 169 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/java/org/alfresco/repo/domain/activities/ActivityFeedEntity.java
View File

@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import org.alfresco.repo.activities.feed.FeedTaskProcessor;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.util.JSONtoFmModel;
import org.json.JSONException;
import org.json.JSONObject;
@@ -37,6 +38,7 @@ public class ActivityFeedEntity
public static final String KEY_ACTIVITY_FEED_ID = "id";
public static final String KEY_ACTIVITY_FEED_POST_DATE = "postDate";
public static final String KEY_ACTIVITY_FEED_POST_USERID = "postUserId";
public static final String KEY_ACTIVITY_FEED_POST_USER_AVATAR_NODE = "postUserAvatar";
public static final String KEY_ACTIVITY_FEED_USERID = "feedUserId";
public static final String KEY_ACTIVITY_FEED_SITE = "siteNetwork";
public static final String KEY_ACTIVITY_FEED_TYPE = "activityType";
@@ -49,6 +51,7 @@ public class ActivityFeedEntity
private String activitySummaryFormat;
private String feedUserId;
private String postUserId;
private NodeRef postUserAvatarNodeRef;
private String siteNetwork;
private String appTool;
private Date postDate;
@@ -155,6 +158,16 @@ public class ActivityFeedEntity
this.feedDate = feedDate;
}
public NodeRef getPostUserAvatarNodeRef()
{
return postUserAvatarNodeRef;
}
public void setPostUserAvatarNodeRef(NodeRef postUserAvatarNodeRef)
{
this.postUserAvatarNodeRef = postUserAvatarNodeRef;
}
public String getAppTool()
{
return appTool;
@@ -172,6 +185,10 @@ public class ActivityFeedEntity
jo.put(KEY_ACTIVITY_FEED_ID, id);
jo.put(KEY_ACTIVITY_FEED_POST_USERID, postUserId);
if (postUserAvatarNodeRef != null)
{
jo.put(KEY_ACTIVITY_FEED_POST_USER_AVATAR_NODE, postUserAvatarNodeRef.toString());
}
jo.put(KEY_ACTIVITY_FEED_POST_DATE, ISO8601DateFormat.format(postDate));
if (getFeedUserId() != null) { jo.put(KEY_ACTIVITY_FEED_USERID, getFeedUserId()); } // eg. site feed