Merged V2.2 to HEAD

8372: Merged V2.1 to V2.2
      8314: Merged V2.0 to V2.1
         7750: Fix for ACT-475: ContentStoreCleaner causes OutOfMemoryError
      8332: Made content URL column larger to accommodate the extra locale info present in 2.1
      8334: Build fix: V2.1 tighter on authentication for getTempWriter
   8376: Merged V2.1 to V2.2
      8325: Fix for AWC-1089
      8361: Workaround for WCM-882: All metadata extracters can now handle zero length files


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

source/java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java

@@ -27,12 +27,14 @@ package org.alfresco.repo.content;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
+import java.util.HashSet;
 import java.util.Set;
 
 import javax.transaction.UserTransaction;
 
 import junit.framework.TestCase;
 
+import org.alfresco.repo.content.ContentStore.ContentUrlHandler;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
@@ -118,7 +120,18 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
         ContentStore store = getStore();
         try
         {
-            Set<String> contentUrls = store.getUrls();
+            final Set<String> contentUrls = new HashSet<String>(5);
+            ContentUrlHandler handler = new ContentUrlHandler()
+            {
+                public void handle(String contentUrl)
+                {
+                    if (contentUrls.size() < 50)
+                    {
+                        contentUrls.add(contentUrl);
+                    }
+                }
+            };
+            store.getUrls(handler);
             if (contentUrls.size() > 0)
             {
                 return (String) contentUrls.toArray()[0];