mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merging BRANCHES/DEV/CMIS_10 to HEAD:
17717: This check-in contains changes in Java and .NET TCK tests related to CMIS-43 and CMIS-44 JIRA tasks. Also some bugs were faced out and fixed in 17727: CMIS-69: Alfresco to CMIS ACL mapping: Part 1: API 17732: Merge HEAD to DEV/CMIS10 17756: MOB-563: SQL Tests - Lexer 17764: CMIS-69: Alfresco to CMIS ACL mapping: get ACL support 17802: More for CMIS-69: Alfresco to CMIS ACL mapping. Implementation for applyAcl. 17830: Fixes for CMIS lexer and parser tests 17838: Access fix ups for access by the WS/Rest layers 17869: 1) remote-api: 17874: SAIL-146: Alfresco to CMIS ACL mapping: Support to group ACEs by principal id 17883: Adjust version properties for dev/cmis10 branch. 17885: Update OASIS CMIS TC status. 17889: Fix issue where objectid is not rendered correctly for CMIS private working copies. 17890: SAIL-146: Alfresco to CMIS ACL mapping: Fixes for ACL merging when reporting and ordering of ACEs. Report full permissions and not unique short names. 17902: Fix issue where CMIS queries via GET used incorrect defaults for paging. 17909: Fix CMIS link relations for folder tree. 17912: Fix CMIS type descendants atompub link 17922: Update AtomPub binding to CMIS 1.0 CD05 XSDs. 17924: SAIL-146: Alfresco to CMIS ACL mapping: Test set using full permissions (as opposed to short unique names) 17927: Fix content stream create/update status to comply with CMIS 1.0 CD05. 17934: Resolve encoding issues in CMIS AtomPub binding. 17973: SAIL-171: CMIS Renditions REST binding 17975: SAIL-146: Alfresco to CMIS ACL mapping: Completed AllowedAction and Permissions mapping. Added missing canDeleteTree. 17990: Update CMIS AtomPub to CD06 17996: Updates for cmis.alfresco.com for CD06 in prep for public review 2. 18007: WS-Bindings were updated with CMIS 1.0 cd06 changes. 18016: CMIS web services: Add missing generated files from WSDL 18018: CMIS index page updates for cmis.alfresco.com 18041: Merged HEAD to DEV/CMIS_10 18059: SAIL-227: 18067: SAIL-157: Strict vs Non-Strict Query Language: Enforce restrictions on the use of SCORE() and CONTAINS() 18080: Fix for SAIL-213:Bug: Query engine does not check that select list properties are valid for selectors 18131: SAIL-156: Query Language Compliance: Fix support for LIKE, including escaping of '%' and '_' with '\'. 18132: SAIL-156: Query Language Compliance: Fix support for LIKE, including escaping of '%' and '_' with '\': Fix underlying lucene impl for prefix and fuzzy queries to match wildcard/like 18143: SAIL-156: Query Language Compliance: Fix and check qualifiers in IN_TREE and IN_FOLDER. Improved scoring for CONTAINS() 18173: SAIL-245: Exclude thumbnails from normal query results 18179: SAIL 214: Query Language Compliance: Check for valid object ids in IN_FOLDER and IN_TREE 18210: SAIL-156: Query Language Compliance: Support for simple column aliases in predicates/function arguments/embedded FTS. Check property/selector binding in embedded FTS. 18211: SAIL-156: Query Language Compliance: Support for simple column aliases in predicates/function arguments/embedded FTS. Check property/selector binding in embedded FTS. 18215: SAIL 156: Query Language Compliance: Fix CMIS type info to reflect the underlying settings of the Alfresco type for includeInSuperTypeQuery 18244: SAIL 156: Query Language Compliance: includeInSuperTypeQuery -> includedInSuperTypeQuery: First cut of cmis query test model. Fixed modelSchema.xml to validate 18255: SAIL 156: Query Language Compliance: First set of tests for predicates using properties mapped to CMIS Strings. 18261: CMIS-49 SAIL-163: Alfresco to CMIS Change Log mapping - New CMIS Audit mapping is implemented. ChangeLogDataExtractor was added. 18263: Build Fix 18285: SAIL 156: Query Language Compliance: Restrictions on predicates that may be used by single-valued and multi-valued properties 18287: SAIL-186: Changes to make CMIS Rendition REST bindings pass new TCK tests 18291: Fix Eclipse classpath problems 18323: CMIS-44 SAIL-187: Change Log tests (WS) – Java and .NET tests for change log were implemented. 18325: SAIL 156: Query Language Compliance: Fixes and tests for d:mltext mappings 18329: Updated Chemistry TCK jar including Dave W's rendition tests. 18333: Fix compile error - spurious imports. 18334: Fix issue where absurl web script method failed when deployed to root context. 18339: Update CMIS index page for start of public review 2. 18387: SAIL-147: CMIS ACL REST bindings + framework fixes 18392: Fix typo 18394: SAIL 156: Query Language Compliance: Fixes and tests for d:<numeric> 18406: SAIL 156: Query Language Compliance: Remaining type/predicate combinations. Restriction of In/Comparisons for ID/Boolean 18408: CMIS Query language - remove (pointless) multi-valued column from language definition 18409: Formatting change for CMIS.g 18410: Formatting change for FTS.g 18411: CMIS TCK tests were updated to CMIS 1.0 cd06 schemas. 18412: SAIL 156: Query Language Compliance: Tests and fixes for aliases for all data types in simple predicates (they behave as the direct column reference) 18417: Update Chemistry TCK which now incorporates Dave W's ACL tests. 18419: Update CMIS index page to include public review end date. 18427: SAIL 156: Query Language Compliance: Expose multi-valued properties in queries. Tests for all accessors. Fix content length to be long. 18435: SAIL 156: Query Language Compliance: Use queryable correctly and fix up model mappings. Add tests for baseTypeId, contentStreamId and path. 18472: SAIL 156: Query Language Compliance: Tests and fixes for FTS/Contains expressions. Adhere strictly to the spec - no extensions available by default. Improved FTS error reporting (and stop any recovery). 18477: SAIL-164: CMIS change log REST bindings 18495: SAIL 156: Query Language Compliance: Tests and fixes for escaping in string literals, LIKE and FTS expressions. 18537: SAIL 156: Query Language Compliance: Sorting support. Basic sort test for all orderable/indexed CMIS properties. 18538: SAIL-164: CMIS change log fixes for TCK compliance 18547: SAIL 156: Query Language Compliance: Ordering tests for all datatypes, including null values. 18582: Incorporate latest Chemistry TCK 18583: Update list of supported CMIS capabilities in index page. 18606: SAIL-156, SAIL-157, SAIL-158: Query Language Compliance: Respect all query options including locale. Fixes and tests for MLText cross language support. 18608: SAIL-159: Java / Javascript API access to CMIS Query Language 18617: SAIL-158: Query Tests: Check policy and relationship types are not queryable. 18636: SAIL-184: ACL tests (WS) 18663: ACL tests were updated in accordance with last requirements by David Caruana. 18680: Update to CMIS CD07 18681: Fix CMIS ContentStreamId property when document has no content. 18700: CMIS: Head merge problem resolution. Phase 1: Merge up to and including revision 18700, as this the point where both AtomPub and Web Services TCK tests succeed completely on dev branch. Note: includes CMIS rendition support ready for integration and testing with DM renditions. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2008 Alfresco Software Limited.
|
||||
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
@@ -18,19 +18,34 @@
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* FLOSS exception. You should have received a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.repo.cmis.rest;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.alfresco.cmis.CMISAccessControlEntry;
|
||||
import org.alfresco.cmis.CMISAccessControlService;
|
||||
import org.alfresco.cmis.CMISAclCapabilityEnum;
|
||||
import org.alfresco.cmis.CMISAclPropagationEnum;
|
||||
import org.alfresco.cmis.CMISAclSupportedPermissionEnum;
|
||||
import org.alfresco.cmis.CMISBaseObjectTypeIds;
|
||||
import org.alfresco.cmis.CMISCapabilityChanges;
|
||||
import org.alfresco.cmis.CMISChangeEvent;
|
||||
import org.alfresco.cmis.CMISChangeLog;
|
||||
import org.alfresco.cmis.CMISChangeLogService;
|
||||
import org.alfresco.cmis.CMISDictionaryService;
|
||||
import org.alfresco.cmis.CMISJoinEnum;
|
||||
import org.alfresco.cmis.CMISObjectReference;
|
||||
import org.alfresco.cmis.CMISPermissionDefinition;
|
||||
import org.alfresco.cmis.CMISPermissionMapping;
|
||||
import org.alfresco.cmis.CMISPropertyDefinition;
|
||||
import org.alfresco.cmis.CMISQueryEnum;
|
||||
import org.alfresco.cmis.CMISQueryOptions;
|
||||
@@ -43,12 +58,14 @@ import org.alfresco.cmis.CMISServices;
|
||||
import org.alfresco.cmis.CMISTypeDefinition;
|
||||
import org.alfresco.cmis.CMISTypesFilterEnum;
|
||||
import org.alfresco.cmis.CMISQueryOptions.CMISQueryMode;
|
||||
import org.alfresco.cmis.acl.CMISAccessControlEntryImpl;
|
||||
import org.alfresco.cmis.reference.NodeRefReference;
|
||||
import org.alfresco.cmis.reference.ReferenceFactory;
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.repo.jscript.Association;
|
||||
import org.alfresco.repo.jscript.BaseScopableProcessorExtension;
|
||||
import org.alfresco.repo.jscript.ScriptNode;
|
||||
import org.alfresco.repo.jscript.ValueConverter;
|
||||
import org.alfresco.repo.web.util.paging.Cursor;
|
||||
import org.alfresco.repo.web.util.paging.Page;
|
||||
import org.alfresco.repo.web.util.paging.PagedResults;
|
||||
@@ -57,6 +74,9 @@ import org.alfresco.service.ServiceRegistry;
|
||||
import org.alfresco.service.cmr.repository.AssociationRef;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.mozilla.javascript.Context;
|
||||
import org.mozilla.javascript.Scriptable;
|
||||
import org.mozilla.javascript.ScriptableObject;
|
||||
|
||||
|
||||
/**
|
||||
@@ -100,15 +120,20 @@ public class CMISScript extends BaseScopableProcessorExtension
|
||||
public static final String ARG_UNFILE_MULTIFILE_DOCUMENTS = "unfileMultiFiledDocuments";
|
||||
public static final String ARG_VERSIONING_STATE = "versioningState";
|
||||
public static final String ARG_SOURCE_FOLDER_ID = "sourceFolderId";
|
||||
|
||||
public static final String ARG_INCLUDE_ACL = "includeACL";
|
||||
public static final String ARG_RENDITION_FILTER = "renditionFilter";
|
||||
public static final String ARG_CHANGE_LOG_TOKEN = "changeLogToken";
|
||||
|
||||
// service dependencies
|
||||
private ServiceRegistry services;
|
||||
private CMISServices cmisService;
|
||||
private CMISDictionaryService cmisDictionaryService;
|
||||
private CMISQueryService cmisQueryService;
|
||||
private CMISAccessControlService cmisAccessControlService;
|
||||
private CMISChangeLogService cmisChangeLogService;
|
||||
private Paging paging;
|
||||
private ReferenceFactory referenceFactory;
|
||||
private ValueConverter valueConverter = new ValueConverter();
|
||||
|
||||
|
||||
/**
|
||||
@@ -160,6 +185,27 @@ public class CMISScript extends BaseScopableProcessorExtension
|
||||
{
|
||||
this.cmisQueryService = cmisQueryService;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the CMIS access control service.
|
||||
*
|
||||
* @param cmisAccessControlService
|
||||
* the access control service
|
||||
*/
|
||||
public void setCMISAccessControlService(CMISAccessControlService cmisAccessControlService)
|
||||
{
|
||||
this.cmisAccessControlService = cmisAccessControlService;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the CMIS change log service.
|
||||
*
|
||||
* @param cmisChangeLogService
|
||||
* the change log service
|
||||
*/
|
||||
public void setCMISChangeLogService(CMISChangeLogService cmisChangeLogService) {
|
||||
this.cmisChangeLogService = cmisChangeLogService;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the CMIS Reference Factory
|
||||
@@ -557,13 +603,217 @@ public class CMISScript extends BaseScopableProcessorExtension
|
||||
*/
|
||||
public PagedResults query(String statement, Page page)
|
||||
{
|
||||
Cursor unknownRows = paging.createCursor(Integer.MAX_VALUE, page);
|
||||
CMISQueryOptions options = new CMISQueryOptions(statement, cmisService.getDefaultRootStoreRef());
|
||||
options.setQueryMode(CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS);
|
||||
options.setSkipCount(page.getNumber());
|
||||
options.setMaxItems(page.getSize());
|
||||
options.setSkipCount(unknownRows.getStartRow());
|
||||
options.setMaxItems(unknownRows.getPageSize());
|
||||
CMISResultSet resultSet = cmisQueryService.query(options);
|
||||
Cursor cursor = paging.createCursor(page.getNumber() + resultSet.getLength() + (resultSet.hasMore() ? 1 : 0) , page);
|
||||
Cursor cursor = paging.createCursor(unknownRows.getStartRow() + resultSet.getLength() + (resultSet.hasMore() ? 1 : 0) , page);
|
||||
return paging.createPagedResult(resultSet, cursor);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the ACL capability.
|
||||
*
|
||||
* @return the ACL capability
|
||||
*/
|
||||
public CMISAclCapabilityEnum getAclCapability()
|
||||
{
|
||||
return cmisAccessControlService.getAclCapability();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the supported permission types
|
||||
*
|
||||
* @return the supported permission types
|
||||
*/
|
||||
public CMISAclSupportedPermissionEnum getAclSupportedPermissions()
|
||||
{
|
||||
return cmisAccessControlService.getSupportedPermissions();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the ACL propagation.
|
||||
*
|
||||
* @return the ACL propagation
|
||||
*/
|
||||
public CMISAclPropagationEnum getAclPropagation()
|
||||
{
|
||||
return cmisAccessControlService.getAclPropagation();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all the permissions defined by the repository.
|
||||
* @return a list of permissions
|
||||
*/
|
||||
public List<CMISPermissionDefinition> getRepositoryPermissions()
|
||||
{
|
||||
return cmisAccessControlService.getRepositoryPermissions();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the list of permission mappings.
|
||||
* @return get the permission mapping as defined by the CMIS specification.
|
||||
*/
|
||||
public List<? extends CMISPermissionMapping> getPermissionMappings()
|
||||
{
|
||||
return cmisAccessControlService.getPermissionMappings();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the name of the principal who is used for anonymous access. This principal can then be passed to the ACL
|
||||
* services to specify what permissions anonymous users should have.
|
||||
*
|
||||
* @return name of the principal who is used for anonymous access
|
||||
*/
|
||||
public String getPrincipalAnonymous()
|
||||
{
|
||||
return cmisAccessControlService.getPrincipalAnonymous();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the name of the principal who is used to indicate any authenticated user. This principal can then be passed
|
||||
* to the ACL services to specify what permissions any authenticated user should have.
|
||||
*
|
||||
* @return name of the principal who is used to indicate any authenticated user
|
||||
*/
|
||||
public String getPrincipalAnyone()
|
||||
{
|
||||
return cmisAccessControlService.getPrincipalAnyone();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public void applyACL(ScriptNode node, Serializable principalIds, Serializable permissions)
|
||||
{
|
||||
List<String> principalList = (List<String>) valueConverter.convertValueForRepo(principalIds);
|
||||
List<String> permissionList = (List<String>) valueConverter.convertValueForRepo(permissions);
|
||||
List<CMISAccessControlEntry> acesToApply = new ArrayList<CMISAccessControlEntry>(principalList.size());
|
||||
for(int i=0; i<principalList.size(); i++)
|
||||
{
|
||||
acesToApply.add(new CMISAccessControlEntryImpl(principalList.get(i), permissionList.get(i)));
|
||||
}
|
||||
cmisAccessControlService.applyAcl(node.getNodeRef(), acesToApply);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the change log capability.
|
||||
*
|
||||
* @return the change log capability
|
||||
*/
|
||||
public CMISCapabilityChanges getChangeLogCapability()
|
||||
{
|
||||
return cmisChangeLogService.getCapability();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the last change log token.
|
||||
*
|
||||
* @return the last change log token
|
||||
*/
|
||||
public String getLastChangeLogToken()
|
||||
{
|
||||
return cmisChangeLogService.getLastChangeLogToken();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the list of base types for which changes are available.
|
||||
*
|
||||
* @return the list of base types for which changes are available
|
||||
*/
|
||||
public String[] getChangesOnType()
|
||||
{
|
||||
List<CMISBaseObjectTypeIds> typeList = cmisChangeLogService.getChangesOnTypeCapability();
|
||||
String[] changesOnType = new String[typeList.size()];
|
||||
int i=0;
|
||||
for (CMISBaseObjectTypeIds type: typeList)
|
||||
{
|
||||
changesOnType[i++] = type.getLabel();
|
||||
}
|
||||
return changesOnType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determines whether the repository's change log can return all changes ever made to any object in the repository
|
||||
* or only changes made after a particular point in time.
|
||||
*
|
||||
* @return <code>false</code> if the change log can return all changes ever made to every object.<code>true</code>
|
||||
* if the change log includes all changes made since a particular point in time, but not all changes ever
|
||||
* made.
|
||||
*/
|
||||
public boolean getChangesIncomplete()
|
||||
{
|
||||
return cmisChangeLogService.getChangesIncomplete();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the change log attributes.
|
||||
*
|
||||
* @param changeLogToken
|
||||
* the change log token
|
||||
* @param maxItems
|
||||
* the maximum number of events to include to return or <code>null</code>
|
||||
* @return the change log attributes
|
||||
*/
|
||||
public Scriptable getChangeLog(String changeLogToken, Integer maxItems)
|
||||
{
|
||||
Scriptable scope = getScope();
|
||||
Context cx = Context.enter();
|
||||
try
|
||||
{
|
||||
Scriptable changeLogMap = cx.newObject(scope);
|
||||
CMISChangeLog changeLog = cmisChangeLogService.getChangeLogEvents(changeLogToken, maxItems);
|
||||
List<CMISChangeEvent> changeEvents = changeLog.getChangeEvents();
|
||||
|
||||
// Wrap the events
|
||||
int size = changeEvents.size();
|
||||
Scriptable changeEventArr = cx.newArray(scope, size);
|
||||
for (int i = 0; i < size; i++)
|
||||
{
|
||||
ScriptableObject.putProperty(changeEventArr, i, Context.javaToJS(changeEvents.get(i), scope));
|
||||
}
|
||||
ScriptableObject.putProperty(changeLogMap, "changeEvents", changeEventArr);
|
||||
|
||||
// Wrap the nodes
|
||||
Scriptable changeNodes = cx.newArray(scope, size);
|
||||
for (int i = 0; i < size; i++)
|
||||
{
|
||||
ScriptableObject.putProperty(changeNodes, i, new ScriptNode(changeEvents.get(i).getNode(), services,
|
||||
scope));
|
||||
}
|
||||
ScriptableObject.putProperty(changeLogMap, "changeNodes", changeNodes);
|
||||
|
||||
// Provide the other attributes
|
||||
ScriptableObject.putProperty(changeLogMap, "hasMoreItems", Context
|
||||
.javaToJS(changeLog.hasMoreItems(), scope));
|
||||
ScriptableObject
|
||||
.putProperty(changeLogMap, "eventCount", Context.javaToJS(changeLog.getEventCount(), scope));
|
||||
|
||||
// Handle paging parameters
|
||||
String nextChangeToken = changeLog.getNextChangeToken();
|
||||
if (nextChangeToken != null)
|
||||
{
|
||||
ScriptableObject.putProperty(changeLogMap, "nextChangeToken", Context.javaToJS(nextChangeToken, scope));
|
||||
}
|
||||
String previousPageChangeLogToken = cmisChangeLogService.getPreviousPageChangeLogToken(changeLogToken,
|
||||
maxItems);
|
||||
if (previousPageChangeLogToken != null)
|
||||
{
|
||||
ScriptableObject.putProperty(changeLogMap, "previousPageToken", Context.javaToJS(
|
||||
previousPageChangeLogToken, scope));
|
||||
}
|
||||
String lastPageChangeLogToken = cmisChangeLogService.getLastPageChangeLogToken(changeLogToken, maxItems);
|
||||
if (lastPageChangeLogToken != null)
|
||||
{
|
||||
ScriptableObject.putProperty(changeLogMap, "lastPageToken", Context.javaToJS(lastPageChangeLogToken,
|
||||
scope));
|
||||
}
|
||||
return changeLogMap;
|
||||
}
|
||||
finally
|
||||
{
|
||||
Context.exit();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user