Updated to use alfresco-data-model:6.1-SNAPSHOT that includes the removal of ContentStore.getUrls methods

- Fixed derived code to remove the implementations git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131256 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-10-08 14:51:49 +00:00 · 2016-10-06 19:46:02 +00:00
parent 4125597e28
commit 245770e049
17 changed files with 306 additions and 1068 deletions
--- a/source/java/org/alfresco/repo/content/AbstractContentStore.java
+++ b/source/java/org/alfresco/repo/content/AbstractContentStore.java
@@ -25,16 +25,14 @@
 */
 package org.alfresco.repo.content;

-import java.util.Date;
-
-import org.alfresco.api.AlfrescoPublicApi;
-import org.alfresco.repo.content.ContentLimitProvider.NoLimitProvider;
-import org.alfresco.service.cmr.repository.ContentIOException;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.ContentWriter;
-import org.alfresco.util.Pair;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.alfresco.api.AlfrescoPublicApi;
+import org.alfresco.repo.content.ContentLimitProvider.NoLimitProvider;
+import org.alfresco.service.cmr.repository.ContentIOException;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.util.Pair;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;

 /**
 * Base class providing support for different types of content stores.
@@ -164,29 +162,6 @@ public abstract class AbstractContentStore implements ContentStore
        throw new UnsupportedOperationException();
    }

-    /**
-     * @see #getUrls(Date, Date, ContentUrlHandler)
-     */
-    @SuppressWarnings("deprecation")
-    @Override
-    public final void getUrls(ContentUrlHandler handler) throws ContentIOException
-    {
-        getUrls(null, null, handler);
-    }
-
-    /**
-     * Override to provide an implementation.  If no implementation is supplied, then the store will not support
-     * cleaning of orphaned content binaries.
-     * 
-     * @throws UnsupportedOperationException always
-     */
-    @SuppressWarnings("deprecation")
-    @Override
-    public void getUrls(Date createdAfter, Date createdBefore, ContentUrlHandler handler) throws ContentIOException
-    {
-        throw new UnsupportedOperationException();
-    }
-
    /**
     * Implement to supply a store-specific writer for the given existing content
     * and optional target content URL.
--- a/source/java/org/alfresco/repo/content/AbstractRoutingContentStore.java
+++ b/source/java/org/alfresco/repo/content/AbstractRoutingContentStore.java
@@ -25,21 +25,20 @@
 */
 package org.alfresco.repo.content;

-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.repo.cache.SimpleCache;
-import org.alfresco.service.cmr.repository.ContentIOException;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.ContentWriter;
-import org.alfresco.util.GUID;
-import org.alfresco.util.Pair;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.List;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.cache.SimpleCache;
+import org.alfresco.service.cmr.repository.ContentIOException;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.util.GUID;
+import org.alfresco.util.Pair;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;

 /**
 * A store providing support for content store implementations that provide
@@ -393,37 +392,6 @@ public abstract class AbstractRoutingContentStore implements ContentStore
        return getWriter(new ContentContext(existingContentReader, newContentUrl));
    }

-    /**
-     * @see #getUrls(Date, Date, ContentUrlHandler)
-     */
-    @SuppressWarnings("deprecation")
-    public void getUrls(ContentUrlHandler handler) throws ContentIOException
-    {
-        getUrls(null, null, handler);
-    }
-
-    /**
-     * Passes the call to each of the stores wrapped by this store
-     * 
-     * @see ContentStore#getUrls(Date, Date, ContentUrlHandler)
-     */
-    @SuppressWarnings("deprecation")
-    public void getUrls(Date createdAfter, Date createdBefore, ContentUrlHandler handler) throws ContentIOException
-    {
-        List<ContentStore> stores = getAllStores();
-        for (ContentStore store : stores)
-        {
-            try
-            {
-                store.getUrls(createdAfter, createdBefore, handler);
-            }
-            catch (UnsupportedOperationException e)
-            {
-                // Support of this is not mandatory
-            }
-        }
-    }
-
    /**
     * This operation has to be performed on all the stores in order to maintain the
     * {@link ContentStore#exists(String)} contract.
--- a/source/java/org/alfresco/repo/content/ContentServiceImpl.java
+++ b/source/java/org/alfresco/repo/content/ContentServiceImpl.java
@@ -25,60 +25,58 @@
 */
 package org.alfresco.repo.content;

