Merged CMIS063 to HEAD

17143: Add Alfresco Restful Binding Reference link to CMIS Front Page
  17144: Fix up link - not hard code to localhost.
  17150: Updates for CMIS going to Public Review.
  17151: CMIS 1.0cd04 update
  17186: CMIS Query updates - part of MOB-232

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2009-10-30 14:53:18 +00:00
parent 6d65594cb8
commit c16a9548f0
4 changed files with 209 additions and 66 deletions

View File

@@ -126,13 +126,14 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
Map<QName, CMISAbstractTypeDefinition> assocDefsByQName = new HashMap<QName, CMISAbstractTypeDefinition>();
Map<CMISTypeId, CMISAbstractTypeDefinition> objectDefsByTypeId = new HashMap<CMISTypeId, CMISAbstractTypeDefinition>();
Map<CMISTypeId, CMISTypeDefinition> typeDefsByTypeId = new HashMap<CMISTypeId, CMISTypeDefinition>();
Map<String, CMISTypeDefinition> typeDefsByTable = new HashMap<String, CMISTypeDefinition>();
Map<String, CMISTypeDefinition> typeDefsByQueryName = new HashMap<String, CMISTypeDefinition>();
List<CMISTypeDefinition> baseTypes = new ArrayList<CMISTypeDefinition>();
// Property Definitions Index
Map<String, CMISPropertyDefinition> propDefsById = new HashMap<String, CMISPropertyDefinition>();
Map<QName, CMISPropertyDefinition> propDefsByQName = new HashMap<QName, CMISPropertyDefinition>();
Map<CMISPropertyId, CMISPropertyDefinition> propDefsByPropId = new HashMap<CMISPropertyId, CMISPropertyDefinition>();
Map<String, CMISPropertyDefinition> propDefsByQueryName = new HashMap<String, CMISPropertyDefinition>();
/**
* Register Type Definition
@@ -163,7 +164,7 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
}
}
typeDefsByTypeId.put(typeDef.getTypeId(), typeDef);
typeDefsByTable.put(typeDef.getQueryName().toLowerCase(), typeDef);
typeDefsByQueryName.put(typeDef.getQueryName().toLowerCase(), typeDef);
}
if (logger.isDebugEnabled())
@@ -191,6 +192,7 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
propDefsByPropId.put(propDef.getPropertyId(), propDef);
propDefsByQName.put(propDef.getPropertyId().getQName(), propDef);
propDefsById.put(propDef.getPropertyId().getId().toLowerCase(), propDef);
propDefsByQueryName.put(propDef.getQueryName().toLowerCase(), propDef);
if (logger.isDebugEnabled())
{
@@ -304,12 +306,22 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea
* (non-Javadoc)
* @see org.alfresco.cmis.dictionary.CMISDictionaryService#findTypeForTable(java.lang.String)
*/
public CMISTypeDefinition findTypeForTable(String tableName)
public CMISTypeDefinition findTypeByQueryName(String queryName)
{
CMISTypeDefinition typeDef = getRegistry().typeDefsByTable.get(tableName.toLowerCase());
CMISTypeDefinition typeDef = getRegistry().typeDefsByQueryName.get(queryName.toLowerCase());
return typeDef;
}
/* (non-Javadoc)
* @see org.alfresco.cmis.CMISDictionaryService#findPropertyByQueryName(java.lang.String)
*/
public CMISPropertyDefinition findPropertyByQueryName(String queryName)
{
CMISPropertyDefinition propertyDef = getRegistry().propDefsByQueryName.get(queryName.toLowerCase());
return propertyDef;
}
/*
* (non-Javadoc)
* @see org.alfresco.cmis.CMISDictionaryService#getBaseTypes()