Big hunk of merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

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

@@ -156,7 +156,6 @@
             unique="false"
             not-null="false" />
       <property name="changeTxnId" column="change_txn_id" type="string" length="56" not-null="true" />
-      <property name="deleted" column="deleted" type="boolean" not-null="true" />
    </class>
    
    <class
@@ -285,7 +284,7 @@
       where
          status.key.protocol = :storeProtocol and
          status.key.identifier = :storeIdentifier and
-         status.deleted = :deleted and
+         status.node.id is not null and
          status.changeTxnId = :changeTxnId
    </query>
 
@@ -297,7 +296,19 @@
       where
          status.key.protocol = :storeProtocol and
          status.key.identifier = :storeIdentifier and
-         status.deleted = :deleted and
+         status.node.id is not null and
+         status.changeTxnId = :changeTxnId
+   </query>
+
+   <query name="node.GetDeletedNodeStatuses">
+      select
+         status
+      from
+         org.alfresco.repo.domain.hibernate.NodeStatusImpl as status
+      where
+         status.key.protocol = :storeProtocol and
+         status.key.identifier = :storeIdentifier and
+         status.node.id is null and
          status.changeTxnId = :changeTxnId
    </query>
 

source/java/org/alfresco/repo/domain/hibernate/NodeStatusImpl.java

@@ -99,13 +99,4 @@ public class NodeStatusImpl implements NodeStatus, Serializable
     {
         return (node == null);
     }
-
-    /**
-     * For Hibernate use
-     */
-    @SuppressWarnings("unused")
-    private void setDeleted(boolean deleted)
-    {
-        // this is a convenience, derived property
-    }
 }