diff --git a/config/alfresco/transfer-service-context.xml b/config/alfresco/transfer-service-context.xml index e4faa51677..151d8b1092 100644 --- a/config/alfresco/transfer-service-context.xml +++ b/config/alfresco/transfer-service-context.xml @@ -57,6 +57,7 @@ + diff --git a/source/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeFactoryImpl.java b/source/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeFactoryImpl.java index 350ffdef16..9536a6c52e 100644 --- a/source/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeFactoryImpl.java +++ b/source/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeFactoryImpl.java @@ -51,6 +51,7 @@ import org.alfresco.service.namespace.RegexQNamePattern; public class TransferManifestNodeFactoryImpl implements TransferManifestNodeFactory { private NodeService nodeService; + private NodeService mlAwareNodeService; private PermissionService permissionService; private DictionaryService dictionaryService; @@ -208,7 +209,7 @@ public class TransferManifestNodeFactoryImpl implements TransferManifestNodeFact */ private Map getNodeProperties(NodeRef nodeRef, Set excludedAspects) { - Map properties = nodeService.getProperties(nodeRef); + Map properties = mlAwareNodeService.getProperties(nodeRef); if (excludedAspects == null || excludedAspects.size() == 0) { return properties; @@ -233,6 +234,11 @@ public class TransferManifestNodeFactoryImpl implements TransferManifestNodeFact this.nodeService = nodeService; } + public void setMlAwareNodeService(NodeService mlAwareNodeService) + { + this.mlAwareNodeService = mlAwareNodeService; + } + public void setPermissionService(PermissionService permissionService) { this.permissionService = permissionService; diff --git a/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestReader.java b/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestReader.java index 45bf8e8fca..b3317d1f97 100644 --- a/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestReader.java +++ b/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestReader.java @@ -189,7 +189,7 @@ public class XMLTransferManifestReader extends DefaultHandler implements Content QName name = QName.createQName(atts.getValue("", "name")); props.put("name", name); props.remove("values"); - props.remove("mltext"); + props.remove("mlvalues"); } else if(elementName.equals(ManifestModel.LOCALNAME_HEADER_CREATED_DATE)) {