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
2010-02-23 17:23:42 +00:00
parent 494b7252e9
commit 66363a5254
236 changed files with 14271 additions and 78034 deletions

View File

@@ -44,58 +44,59 @@ namespace CmisTest
{
initialize();
cmisRepositoryEntryType[] repositories = repositoryService.getRepositories();
string repositoryId = repositories[0].id;
cmisRepositoryEntryType[] repositories = repositoryService.getRepositories(null);
string repositoryId = repositories[0].repositoryId;
Console.WriteLine("Repositories description were received. Repositories amount: '" + repositories.Length + "'. First Repository Id='" + repositoryId + "'.");
string rootFolder = repositoryService.getRepositoryInfo(repositoryId).rootFolderId;
string rootFolder = repositoryService.getRepositoryInfo(repositoryId, null).rootFolderId;
Console.WriteLine("Root folder Id='" + rootFolder + "'.\n");
try
{
Console.WriteLine("Actual Reaction of RepositoryService.getRepositoryInfo() service method with invalid Repository Id:");
repositoryService.getRepositoryInfo("Invalid Repository Id");
Console.WriteLine(INVALID_REACTION_MESSAGE);
}
catch (FaultException<cmisFaultType> e)
{
Console.WriteLine(" " + e.Message);
}
Console.WriteLine("Trying to get RepositoryInfo for the first repository:");
cmisRepositoryInfoType repositoryInfo = repositoryService.getRepositoryInfo(repositoryId, null);
Console.WriteLine("Repository info was received, name='" + repositoryInfo.repositoryName + "'.\n");
try
{
Console.WriteLine("Actual Reaction of ObjectService.getProperties() service method with invalid Object Id:");
objectService.getProperties(repositoryId, ("Invalid Object Id"), "*", false, null, false);
objectService.getProperties(repositoryId, "Invalid Object Id", "*", null);
Console.WriteLine(INVALID_REACTION_MESSAGE);
}
catch (FaultException<cmisFaultType> e)
{
Console.WriteLine(" " + e.Message + "\n");
Console.WriteLine("Expected error was returned. Message: " + e.Message + "\n");
}
cmisObjectType[] childrenResponse = null;
cmisObjectInFolderListType childrenResponse = null;
try
{
bool hasMoreItems;
Console.WriteLine("Trying to receive Children Objects of Root Folder...");
childrenResponse = navigationService.getChildren(repositoryId, rootFolder, "*", false, null, false, false, "0", "0", null, out hasMoreItems);
Console.WriteLine("Children of Root Folder were received. Elements amount: '" + childrenResponse.Length + "'. Has More Items='" + hasMoreItems + "' (how it WAS " + ((hasMoreItems) ? ("NOT ") : ("")) + "expected).");
} catch (FaultException<cmisFaultType> e) {
Console.WriteLine("Can't receive Children of Root Folder. Cause error message: " + e.Message);
Console.WriteLine("Trying to receive the first 20 Children of Root Folder...");
childrenResponse = navigationService.getChildren(repositoryId, rootFolder, "*", null, false, enumIncludeRelationships.none, null, false, "20", "0", null);
}
catch (FaultException<cmisFaultType> e)
{
Console.WriteLine("Can't receive children of Root Folder. Cause error message: " + e.Message);
}
if (null != childrenResponse) {
if (null != childrenResponse && null != childrenResponse.objects)
{
Console.WriteLine("Children of Root Folder were received.");
Console.WriteLine("Total amount: '" + childrenResponse.numItems + "'");
Console.WriteLine("Received: '" + childrenResponse.objects.Length + "'");
Console.WriteLine("Has More Items='" + childrenResponse.hasMoreItems + "'");
Console.WriteLine("Root folder listing: ");
foreach (cmisObjectType cmisObject in childrenResponse) {
if (null != cmisObject) {
cmisProperty nameProperty = searchForProperty(cmisObject.properties, "cmis:Name");
cmisProperty baseTypeProperty = searchForProperty(cmisObject.properties, "cmis:BaseTypeId");
Console.WriteLine((("cmis:folder".Equals(getPropertyValue(baseTypeProperty))) ? ("Folder") : ("Document")) + " Child with Name='" + getPropertyValue(nameProperty) + "'");
foreach (cmisObjectInFolderType cmisObject in childrenResponse.objects)
{
if (null != cmisObject && null != cmisObject.@object)
{
cmisProperty nameProperty = searchForProperty(cmisObject.@object.properties, "cmis:name");
cmisProperty baseTypeProperty = searchForProperty(cmisObject.@object.properties, "cmis:baseTypeId");
Console.WriteLine((("[" + getPropertyValue(baseTypeProperty) + "] ")) + getPropertyValue(nameProperty) + "'");
}
}
}
}
private static void initialize() {
private static void initialize()
{
ServicePointManager.ServerCertificateValidationCallback = delegate(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
{
return true;
@@ -115,20 +116,24 @@ namespace CmisTest
private static string getPropertyName(cmisProperty property)
{
string result = null;
if (null != property) {
result = (null != property.pdid) ? (property.pdid):(property.localname);
result = (null != result) ? (result):(property.displayname);
if (null != property)
{
result = (null != property.propertyDefinitionId) ? (property.propertyDefinitionId) : (property.localName);
}
return result;
}
private static object getPropertyValue(cmisProperty property) {
if (null != property) {
private static object getPropertyValue(cmisProperty property)
{
if (null != property)
{
Type propertyType = property.GetType();
PropertyInfo valueProperty = propertyType.GetProperty("value");
if ((null != valueProperty) && valueProperty.CanRead) {
if ((null != valueProperty) && valueProperty.CanRead)
{
object[] values = (object[])valueProperty.GetValue(property, null);
if ((null != values) && (values.Length > 0)) {
if ((null != values) && (values.Length > 0))
{
return values[0];
}
}
@@ -136,11 +141,15 @@ namespace CmisTest
return null;
}
private static cmisProperty searchForProperty(cmisPropertiesType properties, string propertyName) {
if((null != properties) && (null != properties.Items) && (properties.Items.Length > 0) && (null != propertyName) && !"".Equals(propertyName)) {
foreach(cmisProperty property in properties.Items) {
private static cmisProperty searchForProperty(cmisPropertiesType properties, string propertyName)
{
if ((null != properties) && (null != properties.Items) && (properties.Items.Length > 0) && (null != propertyName) && !"".Equals(propertyName))
{
foreach (cmisProperty property in properties.Items)
{
string name = getPropertyName(property);
if((null != name) && name.Equals(propertyName)) {
if ((null != name) && name.Equals(propertyName))
{
return property;
}
}