-import java.io.File;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.model.ContentModel;
-import org.alfresco.repo.content.ContentServicePolicies.OnContentPropertyUpdatePolicy;
-import org.alfresco.repo.content.ContentServicePolicies.OnContentReadPolicy;
-import org.alfresco.repo.content.ContentServicePolicies.OnContentUpdatePolicy;
-import org.alfresco.repo.content.cleanup.EagerContentStoreCleaner;
-import org.alfresco.repo.content.filestore.FileContentStore;
-import org.alfresco.repo.content.filestore.FileContentWriter;
-import org.alfresco.repo.content.transform.ContentTransformer;
-import org.alfresco.repo.content.transform.ContentTransformerRegistry;
-import org.alfresco.repo.content.transform.TransformerDebug;
-import org.alfresco.repo.content.transform.UnimportantTransformException;
-import org.alfresco.repo.content.transform.UnsupportedTransformationException;
-import org.alfresco.repo.node.NodeServicePolicies;
-import org.alfresco.repo.policy.ClassPolicyDelegate;
-import org.alfresco.repo.policy.JavaBehaviour;
-import org.alfresco.repo.policy.PolicyComponent;
-import org.alfresco.repo.transaction.RetryingTransactionHelper;
-import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
-import org.alfresco.service.cmr.dictionary.DictionaryService;
-import org.alfresco.service.cmr.dictionary.InvalidTypeException;
-import org.alfresco.service.cmr.dictionary.PropertyDefinition;
-import org.alfresco.service.cmr.repository.ContentData;
-import org.alfresco.service.cmr.repository.ContentIOException;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.ContentService;
-import org.alfresco.service.cmr.repository.ContentWriter;
-import org.alfresco.service.cmr.repository.MimetypeService;
-import org.alfresco.service.cmr.repository.MimetypeServiceAware;
-import org.alfresco.service.cmr.repository.NoTransformerException;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.cmr.repository.TransformationOptions;
-import org.alfresco.service.cmr.usage.ContentQuotaException;
-import org.alfresco.service.namespace.QName;
-import org.alfresco.util.EqualsHelper;
-import org.alfresco.util.Pair;
-import org.alfresco.util.TempFileProvider;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.extensions.surf.util.I18NUtil;
+import java.io.File;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.ContentServicePolicies.OnContentPropertyUpdatePolicy;
+import org.alfresco.repo.content.ContentServicePolicies.OnContentReadPolicy;
+import org.alfresco.repo.content.ContentServicePolicies.OnContentUpdatePolicy;
+import org.alfresco.repo.content.cleanup.EagerContentStoreCleaner;
+import org.alfresco.repo.content.filestore.FileContentStore;
+import org.alfresco.repo.content.filestore.FileContentWriter;
+import org.alfresco.repo.content.transform.ContentTransformer;
+import org.alfresco.repo.content.transform.ContentTransformerRegistry;
+import org.alfresco.repo.content.transform.TransformerDebug;
+import org.alfresco.repo.content.transform.UnimportantTransformException;
+import org.alfresco.repo.content.transform.UnsupportedTransformationException;
+import org.alfresco.repo.node.NodeServicePolicies;
+import org.alfresco.repo.policy.ClassPolicyDelegate;
+import org.alfresco.repo.policy.JavaBehaviour;
+import org.alfresco.repo.policy.PolicyComponent;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.InvalidTypeException;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.ContentIOException;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.MimetypeServiceAware;
+import org.alfresco.service.cmr.repository.NoTransformerException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.TransformationOptions;
+import org.alfresco.service.cmr.usage.ContentQuotaException;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.EqualsHelper;
+import org.alfresco.util.TempFileProvider;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.extensions.surf.util.I18NUtil;

 /**
 * Service implementation acting as a level of indirection between the client
--- a/source/java/org/alfresco/repo/content/caching/CachingContentStore.java
+++ b/source/java/org/alfresco/repo/content/caching/CachingContentStore.java
@@ -25,27 +25,26 @@
 */
 package org.alfresco.repo.content.caching;

