From 352e065b07f7b1cf742c2558dec7bcb40a855f21 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Tue, 10 Mar 2009 13:08:01 +0000 Subject: [PATCH] Merged v3.1 to HEAD 12864 *RECORD ONLY*: Created V3.1 branch from HEAD (Labs 3D) 12871: Fix UTF-8 encoding for activity feed (ETHREEOH-1197 on V3.1 branch) 12872: Fix WCM refactor which affected "My Web Files" (ETHREEOH-1207 on V3.1 branch) 12892: Updated svn:mergeinfo for DEV/LIVECYCLE-3.1 to V3.1 ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.1:r12864,12871-12872,12892 Merged /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12580,12768,12886 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/activities/feed/FeedTaskProcessor.java | 12 ++++-------- source/java/org/alfresco/repo/jscript/AVM.java | 4 +++- source/java/org/alfresco/repo/template/AVM.java | 4 +++- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java b/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java index d191026e2a..211564cdb5 100644 --- a/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java +++ b/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java @@ -25,13 +25,11 @@ package org.alfresco.repo.activities.feed; import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.Writer; +import java.io.StringWriter; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URISyntaxException; @@ -527,12 +525,10 @@ public abstract class FeedTaskProcessor templateCache.put(fmTemplate, myTemplate); } - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - Writer out = new OutputStreamWriter(bos); - myTemplate.process(model, out); - out.flush(); + StringWriter textWriter = new StringWriter(); + myTemplate.process(model, textWriter); - return new String(bos.toByteArray()); + return textWriter.toString(); } protected List getFeedControls(String connectedUser) throws SQLException diff --git a/source/java/org/alfresco/repo/jscript/AVM.java b/source/java/org/alfresco/repo/jscript/AVM.java index 28b5578701..411893b40c 100644 --- a/source/java/org/alfresco/repo/jscript/AVM.java +++ b/source/java/org/alfresco/repo/jscript/AVM.java @@ -154,8 +154,10 @@ public final class AVM extends BaseScopableProcessorExtension SandboxService sbService = this.services.getSandboxService(); + String userStoreId = userSandboxStore(storeId, username); + // get modified items - not including deleted - List assets = sbService.listChangedWebApp(storeId, webapp, false); + List assets = sbService.listChangedWebApp(userStoreId, webapp, false); List items = new ArrayList(assets.size()); diff --git a/source/java/org/alfresco/repo/template/AVM.java b/source/java/org/alfresco/repo/template/AVM.java index 0551d6ecbf..8979bf6d19 100644 --- a/source/java/org/alfresco/repo/template/AVM.java +++ b/source/java/org/alfresco/repo/template/AVM.java @@ -143,9 +143,11 @@ public class AVM extends BaseTemplateProcessorExtension ParameterCheck.mandatoryString("Webapp", webapp); SandboxService sbService = this.services.getSandboxService(); + + String userStoreId = userSandboxStore(storeId, username); // get modified items - not including deleted - List assets = sbService.listChangedWebApp(storeId, webapp, false); + List assets = sbService.listChangedWebApp(userStoreId, webapp, false); List items = new ArrayList(assets.size());