13 Commits

Author SHA1 Message Date
Mark Rogers
afe200fbd5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84811: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82464: ACE-1246 "Allow the customer to change the document encryption key"
      Encrypting content store


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85170 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 08:36:54 +00:00
Mark Rogers
f1310c6c8d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77148: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73957: ContentStore API cleanup
       - Removed previously-deprecated ContentStore.getWriter(ContentReader existingContentReader, String newContentUrl)
       - Removed previously-deprecated getSpaceUsed()
       - Removed previously-deprecated getTotalSize()
       - Deprecated optional and unused getUrls() and variants
       - Clean up of implementations to ignore relevant deprecations, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:57:20 +00:00
Will Abson
a6cd47c741 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73353: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73240: Merged DEV to V4.2-BUG-FIX (4.2.3)
         73207: MNT-11314 : Intermittent test failure: CachedContentCleanupJobTest.filesNewerThanMinFileAgeMillisAreNotDeleted
         Hardened the test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:59:16 +00:00
Alan Davis
38efc4c619 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60607: Fixed generics, unused code and and some minor formatting - found during investigations.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62340 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:17:51 +00:00
Alan Davis
00cd413c12 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59923: Fixes StandardQuotaStrategyTest, that was broken by changes in cache behaviour.
   Non-clustered (Google Guava) caches do not use maxItems as a hard-limit any more - eviction takes place as cache size approaches the limit.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:42:08 +00:00
Alan Davis
1300d9bd3a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59177: Fixes SlowContentStoreTest test breakage. Removes dependency on cachingstore/test-context.xml
   This fix essentially denormalizes the various Spring context XML files in the cachingstore directory. A previous fix had aliased the cachingContentStore to fileContentStore, but unfortunately this broke the SlowContentStoreTest tests, as the cachingContentStore created by those tests is not a real/working content store (the backingStore is a SlowContentStore dummy store), so the bootstrap process failed.
   By making each of the contexts standalone, the different tests are able to evolve as required without breaking the other tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:10:13 +00:00
Alan Davis
4d8e6900a7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59116: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59088: Fix broken test SlowContentStoreTest.readsAreFasterFromCache


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62096 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:00:48 +00:00
Alan Davis
2a96f57a17 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59115: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59087: Fix broken test StandardQuotaStrategyTest.cachingIsDisabledAtCorrectThreshold


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62095 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:00:01 +00:00
Alan Davis
068939e250 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58376: Added additional tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61971 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:20:56 +00:00
Matt Ward
31c1eb38f8 Fix for CachingContentStoreTest, broken by fix for MNT-9663
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@58850 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-11 10:57:37 +00:00
Matt Ward
b832c812e3 CLOUD-2214: Mime type is removed during uploading file via WebDav
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@58846 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-11 10:16:54 +00:00
Alan Davis
7931670de0 Merged V4.2-BUG-FIX (4.2.1) to HEAD (Cloud/4.3)
56668: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
      56667: MNT-9774: Merged V4.1.5 (4.1.5.7) to V4.1-BUG-FIX (4.1.7)
         56160: MNT-9663: Missing preview for large video files when Alfresco uses AWS S3 storage
         Make cache writer aware of backing store writer so that it could return actual size and contentData when cache file is deleted after content was put to backing store.
         56186: MNT-9663: Missing preview for large video files when Alfresco uses AWS S3 storage
         Add copyright message and class description to BackingStoreAwareCacheWriter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-15 09:10:57 +00:00
Samuel Langlois
ab4ca7177f 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
2013-08-20 17:17:31 +00:00