Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4364 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4379 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4658 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml

@@ -224,6 +224,26 @@
          assoc.id = :childAssocId
    </query>
    
+   <query name="node.GetPrimaryChildNodeStatuses">
+      select
+         status
+      from
+         org.alfresco.repo.domain.hibernate.NodeStatusImpl as status
+         join status.node as node
+      where
+         node.id in
+         (
+            select
+               child.id
+            from
+               org.alfresco.repo.domain.hibernate.ChildAssocImpl as assoc
+               join assoc.child as child
+            where
+               assoc.parent.id = :parentId and
+               assoc.isPrimary = 1
+         )
+   </query>
+   
    <query name="node.GetChildAssocs">
       select
          assoc