Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

were both beyond me, and are just the raw conflict merge data.  If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.


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

source/java/org/alfresco/repo/node/db/NodeDaoService.java

@@ -236,11 +236,14 @@ public interface NodeDaoService
      */
     public List<Serializable> getPropertyValuesByActualType(DataTypeDefinition actualDataTypeDefinition);
     
-    public Transaction getLastTxn(final StoreRef storeRef);
-    public int getTxnUpdateCountForStore(final StoreRef storeRef, final long txnId);
-    public int getTxnDeleteCountForStore(final StoreRef storeRef, final long txnId);
+    public Transaction getTxnById(long txnId);
+    public Transaction getLastTxn();
+    public Transaction getLastTxnForStore(final StoreRef storeRef);
+    public int getTxnUpdateCount(final long txnId);
+    public int getTxnDeleteCount(final long txnId);
     public int getTransactionCount();
-    public List<Transaction> getNextTxns(final Transaction lastTxn, final int count);
+    public List<Transaction> getNextTxns(final long lastTxnId, final int count);
+    public List<Transaction> getNextRemoteTxns(final long lastTxnId, final int count);
     public List<NodeRef> getTxnChangesForStore(final StoreRef storeRef, final long txnId);
     public List<NodeRef> getTxnChanges(final long txnId);
 }