-import java.util.Date;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
-
-import org.alfresco.repo.content.ContentContext;
-import org.alfresco.repo.content.ContentStore;
-import org.alfresco.repo.content.caching.quota.QuotaManagerStrategy;
-import org.alfresco.repo.content.caching.quota.UnlimitedQuotaStrategy;
-import org.alfresco.repo.content.filestore.FileContentStore;
-import org.alfresco.repo.content.filestore.SpoofedTextContentReader;
-import org.alfresco.service.cmr.repository.ContentIOException;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.ContentStreamListener;
-import org.alfresco.service.cmr.repository.ContentWriter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.annotation.Required;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.context.ApplicationEventPublisherAware;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+
+import org.alfresco.repo.content.ContentContext;
+import org.alfresco.repo.content.ContentStore;
+import org.alfresco.repo.content.caching.quota.QuotaManagerStrategy;
+import org.alfresco.repo.content.caching.quota.UnlimitedQuotaStrategy;
+import org.alfresco.repo.content.filestore.FileContentStore;
+import org.alfresco.repo.content.filestore.SpoofedTextContentReader;
+import org.alfresco.service.cmr.repository.ContentIOException;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentStreamListener;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.BeanNameAware;
+import org.springframework.beans.factory.annotation.Required;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.ApplicationEventPublisherAware;

 /**
 * Implementation of ContentStore that wraps any other ContentStore (the backing store)
@@ -335,21 +334,6 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
        }
    }

-    @SuppressWarnings("deprecation")
-    @Override
-    public void getUrls(ContentUrlHandler handler) throws ContentIOException
-    {
-        backingStore.getUrls(handler);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void getUrls(Date createdAfter, Date createdBefore, ContentUrlHandler handler)
-                throws ContentIOException
-    {
-        backingStore.getUrls(createdAfter, createdBefore, handler);
-    }
-
    @Override
    public boolean delete(String contentUrl)
    {
--- a/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerScalabilityRunner.java
+++ b/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerScalabilityRunner.java
@@ -186,13 +186,11 @@ public class ContentStoreCleanerScalabilityRunner extends Repository
    private class NullContentStore extends AbstractContentStore
    {
        private ThreadLocal<File> hammeredFile;
-        private int count;
        private int deletedCount;
        
        private NullContentStore(int count)
        {
            hammeredFile = new ThreadLocal<File>();
-            this.count = count;
        }
        
        public boolean isWriteSupported()
@@ -216,17 +214,6 @@ public class ContentStoreCleanerScalabilityRunner extends Repository
            return new FileContentWriter(file);
        }

-        @Override
-        public void getUrls(Date createdAfter, Date createdBefore, ContentUrlHandler handler) throws ContentIOException
-        {
-            // Make up it up
-            for (int i = 0; i < count; i++)
-            {
-                String contentUrl = FileContentStore.createNewFileStoreUrl() + "-imaginary";
-                handler.handle(contentUrl);
-            }
-        }
-
        public ContentReader getReader(String contentUrl)
        {
            File file = hammeredFile.get();
--- a/source/java/org/alfresco/repo/content/filestore/FileContentStore.java
+++ b/source/java/org/alfresco/repo/content/filestore/FileContentStore.java
@@ -25,38 +25,37 @@
 */
 package org.alfresco.repo.content.filestore;

