Commit Graph

180 Commits

Author SHA1 Message Date
Alan Davis
23182c909d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64785: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64131: Merged DEV to V4.2-BUG-FIX (4.2.2)
         63233: MNT-10767: Guard in AuditMethodInterceptor is too restrictive preventing subordinate service calls from producing data.
          - Modify AuditMethodInterceptor to audit subordinate public services 
         64123: MNT-10767: Guard in AuditMethodInterceptor is too restrictive preventing subordinate service calls from producing data.
          - Add unit test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66188 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 19:53:27 +00:00
Alan Davis
b1c279bdaf Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64703: Fix ACE-987: NPE in NodeEntity during post-commit write through to shared cache
    - Query selecting specific root nodes was not fully populating the stored entity
    - The failure itself mainly occurs when a check is made to prevent duplication of cache transfers
      (the cached value is the same); once the cache has an entry, the error would not have
      occurred again.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66181 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 19:45:56 +00:00
Alan Davis
263b73e5c1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64423: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      62493: ACE-563: Fixed the build test failure as a result of adding the new SITE_ADMINISTRATORS group.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64569 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 01:37:06 +00:00
Alan Davis
8f8553ef23 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64403: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      61444: ACE-563: Added SITE_ADMINISTRATORS group as well as a patch.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 01:14:57 +00:00
Alan Davis
983b3640da Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64105: Reverse Merge HEAD-BUG-FIX (4.3.0.BF)
      << Reverted to see if commit was reason for build failures >>
      63912: Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
         63885: MNT-10338 : WebDav MT RepositoryAuthenticationDao.getUserFolderLocation() seems to be no tenant-safe
         Implemented a JUnit test.
         Fixed RepositoryAuthenticationDAO.getUserFolderLocation() to use cache keys with tenant domain and use the domain to find correct user store.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:46:41 +00:00
Alan Davis
0124e5cdf8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63912: Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
      63885: MNT-10338 : WebDav MT RepositoryAuthenticationDao.getUserFolderLocation() seems to be no tenant-safe
      Implemented a JUnit test.
      Fixed RepositoryAuthenticationDAO.getUserFolderLocation() to use cache keys with tenant domain and use the domain to find correct user store.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64334 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:07:47 +00:00
Alan Davis
b00157153f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63647: Fixed ACE-290: ServiceRegistry.getRetryingTransactionHelper has been deprecated, with no public alternative
    - Removed final bits of deprecation required for ACE-290
    - Added test to ensure that ALF-18718 does not regress (need new instances of RetryingTransactionHelper)
    - Cleaned up pointless 'Non-Javadoc', added @Override, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:29:01 +00:00
Alan Davis
59eb2ac3de Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63645: Fixed MockedTestServiceRegistry formatting, warnings and added @Override (investigation of ACE-290 and ALF-18718)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64302 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:28:02 +00:00
Alan Davis
467ffadf06 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63067: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62765: MNT-10611: Merged DEV to V4.2-BUG-FIX (4.2.2)
         62735: MNT-10611: Exception generated in .AccessAuditor. when audited String values bigger than 1024 characters (non-MySQL)
            - Trim String and MLtext audit values to not exceed system.maximumStringLength. Add unit test for case.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:33:55 +00:00
Derek Hulley
7e2d1a95c6 Reverted 63895 (MNT-10338), which went onto the wrong branch
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@63908 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-11 12:38:58 +00:00
Alex Mukha
69f2922c30 Merged DEV to HEAD (4.3.0)
63885: MNT-10338 : WebDav MT RepositoryAuthenticationDao.getUserFolderLocation() seems to be no tenant-safe
   Implemented a JUnit test.
   Fixed RepositoryAuthenticationDAO.getUserFolderLocation() to use cache keys with tenant domain and use the domain to find correct user store.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@63895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-11 11:37:48 +00:00
Alan Davis
9dca412a8c Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62931: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62696: ACE-480  Split Data-Model into Lucene Independent and Legacy Lucene Project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:59:18 +00:00
Alan Davis
1a7fd86ee2 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62920: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      << This was a bad merge with conflicts to do with the impl/solr directory not existing >>
      62511: ACE-482: Hybrid search can be disabled/enabled and is disabled by default.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62975 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:37:41 +00:00
