Commit Graph

797 Commits

Author SHA1 Message Date
Raluca Munteanu
f36baf58d1 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127377 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127306 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         127272 arebegea: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
            127195 cpopa: MNT-14453 : Deleting tag using TaggingService.deleteTag() causes issue where no more tags can be added to node
               - Amended TaggingService.deleteTag() so as to remove references to a tag before being deleted. 
               - Added 'nodeService.exists(beforeNodeRef)' checks in TaggingService.updateTags in order to protect against InvalidNodeRefException which may be thrown on nodes that still have references to tags deleted using the  current(incorrect) implementation of TaggingService.deleteTag() 
               - Created DOCS-2060 in order document the manual procedure of tag scope refresh.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127399 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-25 14:41:02 +00:00
Raluca Munteanu
d9b3f6e93e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127371 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      127311 aleahu: MNT-14332 : Alfresco stops working when Type Hierarchy creates a circular reference
         - fixed compilation error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127394 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-25 14:39:38 +00:00
Raluca Munteanu
0d69fc8eb1 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127370 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      127309 aleahu: MNT-14332 : Alfresco stops working when Type Hierarchy creates a circular reference
         - added validation to check if circular dependency was introduced when a new namespace is imported


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-25 14:39:22 +00:00
Raluca Munteanu
108127f169 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127369 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      127276 aleahu: MNT-15345 : Dynamic Deployment of Models can cause a stack overlow error that causes excessive logging
         - checking if a model's namespace is also imported, if so throwing a compilation error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127392 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-25 14:38:49 +00:00
Raluca Munteanu
b3dcbae981 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127307 cturlica: Merged 5.1.0 (5.1.0.6) to 5.1.N (5.1.2)
      127235 cturlica: MNT-16292: Unzipped files which have folders do not get the cm:titled aspect applied
         - updated ImporterActionExecuter to add titled aspect
         - added test case for change and refactored test class


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-24 14:36:04 +00:00
Cristian Turlica
e91cdb7b40 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127279 rneamtu: MNT-16043 : Site Manager is able to delete/move/copy locked files
      - Added test case for scenario


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127289 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-20 13:18:08 +00:00
Cristian Turlica
0d69a6a3d7 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127263 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127236 dungureanu: MNT-15149 : Rule set with "Rule applied to subfolder" also applies to a comment node.
         - added fm:post into ignored types list
         - externalised list into the spring config 
         - created test for ignored types


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127288 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-20 13:17:33 +00:00
Cristian Turlica
7992f174cf Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127262 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127234 cpopa: MNT-16063 : Activiti workflows without userTask does not work
         - Prevent tasks retrieval from finished executions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-20 13:17:01 +00:00
Cristian Turlica
3cb8d094ef Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127134 cturlica: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127102 rmunteanu: MNT-15614 : Site with name "IT" cannot be managed properly
         - Changed the way the role name is striped out.
         - Implemented tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127160 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-17 14:13:46 +00:00
Cristian Turlica
b861424c72 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127078 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127046 amorarasu: MNT-16277: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         126884 amorarasu: MNT-15710: No invalid synchronizations should appear in the cloud sync manager (step 2 - clean invalid synchronizations already created).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-16 14:47:10 +00:00
Ancuta Morarasu
0ba905fa78 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
126675 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      126654 amukha: MNT-16272: User usages prevent some CMIS sessions from starting under load
         - Removed JobLock from RepoUsageComponent.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-12 08:41:13 +00:00
Ancuta Morarasu
b406f49bda Update source headers - add new Copyrights for new Java files synced from Head (fix for part 2).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126999 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 14:38:18 +00:00
Ancuta Morarasu
dad03ca472 Update source headers - add new Copyrights for new Java files synced from Head (part 2).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126997 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 13:58:06 +00:00
Ancuta Morarasu
22d42b4761 Merged HEAD (5.2) to 5.2.N (5.2.1)
126580 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124739 gjames: ACE-5295: listArchivedNodes now works for non-admin users


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:12:03 +00:00
Ancuta Morarasu
03b2b9ea85 Merged HEAD (5.2) to 5.2.N (5.2.1)
126573 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124623 jkaabimofrad: SFS-405, RA-778: Added tests and as the result did some minor modifications. Also, removed the ability to set or remove a client via JMX (Read only).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:11:01 +00:00
Ancuta Morarasu
76971dbbf3 Merged HEAD (5.2) to 5.2.N (5.2.1)
126535 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      123185 jvonka: RA-706, ACE-5113: Revese merge 123162 & 123163 (needs more thought, re: impact on existing tests etc)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:03:25 +00:00
Ancuta Morarasu
9aeabb0398 Merged HEAD (5.2) to 5.2.N (5.2.1)
126530 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      123162 jvonka: ACE-5113: Platform - OwnableService - when setting owner check that username currently exists (at time of property update)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126874 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:01:28 +00:00
Ancuta Morarasu
0f395c1339 Merged HEAD (5.2) to 5.2.N (5.2.1)
126459 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122183 jvonka: FileFolderService / GetChildrenCQ - list children may ignore specific node type filter (and return all rather than none)
      - initially fixed on BRANCHES/DEV/FILE-FOLDER-API (see also RA-811)
      - will eventually be merged to HEAD for 5.N (although this specific commit could be cherry-picked sooner, if needed)
      ACE-5114, RA-811


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126803 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:24:17 +00:00
Alexandra Leahu
5ffc53461d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
126025 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125910 rmunteanu: MNT-15553 : Inconsistent search result with .eml files.
         - Fix transformation for eml files containing nested alternative parts.
         - Added test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126063 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-04 12:38:32 +00:00
