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

Fix ALF-2319: CMIS 'current' version mapping is not compliant with spec

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20345 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2010-05-21 17:56:57 +00:00
parent 50f445aeee
commit 2df10ea85d
6 changed files with 68 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java
View File

@@ -1097,7 +1097,6 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
{ {
objects.add(pwc); objects.add(pwc);
} }
objects.add(nodeRef);
VersionHistory versionHistory = versionService.getVersionHistory(nodeRef); VersionHistory versionHistory = versionService.getVersionHistory(nodeRef);
if (versionHistory != null) if (versionHistory != null)
{ {
@@ -1108,6 +1107,10 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
current = versionHistory.getPredecessor(current); current = versionHistory.getPredecessor(current);
} }
} }
else if (pwc == null)
{
objects.add(nodeRef);
}
return objects; return objects;
} }

4
source/java/org/alfresco/cmis/mapping/CheckinCommentProperty.java
View File

@@ -50,8 +50,7 @@ public class CheckinCommentProperty extends AbstractVersioningProperty
*/ */
public Serializable getValue(NodeRef nodeRef) public Serializable getValue(NodeRef nodeRef)
{ {
NodeRef versionSeries; if (isWorkingCopy(nodeRef))
if (isWorkingCopy(nodeRef) || (versionSeries = getVersionSeries(nodeRef)).equals(nodeRef))
{ {
return null; return null;
} }
@@ -61,6 +60,7 @@ public class CheckinCommentProperty extends AbstractVersioningProperty
{ {
return null; return null;
} }
NodeRef versionSeries = getVersionSeries(nodeRef);
VersionHistory versionHistory = serviceRegistry.getVersionService().getVersionHistory(versionSeries); VersionHistory versionHistory = serviceRegistry.getVersionService().getVersionHistory(versionSeries);
if (versionHistory == null) if (versionHistory == null)
{ {

27
source/java/org/alfresco/cmis/mapping/IsLatestMajorVersionProperty.java
View File

@@ -21,6 +21,8 @@ package org.alfresco.cmis.mapping;
import java.io.Serializable; import java.io.Serializable;
import org.alfresco.cmis.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.version.VersionBaseModel;
import org.alfresco.service.ServiceRegistry; import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.version.Version; import org.alfresco.service.cmr.version.Version;
@@ -52,11 +54,11 @@ public class IsLatestMajorVersionProperty extends AbstractVersioningProperty
*/ */
public Serializable getValue(NodeRef nodeRef) public Serializable getValue(NodeRef nodeRef)
{ {
NodeRef versionSeries; if (isWorkingCopy(nodeRef))
if (isWorkingCopy(nodeRef) || (versionSeries = getVersionSeries(nodeRef)).equals(nodeRef))
{ {
return false; return false;
} }
NodeRef versionSeries = getVersionSeries(nodeRef);
ServiceRegistry serviceRegistry = getServiceRegistry(); ServiceRegistry serviceRegistry = getServiceRegistry();
VersionService versionService = serviceRegistry.getVersionService(); VersionService versionService = serviceRegistry.getVersionService();
VersionHistory versionHistory = versionService.getVersionHistory(versionSeries); VersionHistory versionHistory = versionService.getVersionHistory(versionSeries);
@@ -64,16 +66,33 @@ public class IsLatestMajorVersionProperty extends AbstractVersioningProperty
{ {
return false; return false;
} }
NodeRef versionNodeRef = nodeRef;
if (!nodeRef.getStoreRef().getProtocol().equals(VersionBaseModel.STORE_PROTOCOL))
{
String versionLabel = (String) serviceRegistry.getNodeService().getProperty(nodeRef, ContentModel.PROP_VERSION_LABEL);
if (versionLabel == null)
{
return false;
}
Version version = versionHistory.getVersion(versionLabel);
if (version == null)
{
return false;
}
versionNodeRef = version.getFrozenStateNodeRef();
}
// Go back in time to the last major version // Go back in time to the last major version
Version currentVersion = versionService.getCurrentVersion(versionSeries); Version currentVersion = versionService.getCurrentVersion(versionSeries);
while (currentVersion != null) while (currentVersion != null)
{ {
if (currentVersion.getVersionType() == VersionType.MAJOR) if (currentVersion.getVersionType() == VersionType.MAJOR)
{ {
return currentVersion.getFrozenStateNodeRef().equals(nodeRef); return currentVersion.getFrozenStateNodeRef().equals(versionNodeRef);
} }
// We got to the current node and its not major. We failed! // We got to the current node and its not major. We failed!
else if (currentVersion.getFrozenStateNodeRef().equals(nodeRef)) else if (currentVersion.getFrozenStateNodeRef().equals(versionNodeRef))
{ {
return false; return false;
} }

31
source/java/org/alfresco/cmis/mapping/IsLatestVersionProperty.java
View File

@@ -21,8 +21,11 @@ package org.alfresco.cmis.mapping;
import java.io.Serializable; import java.io.Serializable;
import org.alfresco.cmis.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.model.ContentModel;
import org.alfresco.service.ServiceRegistry; import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.version.Version;
import org.alfresco.service.cmr.version.VersionHistory;
/** /**
* Accesser for CMIS is latest version property * Accesser for CMIS is latest version property
@@ -47,6 +50,32 @@ public class IsLatestVersionProperty extends AbstractVersioningProperty
*/ */
public Serializable getValue(NodeRef nodeRef) public Serializable getValue(NodeRef nodeRef)
{ {
return isWorkingCopy(nodeRef) || getVersionSeries(nodeRef).equals(nodeRef) && !hasWorkingCopy(nodeRef); if (isWorkingCopy(nodeRef) || getVersionSeries(nodeRef).equals(nodeRef) && !hasWorkingCopy(nodeRef))
{
return true;
}
NodeRef versionSeries = getVersionSeries(nodeRef);
if (hasWorkingCopy(versionSeries))
{
return false;
}
ServiceRegistry serviceRegistry = getServiceRegistry();
String versionLabel = (String) serviceRegistry.getNodeService().getProperty(nodeRef, ContentModel.PROP_VERSION_LABEL);
if (versionLabel == null)
{
return false;
}
VersionHistory versionHistory = serviceRegistry.getVersionService().getVersionHistory(versionSeries);
if (versionHistory == null)
{
return false;
}
Version version = versionHistory.getVersion(versionLabel);
if (version == null)
{
return false;
}
return versionHistory.getHeadVersion().getFrozenStateNodeRef().equals(version.getFrozenStateNodeRef());
} }
} }

8
source/java/org/alfresco/cmis/mapping/IsMajorVersionProperty.java
View File

@@ -24,6 +24,7 @@ import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.service.ServiceRegistry; import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.version.Version;
import org.alfresco.service.cmr.version.VersionHistory; import org.alfresco.service.cmr.version.VersionHistory;
import org.alfresco.service.cmr.version.VersionType; import org.alfresco.service.cmr.version.VersionType;
@@ -50,18 +51,17 @@ public class IsMajorVersionProperty extends AbstractVersioningProperty
*/ */
public Serializable getValue(NodeRef nodeRef) public Serializable getValue(NodeRef nodeRef)
{ {
NodeRef versionSeries; if (isWorkingCopy(nodeRef))
if (isWorkingCopy(nodeRef) || (versionSeries = getVersionSeries(nodeRef)).equals(nodeRef))
{ {
return false; return false;
} }
ServiceRegistry serviceRegistry = getServiceRegistry(); ServiceRegistry serviceRegistry = getServiceRegistry();
String versionLabel = (String) serviceRegistry.getNodeService().getProperty(nodeRef, String versionLabel = (String) serviceRegistry.getNodeService().getProperty(nodeRef, ContentModel.PROP_VERSION_LABEL);
ContentModel.PROP_VERSION_LABEL);
if (versionLabel == null) if (versionLabel == null)
{ {
return false; return false;
} }
NodeRef versionSeries = getVersionSeries(nodeRef);
VersionHistory versionHistory = serviceRegistry.getVersionService().getVersionHistory(versionSeries); VersionHistory versionHistory = serviceRegistry.getVersionService().getVersionHistory(versionSeries);
if (versionHistory == null) if (versionHistory == null)
{ {

10
source/java/org/alfresco/cmis/mapping/VersionLabelProperty.java
View File

@@ -50,13 +50,11 @@ public class VersionLabelProperty extends AbstractVersioningProperty
{ {
return "pwc"; return "pwc";
} }
if (getVersionSeries(nodeRef).equals(nodeRef)) Serializable versionLabel = getServiceRegistry().getNodeService().getProperty(nodeRef, ContentModel.PROP_VERSION_LABEL);
if (versionLabel == null)
{ {
return "current"; return "0.0";
}
else
{
return getServiceRegistry().getNodeService().getProperty(nodeRef, ContentModel.PROP_VERSION_LABEL);
} }
return versionLabel;
} }
} }