mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged CMIS063 to HEAD
17102: Add Date svn:keyword 17103: - mask out cmis-tck-ws build/classes folder, fix JRE dependency in cmis-tck-ws .classpath 17106: MOB-1330: Upgrade Web Services Repository to 0.7. 17117: Now moved to Chemistry. 17120: CMIS Update to v1.0 Committee Draft 04 17123: Checkin mistake. 17129: Updated Chemistry AtomPub TCK with appropriate UTF-8 encoding. 17138: Fix reference to CMIS change list in CMIS Front Page. 17142: Move all CMIS web scripts into same package. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17259 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -181,6 +181,16 @@ public class CMISScript extends BaseScopableProcessorExtension
|
||||
return cmisService.getCMISVersion();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the supported CMIS Specification Title
|
||||
*
|
||||
* @return CMIS Specification Title
|
||||
*/
|
||||
public String getSpecTitle()
|
||||
{
|
||||
return cmisService.getCMISSpecTitle();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the default root folder path
|
||||
*
|
||||
|
@@ -702,7 +702,7 @@ public class DMObjectServicePort extends DMAbstractServicePort implements Object
|
||||
}
|
||||
versionLabel = propertiesUtil.getProperty(targetDocumentNodeRef, CMISDictionaryModel.PROP_VERSION_LABEL, "");
|
||||
}
|
||||
String createdObjectId = ((null != versionLabel) && versionLabel.contains(VERSION_DELIMETER)) ? (targetDocumentNodeRef.toString() + CmisObjectsUtils.NODE_REFERENCE_ID_DELIMETER + versionLabel)
|
||||
String createdObjectId = ((null != versionLabel) && versionLabel.contains(VERSION_DELIMETER)) ? (targetDocumentNodeRef.toString() + CmisObjectsUtils.NODE_REFERENCE_ID_DELIMITER + versionLabel)
|
||||
: (targetDocumentNodeRef.toString());
|
||||
objectId.value = createdObjectId;
|
||||
}
|
||||
|
@@ -261,7 +261,7 @@ public class CmisObjectIterator implements Iterator<FileInfo>
|
||||
String versionLabel = (null != properties) ? ((String) properties.get(ContentModel.PROP_VERSION_LABEL)) : (null);
|
||||
if (null != versionLabel)
|
||||
{
|
||||
generator.append(CmisObjectsUtils.NODE_REFERENCE_ID_DELIMETER).append(versionLabel);
|
||||
generator.append(CmisObjectsUtils.NODE_REFERENCE_ID_DELIMITER).append(versionLabel);
|
||||
}
|
||||
return generator.toString();
|
||||
}
|
||||
|
@@ -68,7 +68,7 @@ import org.alfresco.util.Pair;
|
||||
*/
|
||||
public class CmisObjectsUtils
|
||||
{
|
||||
public static final String NODE_REFERENCE_ID_DELIMETER = "/";
|
||||
public static final String NODE_REFERENCE_ID_DELIMITER = ";";
|
||||
|
||||
private static final Pattern VERSION_LABEL_MATCHING_COMPILED_PATTERN = Pattern.compile("([\\p{Graph}])+([\\p{Digit}]*)\\.([\\p{Digit}]*)$");
|
||||
|
||||
@@ -498,7 +498,7 @@ public class CmisObjectsUtils
|
||||
private Pair<String, String> splitOnNodeRefAndVersionLabel(String nodeIdentifier)
|
||||
{
|
||||
String versionLabel = null;
|
||||
int versionDelimeterIndex = nodeIdentifier.lastIndexOf(NODE_REFERENCE_ID_DELIMETER);
|
||||
int versionDelimeterIndex = nodeIdentifier.lastIndexOf(NODE_REFERENCE_ID_DELIMITER);
|
||||
if (versionDelimeterIndex > 0)
|
||||
{
|
||||
versionLabel = nodeIdentifier.substring(versionDelimeterIndex + 1);
|
||||
|
Reference in New Issue
Block a user