Alan Davis
30b1d43c90 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62901: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61252: ACE-479  Provide Search Adapter
       - Reintegrated BRANCHES/DEV/PLATFORM1 from BRANCHES/DEV/PLATFORM1-AHIND


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:21:16 +00:00
Alan Davis
5dac63d5b5 Merged HEAD-BUG-FIX (Cloud/4.3) to HEAD (Cloud/4.3)
62592: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62550: MNT-10059 Re-enable PublishWebContentJbpmTest and PublishingRestApiTest tests, which had been lost


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-19 12:07:27 +00:00
Alan Davis
2a9600f26c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61350: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61114: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         61011: Merged DEV to V4.1-BUG-FIX (4.1.8)
            60967: MNT-10610: FilenameFilteringInterceptor.java readability
            MNT-10561 : If a folder is renamed with 8 characters that are within A-F and 0-9, the sys:temporary aspect is applied to it
            Implemented a JUnit test to simulate the issue.
            Added a check for a node to be without content in FilenameFilteringInterceptor.isNameOfTmporaryObject(String, NodeRef).
            Fixed code and JavaDoc formatting.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:10:29 +00:00
Alan Davis
4faaf92018 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61345: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61071: Merged DEV to V4.2-BUG-FIX (4.2.2)
         60764: MNT-10533: Calls during the beforeDeleteNode phase of a group deletion may confuse the AuthorityDaoImpl cache
          - First delete authority and refresh cache only after that 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:08:11 +00:00
Alan Davis
45a331e5c9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61242: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61241: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         61240: MetadataExtracterLimitsTest has too short a timeout (50ms to 500ms)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:04:12 +00:00
Alan Davis
3f9c22dd32 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61122: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60991: Merged DEV to V4.2-BUG-FIX
      60325 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Added some unit tests. 
      60443 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Added tests, debug log. Run work as system user in VersionableAspect. 
      60452 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Wrap debug statements. 
      60492 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Fix if statement indents. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:54:12 +00:00
Alan Davis
1c4d662866 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61049: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60931: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60806: Merged BELARUS/V4.1-BUG_FIX-2013_11_27 (4.1.8) to V4.1-BUG-FIX (4.1.8)
            58341: MNT-8109: Moving a file over WebDAV changes the modification date although the file was not modified
               'system.preserve.modificationData' property has been added. The property controls if the logic of auditable aspect should be executed or not.
               - 'FileFolderServiceImplTest' has been fixed in accordance with changes in 'FileFolderServiceImpl';
               - 'FileFolderServicePropagationTest' has been added
            58456: MNT-8109: Moving a file over WebDAV changes the modification date although the file was not modified
               'system.preserve.modificationData' property has been added. The property controls if the logic of auditable aspect should be executed or not. Default value has been modified to 'false'. Tests were modified appropriately to respect the default value:
               - 'FileFolderServiceImplTest' has been reverted to the original state;
               - 'FileFolderServicePropagationTest' has been improved to avoid further modifications if the default value is changed;
               - 'FileFolderServicePropagationTest' has been added to 'ModelTestSuite';
               - Getter for the 'system.preserve.modificationData' property has been added to the 'FileFolderServiceImpl'


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62381 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:49:25 +00:00
Alan Davis
c66a25e95d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61048: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60930: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60804: MNT-9595: Merged DEV to V4.1-BUG-FIX (4.1.8)
            57553: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               - Tag queries are unlimited. Make paginator in ConsoleTagManagement to fetch data by portions for tags actually displayed.
            57586: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               -  Do filter by tag name on SOLR side.
            60643: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               -  Prepend wildcard to the filter to match the old contains behaviour. Add unit tests for the tag and category filtering.
            60765: MNT-9595: Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery
               -  Add test for wildcard matches support.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:48:36 +00:00
