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 (Cloud33/4.3) to HEAD (Cloud33/4.3)

Browse Source 
62905: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61335: ACE-33 implementation of cmis:items
          add permissions
          create and delete of cmis:items 
          some unit test fixes
          new unit test for items


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-20 14:23:58 +00:00
parent 30b1d43c90
commit c38c6fe1d7
6 changed files with 128 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
View File

@@ -31,6 +31,7 @@ import org.alfresco.opencmis.dictionary.CMISNodeInfo;
import org.alfresco.opencmis.dictionary.CMISObjectVariant;
import org.alfresco.opencmis.dictionary.DocumentTypeDefinitionWrapper;
import org.alfresco.opencmis.dictionary.FolderTypeDefintionWrapper;
import org.alfresco.opencmis.dictionary.ItemTypeDefinitionWrapper;
import org.alfresco.opencmis.dictionary.RelationshipTypeDefintionWrapper;
import org.alfresco.opencmis.dictionary.TypeDefinitionWrapper;
import org.alfresco.repo.security.permissions.AccessDeniedException;
@@ -74,6 +75,7 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
private String name;
private boolean hasPWC;
private Boolean isRootFolder;
private String cmisPath;
private VersionHistory versionHistory;
private Version version;
@@ -281,6 +283,12 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
}
return;
}
if(isItem())
{
objecVariant = CMISObjectVariant.ITEM;
return;
}
if (versionLabel == null)
{
@@ -448,6 +456,13 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
currentObjectId = objectId;
return;
}
else if (isItem())
{
objecVariant = CMISObjectVariant.ITEM;
objectId = connector.constructObjectId(nodeRef, null);
currentObjectId = objectId;
return;
}
else if (getType() == null)
{
objecVariant = CMISObjectVariant.NOT_A_CMIS_OBJECT;
@@ -687,6 +702,11 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
{
return getType() instanceof FolderTypeDefintionWrapper;
}
public boolean isItem()
{
return getType() instanceof ItemTypeDefinitionWrapper;
}
public boolean isRootFolder()
{
@@ -807,7 +827,7 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
{
return getVersion().getVersionProperty(VersionBaseModel.PROP_CREATED_DATE);
}
} else if (isFolder())
} else if (isFolder() || isItem())
{
return connector.getNodeService().getProperty(nodeRef, ContentModel.PROP_CREATED);
} else
@@ -827,7 +847,7 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
{
return getVersion().getVersionProperty(ContentModel.PROP_MODIFIED.getLocalName());
}
} else if (isFolder())
} else if (isFolder() || isItem())
{
return connector.getNodeService().getProperty(nodeRef, ContentModel.PROP_MODIFIED);
} else