Alexandra Leahu
fc20674988 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125892 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125842 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) (PARTIAL MERGE)
         125700 adavis: Merged V4.2.5 (4.2.5.7) to V4.2-BUG-FIX (4.2.7)
            125698: Merged DEV to V4.2.5 (4.2.5.7)
               125677 arebegea: MNT-15219 : Excel (.xlsx) containing xmls (shapes/drawings) with multi byte characters may cause OutOfMemory in Tika
                  - Should not have updated version.properties as the original commit needs to be merged forwards.,
            125696: Merged DEV to V4.2.5 (4.2.5.7)
               125677 arebegea: MNT-15219 : Excel (.xlsx) containing xmls (shapes/drawings) with multi byte characters may cause OutOfMemory in Tika
                  - Modified tika parser and tika core jars to allow some configuration parameters to be sent from Alfresco side using the metadata map parameter
                  - Excluded by default the parsing of drawings/shapes xmls because there was little valuable data that could be extracted from those xmls


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-29 11:36:11 +00:00
Alexandra Leahu
72b275c451 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125891 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125841 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         125680 sglover: Merged BRANCHES/DEV/SG/MNT15914 to V4.2-BUG-FIX (4.2.7)
               125540 sglover MNT-15914 "Add multi-threaded workers for FixedAclUpdater"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-29 11:32:48 +00:00
Raluca Munteanu
9b22c4303f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125621 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125577 abalmus: MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl)
         - Implemented new requirements and tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 14:18:45 +00:00
Raluca Munteanu
c14fbf0467 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125618 rmunteanu: MNT-16155 : Change source headers to new version
      - fixed more license headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:49:45 +00:00
Raluca Munteanu
6afb44e712 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
dc6b2852d0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:03:25 +00:00
Raluca Munteanu
8674e2bfc8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Raluca Munteanu
622390d88f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125473 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125055 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) (PARTIAL MERGE)
         124999 adragoi: Merged DEV to V4.2-BUG-FIX (4.2.7)
            124402 adragoi: MNT-15368 : Time Consumed for Updating Folder Permission
               - implemented an approach that uses a separate, asynchronous processes that sets fixed ACL's


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125767 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:15:31 +00:00
Ancuta Morarasu
6c102b315e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125339 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125269 amukha: MNT-15976: A few Oracle tests sometimes take hours to complete
         - disabled long running tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 12:20:02 +00:00
Ancuta Morarasu
b6cc69db9b Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125333 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125215 bhorje: ACE-5308 set valid parent association qname 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125440 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 12:15:32 +00:00
Ramona Neamtu
14d4cb8166 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125250 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125148 bhorje: ACE-5307 the title property remains unset for smart virtual folders  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-14 11:25:50 +00:00
Ramona Neamtu
fefddb593a Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125247 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125138 bhorje: ACE-5306 added cm:titled aspect to virtual smart folder entries  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-14 11:24:43 +00:00
Cristian Turlica
fa503e9c2d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124938 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124888 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
         124735: MNT-15211: Follow-on (note: only affects NDB) - tweaks for further repo tests, including:
         - FileFolderServiceImplTest.testMoveCopyLotsOfFiles
         - DbNodeServiceImplTest.testDuplicateCatch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125038 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-08 14:39:58 +00:00
Cristian Turlica
8ef6cf6e78 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124936 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124872 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124789 adavis: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            124719 rmunteanu: Merged DEV to V4.2.6 (4.2.6)
               124647: MNT-15847 : The RepoTransferReceiverImplTest.testNodeDeleteAndRestore fails intermittently on SQL Server and DB2
                  - reset mockedPolicyHandler before doCommitCB to ensure that only onEndInboundTransfer calls from doCommitCB are counted


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125037 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-08 14:39:46 +00:00
Cristian Turlica
fa37265633 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124935 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124871 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124788 adavis: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            124676 arebegea: MNT-15844 : CheckOutCheckInServiceImplTest.testCheckOutPermissions_ALF7680_ALF535 fails on SQL Server
               - fix the tests by doing the initialization of the test data in a new retrying transaction


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125036 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-08 14:39:34 +00:00
Cristian Turlica
95332d3c8b Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124703 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124682 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
         124674: MNT-15211: Follow-on (note: only affects NDB)
         - use string_value 400 to enable schema bootstrap (and be consistent with existing customer pilot DBs)
         - minor tweaks to unit test cases (note: only affects NDB)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-05 12:55:11 +00:00
