Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)

113684 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
      113603 cturlica: Merged DEV to V4.2-BUG-FIX (4.2.6)
         113602 cturlica: MNT-14504: Cloud pull process not working after large delete


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

source/java/org/alfresco/repo/domain/node/NodeAssocEntity.java

@@ -39,7 +39,11 @@ public class NodeAssocEntity
     private Long typeQNameId;
     private int assocIndex;
     private List<Long> typeQNameIds;
-    
+
+    // Supplemental query-related parameters
+    private Long propertyQNameId;
+    private NodePropertyValue propertyValue;
+
     /**
      * Required default constructor
      */
@@ -145,4 +149,25 @@ public class NodeAssocEntity
     {
         this.typeQNameIds = typeQNameIds;
     }
+
+    public Long getPropertyQNameId()
+    {
+        return propertyQNameId;
+    }
+
+    public void setPropertyQNameId(Long propertyQNameId)
+    {
+        this.propertyQNameId = propertyQNameId;
+    }
+
+    public NodePropertyValue getPropertyValue()
+    {
+        return propertyValue;
+    }
+
+    public void setPropertyValue(NodePropertyValue propertyValue)
+    {
+        this.propertyValue = propertyValue;
+    }
+
 }