From b3cb4d3953e3dcbae09f8679e79194f65c84f79d Mon Sep 17 00:00:00 2001 From: David Caruana Date: Thu, 25 Feb 2010 15:02:44 +0000 Subject: [PATCH] Merging BRANCHES/DEV/CMIS_10 to HEAD (phase 2 - currently up-to-date with branch): 18717: SAIL-166: Refactor CMIS to use shared services and resolve objectIds and error codes consistently 18731: SAIL-169: CMIS REST versioning compliance 18732: Fix failing change log test. 18768: Add displayName and queryName attributes to rendered properties (in CMIS AtomPub binding). 18775: Fix exception reporting when retrieving items that do not exist (in CMIS AtomPub binding). 18784: Fix CMIS REST change logging 18785: SAIL-174: CMIS Relationship lookup by association ID 18812: SAIL-183: Support orderBy argument for getChildren and getCheckedOutDocs in CMIS REST and Web Service bindings 18823: CMIS WS Bindings were moved to 1.0 cd07 schema. 18838: Update to latest Chemistry TCK. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/web/bean/repository/TransientNode.java | 4 ++-- .../web/ui/repo/component/property/UIAssociationEditor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/web/bean/repository/TransientNode.java b/source/java/org/alfresco/web/bean/repository/TransientNode.java index 23abab0b15..c8415cc414 100644 --- a/source/java/org/alfresco/web/bean/repository/TransientNode.java +++ b/source/java/org/alfresco/web/bean/repository/TransientNode.java @@ -234,7 +234,7 @@ public class TransientNode extends Node // create a association reference, add it to a list and add the list // to the list of associations for this node List assocs = new ArrayList(1); - AssociationRef assocRef = new AssociationRef(this.nodeRef, assocDef.getName(), target); + AssociationRef assocRef = new AssociationRef(null, this.nodeRef, assocDef.getName(), target); assocs.add(assocRef); this.associations.put(item, assocs); @@ -250,7 +250,7 @@ public class TransientNode extends Node if (target instanceof NodeRef) { NodeRef currentTarget = (NodeRef)target; - AssociationRef assocRef = new AssociationRef(this.nodeRef, assocDef.getName(), currentTarget); + AssociationRef assocRef = new AssociationRef(null, this.nodeRef, assocDef.getName(), currentTarget); assocs.add(assocRef); } } diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java b/source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java index d49fc7031e..b7dba2ed76 100644 --- a/source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java +++ b/source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java @@ -235,7 +235,7 @@ public class UIAssociationEditor extends BaseAssociationEditor if (node != null && targetRef != null) { QName assocQName = Repository.resolveToQName(this.associationName); - AssociationRef newAssoc = new AssociationRef(node.getNodeRef(), assocQName, new NodeRef(targetRef)); + AssociationRef newAssoc = new AssociationRef(null, node.getNodeRef(), assocQName, new NodeRef(targetRef)); // update the node so it knows to remove the association, but only if the association // was one of the original ones @@ -279,7 +279,7 @@ public class UIAssociationEditor extends BaseAssociationEditor if (this.originalAssocs.containsKey(targetRef) == false) { QName assocQName = Repository.resolveToQName(this.associationName); - AssociationRef newAssoc = new AssociationRef(node.getNodeRef(), assocQName, + AssociationRef newAssoc = new AssociationRef(null, node.getNodeRef(), assocQName, new NodeRef(targetRef)); Map added = node.getAddedAssociations().get(this.associationName);