Merged HEAD (5.2) to 5.2.N (5.2.1)

127568 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126104 jvonka: Node (Peer) Associations - initial wip
      - /nodes/{srcId}/targets (GET, POST)
      - /nodes/{srcId}/targets/{tgtId} (DELETE)
      - /nodes/{tgtId}/sources (GET)
      - TODO ... assoc tests !
      - RA-742, RA-918, RA-919


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/api/model/Node.java

@@ -425,6 +425,21 @@ public class Node implements Comparable<Node>
         return this.contentInfo;
     }
 
+    // when appropriate, can be used to show association (in the context of a listing), for example
+    // GET /nodes/parentId/children, /nodes/parentId/secondary-children, /nodes/childId/parents
+    // GET /nodes/sourceId/targets, /nodes/targetId/sources
+    protected Assoc association;
+
+    public Assoc getAssociation()
+    {
+        return association;
+    }
+
+    public void setAssociation(Assoc association)
+    {
+        this.association = association;
+    }
+
 
     // TODO for backwards compat' - set explicitly when needed (ie. favourites) (note: we could choose to have separate old Node/NodeImpl etc)