Merged V2.2 to HEAD

8219: Fix audit date behaviour, auto truncate all values to fit, fix retrying transaction use
         AR-1923   AWC-1637


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8486 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-10 16:42:56 +00:00
parent d156b449cd
commit d05655f3c7
12 changed files with 285 additions and 244 deletions

View File

@@ -34,7 +34,7 @@ public class AuditConfigImpl implements AuditConfig, InitializingBean
/**
* The hibernate generated internal key.
*/
private long id;
private Long id;
/**
* The URL to the content that contains the configuration file
@@ -75,7 +75,7 @@ public class AuditConfigImpl implements AuditConfig, InitializingBean
*
* @see org.alfresco.repo.audit.hibernate.AuditContig#getId()
*/
public long getId()
public Long getId()
{
return id;
}
@@ -87,20 +87,11 @@ public class AuditConfigImpl implements AuditConfig, InitializingBean
*/
@SuppressWarnings("unused")
private void setId(long id)
private void setId(Long id)
{
this.id = id;
}
/**
* Helper method to get the latest audit config
*/
public static AuditConfig getLatestConfig(Session session)
{
Query query = session.getNamedQuery(HibernateAuditDAO.QUERY_LAST_AUDIT_CONFIG);
return (AuditConfig) query.uniqueResult();
}
@Override
public boolean equals(Object o)
{