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 BRANCHES/V3.4 to HEAD:

Browse Source 
23694: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
    23682: Merged /BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
      23681: Fixes ALF-5699: TransferService: Snapshot file from source repo never contains complete MLText properties

    Also fixed bug that was exposed by the merge relating to incorrect parsing of MLText values in the XMLTransferManifestReader.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23701 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Brian Remmington
2010-11-16 17:26:48 +00:00
parent 3419d5b067
commit 06a204c13f
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/transfer-service-context.xml
View File

@@ -57,6 +57,7 @@
<bean id="transferManifestNodeFactory" class="org.alfresco.repo.transfer.manifest.TransferManifestNodeFactoryImpl" init-method="init" > <bean id="transferManifestNodeFactory" class="org.alfresco.repo.transfer.manifest.TransferManifestNodeFactoryImpl" init-method="init" >
<property name="nodeService" ref="NodeService" /> <property name="nodeService" ref="NodeService" />
<property name="mlAwareNodeService" ref="mlAwareNodeService" />
<property name="permissionService" ref="PermissionService" /> <property name="permissionService" ref="PermissionService" />
<property name="dictionaryService" ref="DictionaryService" /> <property name="dictionaryService" ref="DictionaryService" />
</bean> </bean>

8
source/java/org/alfresco/repo/transfer/manifest/TransferManifestNodeFactoryImpl.java
View File

@@ -51,6 +51,7 @@ import org.alfresco.service.namespace.RegexQNamePattern;
public class TransferManifestNodeFactoryImpl implements TransferManifestNodeFactory public class TransferManifestNodeFactoryImpl implements TransferManifestNodeFactory
{ {
private NodeService nodeService; private NodeService nodeService;
private NodeService mlAwareNodeService;
private PermissionService permissionService; private PermissionService permissionService;
private DictionaryService dictionaryService; private DictionaryService dictionaryService;
@@ -208,7 +209,7 @@ public class TransferManifestNodeFactoryImpl implements TransferManifestNodeFact
*/ */
private Map<QName, Serializable> getNodeProperties(NodeRef nodeRef, Set<QName> excludedAspects) private Map<QName, Serializable> getNodeProperties(NodeRef nodeRef, Set<QName> excludedAspects)
{ {
Map<QName, Serializable> properties = nodeService.getProperties(nodeRef); Map<QName, Serializable> properties = mlAwareNodeService.getProperties(nodeRef);
if (excludedAspects == null || excludedAspects.size() == 0) if (excludedAspects == null || excludedAspects.size() == 0)
{ {
return properties; return properties;
@@ -233,6 +234,11 @@ public class TransferManifestNodeFactoryImpl implements TransferManifestNodeFact
this.nodeService = nodeService; this.nodeService = nodeService;
} }
public void setMlAwareNodeService(NodeService mlAwareNodeService)
{
this.mlAwareNodeService = mlAwareNodeService;
}
public void setPermissionService(PermissionService permissionService) public void setPermissionService(PermissionService permissionService)
{ {
this.permissionService = permissionService; this.permissionService = permissionService;

2
source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestReader.java
View File

@@ -189,7 +189,7 @@ public class XMLTransferManifestReader extends DefaultHandler implements Content
QName name = QName.createQName(atts.getValue("", "name")); QName name = QName.createQName(atts.getValue("", "name"));
props.put("name", name); props.put("name", name);
props.remove("values"); props.remove("values");
props.remove("mltext"); props.remove("mlvalues");
} }
else if(elementName.equals(ManifestModel.LOCALNAME_HEADER_CREATED_DATE)) else if(elementName.equals(ManifestModel.LOCALNAME_HEADER_CREATED_DATE))
{ {