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

Merge from SEAMIST3

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2008-09-04 11:22:17 +00:00
parent 41b5618d1d
commit a6625b1c61
63 changed files with 5450 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/cmis/dictionary/CMISDictionaryService.java
View File

@@ -201,13 +201,10 @@ public class CMISDictionaryService
Collection<CMISTypeId> types = new HashSet<CMISTypeId>(alfrescoTypeQNames.size());
for (QName typeQName : alfrescoTypeQNames)
{
if (cmisMapping.isValidCmisDocument(typeQName))
CMISTypeId subTypeId = cmisMapping.getCmisTypeId(typeQName);
if (typeId != null)
{
types.add(cmisMapping.getCmisTypeId(CMISScope.DOCUMENT, typeQName));
}
else if (cmisMapping.isValidCmisFolder(typeQName))
{
types.add(cmisMapping.getCmisTypeId(CMISScope.FOLDER, typeQName));
types.add(subTypeId);
}
}
return types;

6
source/java/org/alfresco/cmis/dictionary/CMISMapping.java
View File

@@ -139,7 +139,7 @@ public class CMISMapping
public static String PROP_CONTENT_STREAM_LENGTH = "CONTENT_STREAM_LENGTH";
public static String PROP_CONTENT_STREAM_MIMETYPE = "CONTENT_STREAM_MIMETYPE";
public static String PROP_CONTENT_STREAM_MIME_TYPE = "CONTENT_STREAM_MIME_TYPE";
public static String PROP_CONTENT_STREAM_FILENAME = "CONTENT_STREAM_FILENAME";
@@ -664,6 +664,10 @@ public class CMISMapping
{
return ContentModel.TYPE_FOLDER;
}
else if (tableName.equals(RELATIONSHIP_TYPE_ID.getTypeId()))
{
return null;
}
// Find prefix and property name - in upper case

4
source/java/org/alfresco/cmis/dictionary/CMISPropertyDefinition.java
View File

@@ -98,7 +98,7 @@ public class CMISPropertyDefinition implements Serializable
// Properties of associations - all the same
propertyName = cmisMapping.getCmisPropertyName(propertyQName);
propertyId = cmisMapping.getCmisPropertyId(propertyQName);
displayName = propDef.getTitle();
displayName = (propDef.getTitle() != null) ? propDef.getTitle() : propertyName;
description = propDef.getDescription();
isInherited = false;
propertyType = cmisMapping.getPropertyType(propertyQName);
@@ -114,7 +114,7 @@ public class CMISPropertyDefinition implements Serializable
propertyName = cmisMapping.getCmisPropertyName(propertyQName);
propertyId = cmisMapping.getCmisPropertyId(propertyQName);
displayName = propDef.getTitle();
displayName = (propDef.getTitle() != null) ? propDef.getTitle() : propertyName;
description = propDef.getDescription();
if(propDef.getContainerClass().isAspect())
{

6
source/java/org/alfresco/cmis/dictionary/CMISTypeDefinition.java
View File

@@ -103,7 +103,7 @@ public class CMISTypeDefinition implements Serializable
{
objectTypeId = typeId;
objectTypeQueryName = cmisMapping.getQueryName(typeId.getQName());
displayName = associationDefinition.getTitle();
displayName = (associationDefinition.getTitle() != null) ? associationDefinition.getTitle() : typeId.getTypeId();
parentTypeId = CMISMapping.RELATIONSHIP_TYPE_ID;
rootTypeQueryName = cmisMapping.getQueryName(CMISMapping.RELATIONSHIP_QNAME);
description = associationDefinition.getDescription();
@@ -141,7 +141,7 @@ public class CMISTypeDefinition implements Serializable
TypeDefinition typeDefinition = dictionaryService.getType(typeId.getQName());
objectTypeId = typeId;
objectTypeQueryName = cmisMapping.getQueryName(typeId.getQName());
displayName = typeDefinition.getTitle();
displayName = (typeDefinition.getTitle() != null) ? typeDefinition.getTitle() : typeId.getTypeId();
parentTypeId = null;
rootTypeQueryName = cmisMapping.getQueryName(CMISMapping.RELATIONSHIP_QNAME);
description = typeDefinition.getDescription();
@@ -163,7 +163,7 @@ public class CMISTypeDefinition implements Serializable
objectTypeQueryName = cmisMapping.getQueryName(typeId.getQName());
displayName = typeDefinition.getTitle();
displayName = (typeDefinition.getTitle() != null) ? typeDefinition.getTitle() : typeId.getTypeId();
QName parentTypeQName = cmisMapping.getCmisType(typeDefinition.getParentName());
if (parentTypeQName == null)