Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions

View File

@@ -41,7 +41,7 @@ import org.apache.commons.logging.LogFactory;
* The one and only implementation of the ContentCache class. Binary content data itself
* is stored on disk in the location specified by {@link cacheRoot}.
* <p>
* The in-memory lookup table is provided by Ehcache.
* The in-memory lookup table is provided by a SimpleCache implementation.
*
* @author Matt Ward
*/
@@ -292,7 +292,7 @@ public class ContentCacheImpl implements ContentCache
/**
* Configure ContentCache with a memory store - an EhCacheAdapter.
* Configure ContentCache with a memory store.
*
* @param memoryStore the memoryStore to set
*/