Alan Davis
d62668db53 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60938: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60837: MNT-10333: WebDAV - Cannot save existing Alfresco Microsoft Office 2011 documents into Alfresco on Mountain Lion
       - Update unit test that is failing after fix was merged to 4.2-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:44:40 +00:00
Alan Davis
a67d74a6da Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60616: Correct compile error after bad merge.
      - Part of 58257: Added missing transaction(s) in SOLRDAOTest. (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62347 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:26:20 +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
f68b048cbf Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60604: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60461: MNT-9369 : Addition of the cm:versionable aspect through the Share UI sets the cm:autoVersionOnUpdateProp=true regardless of the aspect property being set to 'false' in the contentModel.xml
      Fixed the security context error.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62337 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:15:28 +00:00
Alan Davis
05e0f93494 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60598: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60375: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60154: Merged DEV to V4.1-BUG-FIX (4.1.8)
            60062: MNT-9369 : Addition of the cm:versionable aspect through the Share UI sets the cm:autoVersionOnUpdateProp=true regardless of the aspect
            property being set to 'false' in the contentModel.xml
            Added loading of default properties from Dictionary for versionable aspect.
            60063: MNT-9369 : Addition of the cm:versionable aspect through the Share UI sets the cm:autoVersionOnUpdateProp=true regardless of the aspect
            property being set to 'false' in the contentModel.xml
            Added a test to simulate the issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62328 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:10:32 +00:00
Alan Davis
73fe0fb759 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60596: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60363: Merged DEV to V4.2-BUG-FIX (4.2.2)
         58124: Added missing transaction(s) in SOLRTrackingComponentTest (MNT-9806)
         58128: Added missing transaction(s) in MultiTDemoTest (MNT-9806)
         58247: Added missing transaction(s) in TransferServiceToBeRefactoredTest.  Fixed dozens of warnings as well. (MNT-9806)
         58248: Added missing transaction(s) in WikiServiceImplTest.  Fixed code warnings. (MNT-9806)
         58249: Added missing transaction(s) in CalendarServiceImplTest. (MNT-9806)
         58251: Added missing transaction(s) in NodeServiceTest. (MNT-9806)
         58252: Added missing transaction(s) in LockDAOTest. (MNT-9806)
         58253: Added missing transaction(s) in NodeDAOTest. (MNT-9806)
         58257: Added missing transaction(s) in SOLRDAOTest. (MNT-9806)
         58259: Added missing transaction(s) in ReplicationRestApiTest (MNT-9806)
         58260: Added missing transaction(s) in RunningActionRestApiTest (MNT-9806)
         58304: Added missing transaction(s) in UnlockMethodTest (MNT-9806)
         58368: Added missing transaction(s) in UnlockMethodTest (MNT-9806)
         58892: Added missing transaction(s) in NodeServiceTest (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:09:43 +00:00
Alan Davis
72662536a7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60595: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60362: Merged DEV to V4.2-BUG-FIX (4.2.2)
         58112: Added missing transaction(s) in CheckOutCheckInServiceImplTest (MNT-9806)
         58113: Added missing transaction(s) in LockableAspectInterceptorTest (MNT-9806)
         58114: Added missing transaction(s) in LockableAspectInterceptorTest (MNT-9806)
         58115: Added missing transaction(s) in TransactionCleanupTest (MNT-9806)
         58116: Added missing transaction(s) in GetChildrenCannedQueryTest (MNT-9806)
         58118: Added missing transaction(s) in RatingServiceIntegrationTest (MNT-9806)
         58119: Added missing transaction(s) in ReplicationServiceIntegrationTest (MNT-9806)
         58121: Added missing transaction(s) in PersonTest (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:08:49 +00:00
Alan Davis
db883205f8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60593: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60361: Merged DEV to V4.2-BUG-FIX (4.2.2)
         58110: Added missing transaction in ActivityServiceImplTest (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:08:00 +00:00
Alan Davis
74f7a1d3a6 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60592: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60359: Merged DEV to V4.2-BUG-FIX (4.2.2)
         58109: Added missing transaction in AbstractMailActionExecuterTest (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:07:14 +00:00
Alan Davis
63b4fe4fae Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60591: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60358: Merged DEV to V4.2-BUG-FIX (4.2.2)
         58064: Fixed use of 'nodeService' vs 'NodeService' in DiscussionServiceImplTest (MNT-9806)
         58069: Fixed use of CheckOutCheckInService in StoreSelectorAspectContentStoreTest (MNT-9806)
                - Fixed formatting as well
         58071: Fixed transaction use around various services in SyncChangeMonitorTest (MNT-9806)
         58102: Remove unused code and other warnings from SyncChangeMonitorTest
         58103: Fixed transaction use around various services in SyncTrackerComponentTest (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62321 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:06:28 +00:00
Alan Davis
1cc54d1d24 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60178: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60175: Merged V4.2.1 (4.2.1) to V4.2-BUG-FIX (4.2.2)
         60174: Merged DEV (V4.2.1-2014_01_09) to V4.2.1 (4.2.1)
            60167: ACE-183 Intermittent test failure: LockStoreImplTxTest testReadsWhenNoTransaction
               - Stop running LockStoreImplTxTest - testReadsWhenNoTransaction (Matt says there is little value)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62297 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 12:48:57 +00:00
Alan Davis
96921b50ea Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60138: Merged DEV to HEAD-BUG-FIX (4.3.0BF)
      60064 : MNT-10388 : Cant create folder in czech translation
         - Added test around creating nodes with names in different languages


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62273 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 10:30:46 +00:00
Alan Davis
3aadf6bf6c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59989: Handling of no message for tests, ALF-20739


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62238 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:46:26 +00:00
Alan Davis
1e8074b637 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59942: Better handling of no message for tests, ALF-20739


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:44:43 +00:00
Alan Davis
1785ab9818 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59936: Added extra assertions (test pre-conditions) to help debug sporadic failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62234 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:43:00 +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
96c87c2d9c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59897: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59791: Merged DEV to V4.2-BUG-FIX (4.2.2)
         59719: MNT-10178 : BM-0012: Run v420b1527_01: Cannot find Content Reader for document RenditionServiceException
         Added a check to skip the nodes without content before trying to render.
         Fixed test.
         59739: MNT-10178 : BM-0012: Run v420b1527_01: Cannot find Content Reader for document RenditionServiceException
         Corrected mistakes in the fix r59719.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:29:21 +00:00
Alan Davis
bdff1bca64 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59891: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59686: Merged PATCHES/V4.2.1 (4.2.1) to V4.2-BUG-FIX (4.2.2)
         59685 : Merged DEV to PATCHES/V4.2.1 (4.2.1)
            59669 : MNT-10257 : Error during synchronization: java.lang.Integer cannot be cast to java.lang.Long
               - New fix for this issue was implemented.
               - Unit test was added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62210 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:24:13 +00:00
Alan Davis
cf9cbbed5f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59889: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59662: Merged V4.2.1 (4.2.1) to V4.2-BUG-FIX (4.2.2)
         59613: Merged DEV to V4.2.1
            59345: MNT-10267: Authority Search does not work for groups with Unicode display name
             - Modify GetAuthoritiesCannedQuery to respect unicode. 
            59514: MNT-10267: Authority Search does not work for groups with Unicode display name
             - Add unit test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62208 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:22:30 +00:00
Alan Davis
4119889331 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59855: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59601: Merged DEV to V4.2-BUG-FIX
         58003: Prevent QNameDAO from being used without a txn (MNT-9806)
         58022: Fix bootstrap sequencing issues related to Content Publishing and Site models
                - I thought I had broken something but it's one of those random bean loading issues that we don't commonly see
                - Pulled models into core model lists so that we know and understand the ordering of the model loading
                - Removed QNameDAO transaction check, just in case (will reapply it with subsequent commit)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62193 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:07:52 +00:00
Alan Davis
79ccf18f85 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59851: Merged BRANCHES/DEV/mward/head_bf_gdata_upgd to BRANCHES/DEV/HEAD-BUG-FIX (local cache improvements):
      59586: DefaultSimpleCache max size is Integer.MAX_VALUE when configured with maxItems of 0.
      59590: maxItems for DefaultSimpleCache is now an optional feature.
      59592: non-clustered caches will not use size-based eviction when {cacheName}.eviction-policy=NONE, to match clustered caches.
      59594: Added TTL to DefaultSimpleCache - not yet configurable through the factory.
      59602: DefaultCacheFactory can create caches with a time-to-live setting enabled.
      59620: Organise imports for DefaultSimpleCache
      59622: DefaultSimpleCache: changed field name from map to cache, as this makes more sense with changing to use of CacheBuilder.
      59627: Added maxIdleSecs property to DefaultSimpleCache - not yet configurable from the cache factory.
      59629: DefaultCacheFactory now supports maxIdleSeconds property for configuring non-clustered caches.
      59633: Updated description of supported non-clustered cache properties in caches.properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:06:59 +00:00
Alan Davis
bdba166058 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59850: Merged BRANCHES/DEV/mward/head_bf_gdata_upgd to BRANCHES/DEV/HEAD-BUG-FIX (upgrade gdata libs):
      59515: Removed gdata-1.45.0 libraries.
      59516: Removed concurrentlinkedhashmap-lru-1.2 library.
      59518: Added gdata-1.47.1 library JARs (dependencies to follow)
      59521: Added gdata-1.47.1 dependencies (guava-11.0.2 and JSR-305)
      59524: Updated ant build files to use gdata-1.47.1
      59528: Removed outdated gdata-1.45.0 src zip.
      59530: Added gdata-1.47.1 src zip
      59531: Update eclipse .classpath with gdata 1.47.1 libraries
      59532: Exported new gdata-1.47.1 and guava-11 libs from 3rd party project
      59559: Fix DefaultSimpleCache to use a Guava Cache, replacing ConcurrentLinkedHashMap usage.
      59568: Reverted r59516: concurrentlinkedhashmap lib is required by Surf.
      59572: Replaced use of google-collections with guava in repository's pom.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62191 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:06:09 +00:00
Alan Davis
b6ef5c416b Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59816: Added AbstractTenantRoutingContentStoreTest to the own JVM Category


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62188 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:03:09 +00:00
Alan Davis
63d70eecee Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59746: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59561: Merged DEV to V4.2-BUG-FIX (4.2.1)
         59104: MNT-10197 : Intermittent test failure: RenditionServicePermissionsTest.userWithoutDeleteAccessTo(etc)
         Implemented a retry mechanism to solve the intermittent test failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62185 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:00:32 +00:00
Alan Davis
d70e9ad7ad Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59474: BDE-195: bring back BulkImportTest into its own JVM + filter out CommentsApiTest, not run in Ant (for now?)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62139 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:35:27 +00:00
Alan Davis
7b2773da9c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59278: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59275: MNT-10109 (and MNT-10237): Permissions are not restored when a deleted site is recovered from the trashcan
      Fix InvitationCleanupTest failure by purging archived test site from trashcan so that sitename can be reused


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:26:31 +00:00
Alan Davis
0144810a6d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59269: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59268: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59264: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8) AGAIN!
            58707: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58676: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Delete associated groups on callback when archived site is purged. Add unit test for case.
            58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
               58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Return beforePurgeNode callback binding to Site class.
            58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
            58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:24:08 +00:00
Alan Davis
dd04a7ebfa Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59267: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (4.3/Cloud)
      59266: Reverse Merge attempt at merging from V4.1-BUG-FIX (will do it again)
         AND record only merge the original commits 59231,59239 and reverse merge 59262 that took place on V4.1-BUG-FIX   
         59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
               58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
                  58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
                  58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Return beforePurgeNode callback binding to Site class.
               58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
                  58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
               58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
                  58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.
         59240: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            59239: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
               - The merge of the HF commit on 4.1.6 removed a variable that was not being used, but
                 was being used in later versions.
         59241: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
            - Correct error in merge from V4.1-BUG-FIX to V4.2-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:23:12 +00:00
Alan Davis
526725db7d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59259: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59241: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
         - Correct error in merge from V4.1-BUG-FIX to V4.2-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:22:17 +00:00