Raluca Munteanu
c9032ad3e7 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124582 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124539 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
         124514: MNT-15211: NDB-specific workaround fix for trashcan restore (since NDB does not support partial rollback on constraint violation)
         - this fix is dialect-specific (hence does not impact existing supported DB types)
         - note: MySQL Cluster NDB - experimental/unsupported


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124656 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-31 14:43:48 +00:00
Raluca Munteanu
88dee4b596 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124492 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124466 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124434 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            124387 amorarasu: MNT-15888: The ImapServiceImplTest fails intermittently on MySQL and MariaDB
               - The re-authentication is done in a retrying transaction. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124520 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-28 08:02:11 +00:00
Raluca Munteanu
b2188fa39a Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124491 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124465 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124433 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            124363 adragoi: MNT-15846 : The RenditionServiceIntegrationTest.testRenderPdfDocumentLongRunningCheckout fails on DB2
               - wait thread to finish checkout 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124519 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-28 08:01:42 +00:00
Alexandra Leahu
60e2030fcb Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124374 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124321 adragoi: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124240 amorarasu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            124201 amorarasu: MNT-15419: Failing test TaggingServiceImplTest.testALF_17260() on various databases
               - increased the waiting time


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124414 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-23 14:40:51 +00:00
Andreea Dragoi
5d13806c7e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124313 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124244 abalmus: MNT-15497 : Keyword tags generated from metadata extraction are formed into a single string rather than split on delimiter
         - Fixed tag separation on delimiter
         - Enhanced existing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-22 14:32:10 +00:00
Andreea Dragoi
fc26cc8af1 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124303 rneamtu: MNT-15881 : CLONE - Share rule constraints missing due to ActionExecuterAbstractBase's regression
      Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124129 rneamtu: Merged DEV to 5.0.N (5.0.4)
            124118 rneamtu: MNT-15802: Share rule constraints missing due to ActionExecuterAbstractBase's regression
               - Set parameter constraint name for localized parameters
               - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 15:18:46 +00:00
Alan Davis
47464aa8c2 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124237 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124191 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124133 arebegea: MNT-14671 : Site with document locked for Edit Offline cannot be deleted
            - disabled the ASPECT_LOCKABLE when deleting a site
            - added tests for delete and restore site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124278 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 11:06:14 +00:00
Alan Davis
741769a993 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124236 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (PARTIAL MERGE)
      124190 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124132 arebegea: MNT-15573 : Site finder slow for a user who's member of many sites
            - added a new method to InvitationService to make use of the limit in the searchInvitation
            - sent and used the 200 limit from the site-finder.get.js in the script/ScriptInvitationService.java and passed the new parameter
            - for searchModeratedInvitations and searchNominatedInvitations methods of InvitationServiceImpl.java I added the use of the limit parameter
            - added some comments on ActivitiWorkflowEngine.java and TaskComponent.java to inform developers about the performance issues and possible improvement
            - added junit tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124277 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 11:05:59 +00:00
Ancuta Morarasu
d8a66822f4 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124143 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124120 gjames: MNT-15830: Moved DynamicallySizedThreadPoolExecutorTest to alfresco-core, and removed from unit tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124226 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:50:32 +00:00
Ancuta Morarasu
851b1bf662 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124142 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124119 gjames: MNT-15830: Moved DynamicallySizedThreadPoolExecutorTest to alfresco-core


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124225 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:50:23 +00:00
Ancuta Morarasu
fef6fa3dd0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124096 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123996 sglover: MNT-15655 "Possible to violate child cm:name uniqueness constraint via NodeService.addAspect"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:49:57 +00:00
Ancuta Morarasu
a2d76025ad Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124091 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123490 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123221 mward: ACE-5120: further fixes (ADMLuceneTest)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:49:14 +00:00
Ancuta Morarasu
6f2b0f90ef Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124089 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123488 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123145 mward: ACE-5120: fix ADMLuceneCategoryTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:48:57 +00:00
Ancuta Morarasu
92500f8d91 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124088 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123487 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123142 mward: ACE-5120: further test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:48:48 +00:00
Ancuta Morarasu
eb64e2d3f3 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124087 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123486 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123028 mward: ACE-5120: test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124213 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:48:38 +00:00