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

127604 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127414 jvonka: Node Associations - create node with assocs (peer &/or secondary child)
      - can be optionally used to create (eg. mandatory) assoc(s) to other existing node(s)
      RA-925


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

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

@@ -75,8 +75,11 @@ public class Node implements Comparable<Node>
     protected PathInfo pathInfo;
     protected String prefixTypeQName;
 
-    // note: currently only used for create request
+    // please note: these are currently only used (optionally) for node create request
     protected String relativePath;
+    protected List<AssocChild> secondaryChildren;
+    protected List<AssocTarget> targets;
+
 
     protected List<String> aspectNames;
     protected Map<String, Object> properties;
@@ -304,14 +307,14 @@ public class Node implements Comparable<Node>
         this.allowableOperations = allowableOperations;
     }
 
-    public String getRelativePath()
+    public List<AssocTarget> getTargets()
     {
-        return relativePath;
+        return targets;
     }
 
-    public void setRelativePath(String relativePath)
+    public void setTargets(List<AssocTarget> targets)
     {
-        this.relativePath = relativePath;
+        this.targets = targets;
     }
 
     public Date getArchivedAt()
@@ -350,6 +353,26 @@ public class Node implements Comparable<Node>
         return EqualsHelper.nullSafeEquals(getNodeRef(), node.getNodeRef());
     }
 
+    public String getRelativePath()
+    {
+        return relativePath;
+    }
+
+    public void setRelativePath(String relativePath)
+    {
+        this.relativePath = relativePath;
+    }
+
+    public List<AssocChild> getSecondaryChildren()
+    {
+        return secondaryChildren;
+    }
+
+    public void setSecondaryChildren(List<AssocChild> secondaryChildren)
+    {
+        this.secondaryChildren = secondaryChildren;
+    }
+
     @Override
     public int compareTo(Node node)
     {