-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Map;
-
-import org.alfresco.api.AlfrescoPublicApi;
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.repo.content.AbstractContentStore;
-import org.alfresco.repo.content.ContentContext;
-import org.alfresco.repo.content.ContentStore;
-import org.alfresco.repo.content.ContentStoreCreatedEvent;
-import org.alfresco.repo.content.EmptyContentReader;
-import org.alfresco.repo.content.UnsupportedContentUrlException;
-import org.alfresco.service.cmr.repository.ContentIOException;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.ContentWriter;
-import org.alfresco.util.Deleter;
-import org.alfresco.util.GUID;
-import org.alfresco.util.Pair;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.GregorianCalendar;
+import java.util.Map;
+
+import org.alfresco.api.AlfrescoPublicApi;
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.content.AbstractContentStore;
+import org.alfresco.repo.content.ContentContext;
+import org.alfresco.repo.content.ContentStore;
+import org.alfresco.repo.content.ContentStoreCreatedEvent;
+import org.alfresco.repo.content.EmptyContentReader;
+import org.alfresco.repo.content.UnsupportedContentUrlException;
+import org.alfresco.service.cmr.repository.ContentIOException;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.util.Deleter;
+import org.alfresco.util.GUID;
+import org.alfresco.util.Pair;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;

 /**
 * Provides a store of node content directly to the file system.  The writers
@@ -67,7 +66,7 @@ import org.springframework.context.event.ContextRefreshedEvent;
 * The protocols handled are:
 * <ul>
 *   <li><b>{@link #STORE_PROTOCOL store}</b>: These URLs can be generated by this implementation and are file references within the root directory.</li>
- *   <li><b>{@link #SPOOF_PROTOCOL spoof}</b>: These URLs are never generated by the implementation but represent spoofed binary text stream data: TODO</li>
+ *   <li><b>{@link #SPOOF_PROTOCOL spoof}</b>: These URLs are never generated by the implementation but represent spoofed binary text stream data.</li>
 * </ul>
 * 
 * @author Derek Hulley
@@ -531,74 +530,6 @@ public class FileContentStore
            throw new ContentIOException("Failed to get writer", e);
        }
    }
-
-    /**
-     * Gets the urls.
-     * 
-     * @param createdAfter
-     *            the created after date
-     * @param createdBefore
-     *            the created before dat6e
-     * @param handler
-     *            the handler
-     */
-    @SuppressWarnings("deprecation")
-    public void getUrls(Date createdAfter, Date createdBefore, ContentUrlHandler handler)
-    {
-        // recursively get all files within the root
-        getUrls(rootDirectory, handler, createdAfter, createdBefore);
-        // done
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("Listed all content URLS: \n" +
-                    "   store: " + this);
-        }
-    }
-    
-    /**
-     * Returns a list of all files within the given directory and all subdirectories.
-     * @param directory the current directory to get the files from
-     * @param handler the callback to use for each URL
-     * @param createdAfter only get URLs for content create after this date
-     * @param createdBefore only get URLs for content created before this date
-     */
-    @SuppressWarnings("deprecation")
-    private void getUrls(File directory, ContentUrlHandler handler, Date createdAfter, Date createdBefore)
-    {
-        File[] files = directory.listFiles();
-        if (files == null)
-        {
-            // the directory has disappeared
-            throw new ContentIOException("Failed list files in folder: " + directory);
-        }
-        for (File file : files)
-        {
-            if (file.isDirectory())
-            {
-                // we have a subdirectory - recurse
-                getUrls(file, handler, createdAfter, createdBefore);
-            }
-            else
-            {
-                // check the created date of the file
-                long lastModified = file.lastModified();
-                if (createdAfter != null && lastModified < createdAfter.getTime())
-                {
-                    // file is too old
-                    continue;
-                }
-                else if (createdBefore != null && lastModified > createdBefore.getTime())
-                {
-                    // file is too young
-                    continue;
-                }
-                // found a file - create the URL
-                String contentUrl = makeContentUrl(file);
-                // Callback
-                handler.handle(contentUrl);
-            }
-        }
-    }
    
    /**
     * Attempts to delete the content.  The actual deletion is optional on the interface
--- a/source/java/org/alfresco/repo/content/http/HttpAlfrescoStore.java
+++ b/source/java/org/alfresco/repo/content/http/HttpAlfrescoStore.java
@@ -29,7 +29,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
-
+
 import org.alfresco.repo.content.AbstractContentStore;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.ContentData;
@@ -37,6 +37,8 @@ import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.security.AuthenticationService;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationContext;

 /**
@@ -46,10 +48,15 @@ import org.springframework.context.ApplicationContext;
 * having to have shared access to the binary data on the various machines.
 * 
 * @since 2.1
- * @author Derek Hulley
- */
+ * @author Derek Hulley
+ * 
+ * @deprecated Removed in 5.2
+ */
+@Deprecated
 public class HttpAlfrescoStore extends AbstractContentStore
