mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Fix AR-641
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3150 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -280,6 +280,23 @@ public class LDAPGroupExportSource implements ExportSource, InitializingBean
|
|||||||
ContentModel.TYPE_AUTHORITY_CONTAINER.getLocalName(), ContentModel.TYPE_AUTHORITY_CONTAINER
|
ContentModel.TYPE_AUTHORITY_CONTAINER.getLocalName(), ContentModel.TYPE_AUTHORITY_CONTAINER
|
||||||
.toPrefixString(namespaceService), attrs);
|
.toPrefixString(namespaceService), attrs);
|
||||||
|
|
||||||
|
if ((authorityDAO != null ) && authorityDAO.authorityExists(group.gid))
|
||||||
|
{
|
||||||
|
NodeRef authNodeRef = authorityDAO.getAuthorityNodeRefOrNull(group.gid);
|
||||||
|
if (authNodeRef != null)
|
||||||
|
{
|
||||||
|
String uguid = authorityDAO.getAuthorityNodeRefOrNull(group.gid).getId();
|
||||||
|
|
||||||
|
writer.startElement(nodeUUID.getNamespaceURI(), nodeUUID.getLocalName(), nodeUUID
|
||||||
|
.toPrefixString(namespaceService), new AttributesImpl());
|
||||||
|
|
||||||
|
writer.characters(uguid.toCharArray(), 0, uguid.length());
|
||||||
|
|
||||||
|
writer.endElement(nodeUUID.getNamespaceURI(), nodeUUID.getLocalName(), nodeUUID
|
||||||
|
.toPrefixString(namespaceService));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
writer.startElement(ContentModel.PROP_AUTHORITY_NAME.getNamespaceURI(), ContentModel.PROP_AUTHORITY_NAME
|
writer.startElement(ContentModel.PROP_AUTHORITY_NAME.getNamespaceURI(), ContentModel.PROP_AUTHORITY_NAME
|
||||||
.getLocalName(), ContentModel.PROP_AUTHORITY_NAME.toPrefixString(namespaceService),
|
.getLocalName(), ContentModel.PROP_AUTHORITY_NAME.toPrefixString(namespaceService),
|
||||||
new AttributesImpl());
|
new AttributesImpl());
|
||||||
@@ -314,23 +331,6 @@ public class LDAPGroupExportSource implements ExportSource, InitializingBean
|
|||||||
addgroup(lookup, child, writer);
|
addgroup(lookup, child, writer);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((authorityDAO != null ) && authorityDAO.authorityExists(group.gid))
|
|
||||||
{
|
|
||||||
NodeRef authNodeRef = authorityDAO.getAuthorityNodeRefOrNull(group.gid);
|
|
||||||
if (authNodeRef != null)
|
|
||||||
{
|
|
||||||
String uguid = authorityDAO.getAuthorityNodeRefOrNull(group.gid).getId();
|
|
||||||
|
|
||||||
writer.startElement(nodeUUID.getNamespaceURI(), nodeUUID.getLocalName(), nodeUUID
|
|
||||||
.toPrefixString(namespaceService), new AttributesImpl());
|
|
||||||
|
|
||||||
writer.characters(uguid.toCharArray(), 0, uguid.length());
|
|
||||||
|
|
||||||
writer.endElement(nodeUUID.getNamespaceURI(), nodeUUID.getLocalName(), nodeUUID
|
|
||||||
.toPrefixString(namespaceService));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
writer.endElement(ContentModel.TYPE_AUTHORITY_CONTAINER.getNamespaceURI(),
|
writer.endElement(ContentModel.TYPE_AUTHORITY_CONTAINER.getNamespaceURI(),
|
||||||
ContentModel.TYPE_AUTHORITY_CONTAINER.getLocalName(), ContentModel.TYPE_AUTHORITY_CONTAINER
|
ContentModel.TYPE_AUTHORITY_CONTAINER.getLocalName(), ContentModel.TYPE_AUTHORITY_CONTAINER
|
||||||
.toPrefixString(namespaceService));
|
.toPrefixString(namespaceService));
|
||||||
|
Reference in New Issue
Block a user