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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
77150: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73977: ACE-1802 "MT / Cloud Restrict namespace URI of dynamic models."
      ACE-955 "Custom Content Models in Cloud"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78008 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-23 16:02:04 +00:00
parent f1310c6c8d
commit a576035f0f
32 changed files with 1576 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
View File

@@ -279,16 +279,17 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
List<TypeDefinitionWrapper> childrenList;
if (typeId == null)
{
childrenList = connector.getOpenCMISDictionaryService().getBaseTypes();
childrenList = connector.getOpenCMISDictionaryService().getBaseTypes(true);
}
else
{
TypeDefinitionWrapper tdw = connector.getOpenCMISDictionaryService().findType(typeId);
if (tdw == null)
{
throw new CmisObjectNotFoundException("Type '" + typeId + "' is unknown!");
}
childrenList = tdw.getChildren();
TypeDefinitionWrapper tdw = connector.getOpenCMISDictionaryService().findType(typeId);
if (tdw == null)
{
throw new CmisObjectNotFoundException("Type '" + typeId + "' is unknown!");
}
childrenList = connector.getOpenCMISDictionaryService().getChildren(typeId);
// childrenList = tdw.getChildren();
}
// create result
@@ -341,7 +342,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
if (typeId == null)
{
for (TypeDefinitionWrapper tdw : connector.getOpenCMISDictionaryService().getBaseTypes())
for (TypeDefinitionWrapper tdw : connector.getOpenCMISDictionaryService().getBaseTypes(true))
{
result.add(getTypesDescendants(d, tdw, includePropertyDefinitions));
}
@@ -353,10 +354,10 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
{
throw new CmisObjectNotFoundException("Type '" + typeId + "' is unknown!");
}
if (tdw.getChildren() != null)
List<TypeDefinitionWrapper> children = connector.getOpenCMISDictionaryService().getChildren(typeId);
if(children != null)
{
for (TypeDefinitionWrapper child : tdw.getChildren())
for (TypeDefinitionWrapper child : children)
{
result.add(getTypesDescendants(d, child, includePropertyDefinitions));
}
@@ -378,10 +379,12 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
if (depth != 0)
{
if (tdw.getChildren() != null)
String typeId = tdw.getTypeId();
List<TypeDefinitionWrapper> children = connector.getOpenCMISDictionaryService().getChildren(typeId);
if (children != null)
{
result.setChildren(new ArrayList<TypeDefinitionContainer>());
for (TypeDefinitionWrapper tdc : tdw.getChildren())
for (TypeDefinitionWrapper tdc : children)
{
result.getChildren().add(
getTypesDescendants(depth < 0 ? -1 : depth - 1, tdc, includePropertyDefinitions));