Merged V2.2 to HEAD

10963: Merged DEV/LARGE_COLLECTION_PROPERTIES_2.2.1 to V2.2
          - PersonService: Lucene removal
          - Lucene optimizations (in progress)
          - Multi-valued and locale-specific properties persisted in alf_node_properties
          - Removal of unused AVM tables
   10987: Oracle dialects and enhanced SQL patch support
          - Only support Alfresco's 9i and 10g dialects (with auto-switching)
          - SQL script patches can now apply selectively to ranges
   11007: Test to check cached retrieval of QNames


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11206 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-10-06 13:26:18 +00:00
parent dd2ce5da0a
commit 6f302f0350
100 changed files with 8759 additions and 3628 deletions

View File

@@ -26,7 +26,7 @@ package org.alfresco.repo.domain.hibernate;
import java.io.Serializable;
import org.alfresco.repo.domain.StoreKey;
import org.alfresco.repo.domain.Store;
import org.alfresco.repo.domain.VersionCount;
/**
@@ -36,9 +36,10 @@ import org.alfresco.repo.domain.VersionCount;
*/
public class VersionCountImpl implements VersionCount, Serializable
{
private static final long serialVersionUID = 6420375860928877809L;
private static final long serialVersionUID = 7778431129424069297L;
private StoreKey key;
private Long id;
private Store store;
private long version;
private int versionCount;
@@ -65,7 +66,7 @@ public class VersionCountImpl implements VersionCount, Serializable
return false;
}
VersionCount that = (VersionCount) obj;
return (this.getKey().equals(that.getKey()));
return (this.getStore().equals(that.getStore()));
}
/**
@@ -73,7 +74,7 @@ public class VersionCountImpl implements VersionCount, Serializable
*/
public int hashCode()
{
return getKey().hashCode();
return getStore().hashCode();
}
/**
@@ -81,16 +82,31 @@ public class VersionCountImpl implements VersionCount, Serializable
*/
public String toString()
{
return getKey().toString();
return getStore().toString();
}
public StoreKey getKey() {
return key;
public Long getId()
{
return id;
}
/**
* For Hibernate use
*/
@SuppressWarnings("unused")
private void setId(Long id)
{
this.id = id;
}
public Store getStore()
{
return store;
}
public void setKey(StoreKey key)
public void setStore(Store store)
{
this.key = key;
this.store = store;
}
public Long getVersion()