Merged V3.2 to HEAD

17574: Merged in DEV work for ContentStoreCleaner: ETHREEOH-2813
      17432: Build up for fix of ETHREEOH-2813: ContentStoreCleaner doesn't scale
      17546: ContentStoreCleaner fixes and further tests
      17524: Unit tests and bulk queries for orphaned content
      17506: W.I.P. for content cleaner for V3.2: ETHREEOH-2813
   17575: Missed check-in (other DB create scripts look OK)
   17577: Re-activated 'contentStoreCleanerTrigger'
          - Added system property: system.content.orphanCleanup.cronExpression=0 0 4 * * ?
          - Other useful properties:
              system.content.eagerOrphanCleanup=false
              system.content.orphanProtectDays=14
   17578: Fixed MT test and sample contexts after recent content cleaner changes
   17579: Fixed DB2 unique index creation for content URLs
   17580: First pass at fix for ETHREEOH-3454: Port enterprise upgrade scripts for ContentStoreCleaner changes
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V3.2:r17574-17575,17577-17580


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18151 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/domain/contentdata/ContentUrlEntity.java

@@ -43,11 +43,11 @@ public class ContentUrlEntity
     public static final String EMPTY_URL = "empty";
     
     private Long id;
-    private Long version;
     private String contentUrl;
     private String contentUrlShort;
     private long contentUrlCrc;
     private long size;
+    private Long orphanTime;
     
     public ContentUrlEntity()
     {
@@ -86,6 +86,7 @@ public class ContentUrlEntity
           .append("[ ID=").append(id)
           .append(", contentUrl=").append(contentUrl)
           .append(", size=").append(size)
+          .append(", orphanTime=").append(orphanTime)
           .append("]");
         return sb.toString();
     }
@@ -129,16 +130,6 @@ public class ContentUrlEntity
         this.id = id;
     }
 
-    public Long getVersion()
-    {
-        return version;
-    }
-
-    public void setVersion(Long version)
-    {
-        this.version = version;
-    }
-
     public String getContentUrl()
     {
         // Convert the persisted content URL to an external value
@@ -195,4 +186,14 @@ public class ContentUrlEntity
     {
         this.size = size;
     }
+
+    public Long getOrphanTime()
+    {
+        return orphanTime;
+    }
+
+    public void setOrphanTime(Long orphanTime)
+    {
+        this.orphanTime = orphanTime;
+    }
 }