Merged V2.1 to HEAD

6950: Fix for forum issue (6111) when using xsl:include
   6951: Partial fix for WCM-862
   6952: Merged V1.4 to V2.1
      6921: Reindex tracking refactoring.
   6954: Merged V1.4 to V2.1
      6927: Config and startup changes for index tracking


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7369 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-11-12 23:52:46 +00:00
parent 209dd85a0d
commit e82c2cd946
22 changed files with 824 additions and 456 deletions

View File

@@ -25,6 +25,7 @@
package org.alfresco.repo.domain.hibernate;
import java.io.Serializable;
import java.util.Date;
import org.alfresco.repo.domain.Server;
import org.alfresco.repo.domain.Transaction;
@@ -44,6 +45,7 @@ public class TransactionImpl extends LifecycleAdapter implements Transaction, Se
private Long id;
private Long version;
private String changeTxnId;
private Long commitTimeMs;
private Server server;
public TransactionImpl()
@@ -56,6 +58,7 @@ public class TransactionImpl extends LifecycleAdapter implements Transaction, Se
StringBuilder sb = new StringBuilder(50);
sb.append("Transaction")
.append("[id=").append(id)
.append(", txnTimeMs=").append(new Date(commitTimeMs))
.append(", changeTxnId=").append(changeTxnId)
.append("]");
return sb.toString();
@@ -99,6 +102,16 @@ public class TransactionImpl extends LifecycleAdapter implements Transaction, Se
this.changeTxnId = changeTransactionId;
}
public Long getCommitTimeMs()
{
return commitTimeMs;
}
public void setCommitTimeMs(Long commitTimeMs)
{
this.commitTimeMs = commitTimeMs;
}
public Server getServer()
{
return server;