inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merging BRANCHES/DEV/XXXXXXXX/HEAD-2010_03_01 to HEAD:

Browse Source 
19009: CMIS: Bug related to document from source creation in the same folder was fixed.
   19011: CMIS: RepositoryInfo.thinClientUri optional value was removed.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19079 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2010-03-04 18:26:28 +00:00
parent b6aa73955b
commit bf351f6af7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/cmis/ws/DMObjectServicePort.java
View File

@@ -167,7 +167,11 @@ public class DMObjectServicePort extends DMAbstractServicePort implements Object
{ {
NodeRef folderNodeRef = cmisService.getFolder(folderId); NodeRef folderNodeRef = cmisService.getFolder(folderId);
NodeRef sourceNodeRef = cmisService.getReadableObject(sourceId, NodeRef.class); NodeRef sourceNodeRef = cmisService.getReadableObject(sourceId, NodeRef.class);
String name = propertiesUtil.getProperty(sourceNodeRef, CMISDictionaryModel.PROP_NAME, null); String name = propertiesUtil.getCmisPropertyValue(properties, CMISDictionaryModel.PROP_NAME, null);
if (name == null)
{
name = propertiesUtil.getProperty(sourceNodeRef, CMISDictionaryModel.PROP_NAME, null);
}
NodeRef newDocumentNodeRef; NodeRef newDocumentNodeRef;
try try
{ {

6
source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java
View File

@@ -70,9 +70,6 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re
private static final Map<CMISAclSupportedPermissionEnum, EnumSupportedPermissions> ACL_SUPPORTED_PERMISSION_ENUM_MAPPING; private static final Map<CMISAclSupportedPermissionEnum, EnumSupportedPermissions> ACL_SUPPORTED_PERMISSION_ENUM_MAPPING;
private static final Map<CMISAclPropagationEnum, EnumACLPropagation> ACL_PROPAGATION_ENUM_MAPPGIN; private static final Map<CMISAclPropagationEnum, EnumACLPropagation> ACL_PROPAGATION_ENUM_MAPPGIN;
// FIXME: Hard-coded! should be retrieved using standard mechanism
private String repositoryUri = "http://localhost:8080/alfresco/cmis";
static static
{ {
JOIN_ENUM_MAPPING = new HashMap<CMISJoinEnum, EnumCapabilityJoin>(); JOIN_ENUM_MAPPING = new HashMap<CMISJoinEnum, EnumCapabilityJoin>();
@@ -480,8 +477,7 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re
repositoryInfoType.setRootFolderId(propertiesUtil.getProperty(cmisService.getDefaultRootNodeRef(), CMISDictionaryModel.PROP_OBJECT_ID, (String) null)); repositoryInfoType.setRootFolderId(propertiesUtil.getProperty(cmisService.getDefaultRootNodeRef(), CMISDictionaryModel.PROP_OBJECT_ID, (String) null));
repositoryInfoType.setLatestChangeLogToken(cmisChangeLogService.getLastChangeLogToken()); repositoryInfoType.setLatestChangeLogToken(cmisChangeLogService.getLastChangeLogToken());
// TODO: cmisVersionSupported is different in stubs and specification // TODO: cmisVersionSupported is different in stubs and specification
repositoryInfoType.setCmisVersionSupported("1.0 cd06"); repositoryInfoType.setCmisVersionSupported("1.0");
repositoryInfoType.setThinClientURI(repositoryUri);
repositoryInfoType.setChangesIncomplete(cmisChangeLogService.getChangesIncomplete()); repositoryInfoType.setChangesIncomplete(cmisChangeLogService.getChangesIncomplete());
// TODO: getFolderTree capability // TODO: getFolderTree capability
List<CMISBaseObjectTypeIds> changesOnTypeCapability = cmisChangeLogService.getChangesOnTypeCapability(); List<CMISBaseObjectTypeIds> changesOnTypeCapability = cmisChangeLogService.getChangesOnTypeCapability();