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/domain/hibernate/ChildAssocImpl.java

@@ -25,7 +25,6 @@ import org.alfresco.repo.domain.ChildAssoc;
 import org.alfresco.repo.domain.Node;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.EqualsHelper;
 
 /**
  * @author Derek Hulley
@@ -124,9 +123,12 @@ public class ChildAssocImpl implements ChildAssoc, Serializable
     {
         StringBuffer sb = new StringBuffer(32);
         sb.append("ChildAssoc")
-          .append("[ parent=").append(parent)
-          .append(", child=").append(child)
+          .append("[ id=").append(id)
+          .append(", parent=").append(parent.getId())
+          .append(", child=").append(child.getId())
+          .append(", child name=").append(childNodeName)
           .append(", child name crc=").append(childNodeNameCrc)
+          .append(", assoc type=").append(getTypeQName())
           .append(", assoc name=").append(getQname())
           .append(", isPrimary=").append(isPrimary)
           .append("]");

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

@@ -144,4 +144,14 @@
          ace.authority.recipient = :authorityRecipient
    </query>
    
+   <query name="permission.patch.GetAccessControlEntriesToChangePermissionOn" >
+      select
+         entry
+      from
+         org.alfresco.repo.domain.hibernate.DbAccessControlEntryImpl entry
+      where
+         entry.permission.typeQname = :oldTypeQName and
+         entry.permission.name = :oldName
+   </query>
+    
 </hibernate-mapping>

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

@@ -29,7 +29,7 @@
             unique="false"
             not-null="false"
             cascade="none" />
-      <property name="changeTxnId" column="change_txn_id" type="string" length="56" not-null="true" index="CHANGE_TXN_ID"/>
+      <property name="changeTxnId" column="change_txn_id" type="string" length="56" not-null="true" />
    </class>
 
    <class
@@ -70,6 +70,14 @@
          status.key.identifier = :identifier
    </query>
    
+   <query name="txn.GetLastTxnId">
+      select
+         max(txn.id)
+      from
+         org.alfresco.repo.domain.hibernate.NodeStatusImpl as status
+         join status.transaction as txn
+   </query>
+   
    <query name="txn.CountTransactions">
       select
          count(txn.id)
@@ -90,6 +98,21 @@
       ]]>
    </query>
 
+   <query name="txn.GetNextRemoteTxns">
+      <![CDATA[
+      select
+         txn
+      from
+         org.alfresco.repo.domain.hibernate.TransactionImpl as txn
+         join txn.server as server
+      where
+         txn.id > :lastTxnId and
+         server.ipAddress != :serverIpAddress
+      order by
+         txn.id
+      ]]>
+   </query>
+
    <query name="txn.GetTxnUpdateCountForStore">
       select
          count(status.key.guid)
@@ -98,9 +121,7 @@
          join status.transaction as txn
       where
          txn.id = :txnId and
-         status.node is not null and
-         status.key.protocol = :protocol and
-         status.key.identifier = :identifier
+         status.node is not null
    </query>
 
    <query name="txn.GetTxnDeleteCountForStore">
@@ -111,9 +132,7 @@
          join status.transaction as txn
       where
          txn.id = :txnId and
-         status.node is null and
-         status.key.protocol = :protocol and
-         status.key.identifier = :identifier
+         status.node is null
    </query>
 
    <query name="txn.GetTxnChangesForStore">