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 v3.1 to HEAD

Browse Source 
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
This commit is contained in:
Derek Hulley
2009-03-10 13:08:01 +00:00
parent 6641fd64fc
commit 352e065b07
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java
View File

@@ -25,13 +25,11 @@
package org.alfresco.repo.activities.feed; package org.alfresco.repo.activities.feed;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStreamWriter; import java.io.StringWriter;
import java.io.Writer;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@@ -527,12 +525,10 @@ public abstract class FeedTaskProcessor
templateCache.put(fmTemplate, myTemplate); templateCache.put(fmTemplate, myTemplate);
} }
ByteArrayOutputStream bos = new ByteArrayOutputStream(); StringWriter textWriter = new StringWriter();
Writer out = new OutputStreamWriter(bos); myTemplate.process(model, textWriter);
myTemplate.process(model, out);
out.flush();
return new String(bos.toByteArray()); return textWriter.toString();
} }
protected List<FeedControlDAO> getFeedControls(String connectedUser) throws SQLException protected List<FeedControlDAO> getFeedControls(String connectedUser) throws SQLException

4
source/java/org/alfresco/repo/jscript/AVM.java
View File

@@ -154,8 +154,10 @@ public final class AVM extends BaseScopableProcessorExtension
SandboxService sbService = this.services.getSandboxService(); SandboxService sbService = this.services.getSandboxService();
String userStoreId = userSandboxStore(storeId, username);
// get modified items - not including deleted // get modified items - not including deleted
List<AssetInfo> assets = sbService.listChangedWebApp(storeId, webapp, false); List<AssetInfo> assets = sbService.listChangedWebApp(userStoreId, webapp, false);
List<AVMNode> items = new ArrayList<AVMNode>(assets.size()); List<AVMNode> items = new ArrayList<AVMNode>(assets.size());

4
source/java/org/alfresco/repo/template/AVM.java
View File

@@ -144,8 +144,10 @@ public class AVM extends BaseTemplateProcessorExtension
SandboxService sbService = this.services.getSandboxService(); SandboxService sbService = this.services.getSandboxService();
String userStoreId = userSandboxStore(storeId, username);
// get modified items - not including deleted // get modified items - not including deleted
List<AssetInfo> assets = sbService.listChangedWebApp(storeId, webapp, false); List<AssetInfo> assets = sbService.listChangedWebApp(userStoreId, webapp, false);
List<AVMTemplateNode> items = new ArrayList<AVMTemplateNode>(assets.size()); List<AVMTemplateNode> items = new ArrayList<AVMTemplateNode>(assets.size());