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 DEV/WCM_SERVICES2 to HEAD

Browse Source 
12236: Implementation of Sandbox Revert REST API
  12305: WCM Services - "asset service" initial checkpoint (more tests to be added)
  12334: placeholder for WCM Asset implementation
  12338: Check in to get server working ...
  12341: WCM Services - "asset service" checkpoint (locking fixes, bulk import, more tests added)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12544 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-12-23 14:48:34 +00:00
parent c4e9d6f97b
commit eb906a0d52
23 changed files with 2709 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@ import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
import org.alfresco.util.ParameterCheck;
import org.alfresco.wcm.asset.AssetInfo;
import org.alfresco.wcm.sandbox.SandboxService;
import org.alfresco.wcm.util.WCMUtil;
@@ -144,14 +145,14 @@ public class AVM extends BaseTemplateProcessorExtension
SandboxService sbService = this.services.getSandboxService();
// get modified items - not including deleted
List<AVMNodeDescriptor> nodes = sbService.listChangedWebApp(storeId, webapp, false);
List<AssetInfo> assets = sbService.listChangedWebApp(storeId, webapp, false);
List<AVMTemplateNode> items = new ArrayList<AVMTemplateNode>(nodes.size());
List<AVMTemplateNode> items = new ArrayList<AVMTemplateNode>(assets.size());
for (AVMNodeDescriptor node : nodes)
for (AssetInfo asset : assets)
{
// convert each diff/node record into an AVM Node template wrapper
items.add(new AVMTemplateNode(node, this.services, getTemplateImageResolver()));
items.add(new AVMTemplateNode(asset.getAvmPath(), -1, this.services, getTemplateImageResolver()));
}
return items;