-{
+{
+    private static final Log logger = LogFactory.getLog(HttpAlfrescoStore.class);
+    
    private TransactionService transactionService;
    private AuthenticationService authenticationService;
    private String baseHttpUrl;
@@ -58,7 +65,8 @@ public class HttpAlfrescoStore extends AbstractContentStore
     * Default constructor for bean instantiation.
     */
    public HttpAlfrescoStore()
-    {
+    {
+        logger.warn("HttpAlfrescoStore has been deprecated since Alfresco 5.2.");
    }

    /**
--- a/source/java/org/alfresco/repo/content/replication/AggregatingContentStore.java
+++ b/source/java/org/alfresco/repo/content/replication/AggregatingContentStore.java
@@ -25,22 +25,21 @@
 */
 package org.alfresco.repo.content.replication;

-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.repo.content.AbstractContentStore;
-import org.alfresco.repo.content.ContentContext;
-import org.alfresco.repo.content.ContentStore;
-import org.alfresco.repo.content.caching.CachingContentStore;
-import org.alfresco.service.cmr.repository.ContentIOException;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.ContentWriter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.List;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.content.AbstractContentStore;
+import org.alfresco.repo.content.ContentContext;
+import org.alfresco.repo.content.ContentStore;
+import org.alfresco.repo.content.caching.CachingContentStore;
+import org.alfresco.service.cmr.repository.ContentIOException;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;

 /**
 * <h1><u>Aggregating Content Store</u></h1>
@@ -69,16 +68,14 @@ public class AggregatingContentStore extends AbstractContentStore
    private List<ContentStore> secondaryStores;
    
    private Lock readLock;
-    private Lock writeLock;

    /**
     * Default constructor 
     */
    public AggregatingContentStore()
-    {       
+    {
        ReadWriteLock storeLock = new ReentrantReadWriteLock();
        readLock = storeLock.readLock();
-        writeLock = storeLock.writeLock();
    }
        
    /**
@@ -151,7 +148,6 @@ public class AggregatingContentStore extends AbstractContentStore
            }

            // the content is not in the primary reader so we have to go looking for it
-            ContentReader secondaryContentReader = null;
            for (ContentStore store : secondaryStores)
            {
                ContentReader reader = store.getReader(contentUrl);
@@ -195,28 +191,4 @@ public class AggregatingContentStore extends AbstractContentStore
        }
        return deleted;
    }
-
-    /**
-     * Iterates over results as given by the primary store and all secondary stores.  It is up to the handler to eliminate
-     * duplicates that will occur between the primary and secondary stores.
-     */
-    @SuppressWarnings("deprecation")
-    public void getUrls(Date createdAfter, Date createdBefore, ContentUrlHandler handler) throws ContentIOException
-    {
-        // add in URLs from primary store
-        primaryStore.getUrls(createdAfter, createdBefore, handler);
-        
-        // add in URLs from secondary stores (they are visible for reads)
-        for (ContentStore secondaryStore : secondaryStores)
-        {
-            secondaryStore.getUrls(createdAfter, createdBefore, handler);
-        }
-        // done
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("Iterated over content URLs: \n" +
-                    "   created after: " + createdAfter + "\n" +
-                    "   created before: " + createdBefore);
-        }
-    }
 }
--- a/source/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStore.java
+++ b/source/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStore.java
@@ -25,29 +25,27 @@
 */
 package org.alfresco.repo.tenant;

-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
-
-import org.alfresco.repo.content.AbstractRoutingContentStore;
-import org.alfresco.repo.content.ContentContext;
-import org.alfresco.repo.content.ContentStore;
-import org.alfresco.repo.domain.tenant.TenantAdminDAO;
-import org.alfresco.repo.domain.tenant.TenantEntity;
-import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-import org.alfresco.service.transaction.TransactionService;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+
+import org.alfresco.repo.content.AbstractRoutingContentStore;
+import org.alfresco.repo.content.ContentContext;
+import org.alfresco.repo.content.ContentStore;
+import org.alfresco.repo.domain.tenant.TenantAdminDAO;
+import org.alfresco.repo.domain.tenant.TenantEntity;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.transaction.TransactionService;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;

 /**
 * Content Store that supports tenant routing, if multi-tenancy is enabled.
@@ -56,8 +54,6 @@ import org.springframework.context.ApplicationContextAware;
 */
 public abstract class AbstractTenantRoutingContentStore extends AbstractRoutingContentStore implements ApplicationContextAware, TenantRoutingContentStore
 {
-    private static Log logger = LogFactory.getLog(AbstractTenantRoutingContentStore.class);
-    
    private String defaultRootDirectory;
    private TenantAdminDAO tenantAdminDAO;
    protected TenantService tenantService;