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

Merging BRANCHES/DEV/CMIS_10 to HEAD (phase 2 - currently up-to-date with branch):

Browse Source 
18717: SAIL-166: Refactor CMIS to use shared services and resolve objectIds and error codes consistently
   18731: SAIL-169: CMIS REST versioning compliance
   18732: Fix failing change log test.
   18768: Add displayName and queryName attributes to rendered properties (in CMIS AtomPub binding).
   18775: Fix exception reporting when retrieving items that do not exist (in CMIS AtomPub binding).
   18784: Fix CMIS REST change logging
   18785: SAIL-174: CMIS Relationship lookup by association ID
   18812: SAIL-183: Support orderBy argument for getChildren and getCheckedOutDocs in CMIS REST and Web Service bindings
   18823: CMIS WS Bindings were moved to 1.0 cd07 schema.
   18838: Update to latest Chemistry TCK.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2010-02-25 15:02:44 +00:00
parent cfc0643817
commit fbd7aab3b1
71 changed files with 2811 additions and 1624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/cmis/changelog/CMISChangeLogDataExtractor.java
View File

@@ -25,7 +25,9 @@
package org.alfresco.cmis.changelog;
import java.io.Serializable;
import java.util.HashMap;
import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.cmis.CMISServices;
import org.alfresco.repo.audit.extractor.AbstractDataExtractor;
import org.alfresco.service.cmr.model.FileFolderService;
@@ -42,15 +44,23 @@ public class CMISChangeLogDataExtractor extends AbstractDataExtractor
{
private CMISServices cmisService;
private FileFolderService fileFolderService;
public static final String KEY_NODE_REF = "nodeRef";
public static final String KEY_OBJECT_ID = "objectId";
/**
* Extracts the NodeRef from auditing data
* Extracts relevant node refs and Ids from auditing data
*
* @see org.alfresco.repo.audit.extractor.DataExtractor.extractData(java.io.Serializable)
*/
public Serializable extractData(Serializable value) throws Throwable
{
return getNodeRef(value);
NodeRef nodeRef = getNodeRef(value);
HashMap <String, Serializable> result = new HashMap<String, Serializable>(5);
result.put(KEY_NODE_REF, nodeRef);
// Support version nodes by recording the object ID
result.put(KEY_OBJECT_ID, cmisService.getProperty(nodeRef, CMISDictionaryModel.PROP_OBJECT_ID));
return result;
}
/**