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

source/java/org/alfresco/repo/version/NodeServiceImpl.java

@@ -601,6 +601,18 @@ public class NodeServiceImpl implements NodeService, VersionModel
         throw new UnsupportedOperationException(MSG_UNSUPPORTED);
     }
 
+    /**
+     * Gets an association by ID.
+     * 
+     * @param assocId
+     *            the association id
+     * @return the association, or <code>null</code> if it does not exist
+     */
+    public AssociationRef getAssoc(Long id)
+    {
+        return null;
+    }
+
     /**
      * @throws UnsupportedOperationException always
      */
@@ -624,7 +636,7 @@ public class NodeServiceImpl implements NodeService, VersionModel
 
                 if (qnamePattern.isMatch(qName) == true)
                 {
-                    AssociationRef newAssocRef = new AssociationRef(sourceRef, qName, referencedNode);
+                    AssociationRef newAssocRef = new AssociationRef(null, sourceRef, qName, referencedNode);
                     result.add(newAssocRef);
                 }
             }