Commit Graph

1086 Commits

Author SHA1 Message Date
Alan Davis
89da401e2f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128209 ahind: Fix for     MNT-16387   No results are returned for a CMIS query which contains IS NULL for documents with a NULL property


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-21 11:06:16 +00:00
Alan Davis
ecadec2d73 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128192 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      128165 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         128151 rneamtu: MNT-15855 : Restoring a site or a folder with a locked for offline edit file does not work
            - restored associations between working copy and original node after a parent node is deleted
            - added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-21 11:06:09 +00:00
Andrew Hind
4b2d04a1fc Fix for MNT-16387 No results are returned for a CMIS query which contains IS NULL for documents with a NULL property
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@128209 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-20 20:50:42 +00:00
Ancuta Morarasu
6a17c7a688 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
128165 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      128151 rneamtu: MNT-15855 : Restoring a site or a folder with a locked for offline edit file does not work
         - restored associations between working copy and original node after a parent node is deleted
         - added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@128192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-17 17:23:42 +00:00
Alan Davis
8faec771c6 MNT-16381 Transformers must validate the content stream mimetype
- Fix DifferrentMimeTypeTest

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128179 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-16 19:47:27 +00:00
Alan Davis
bf346dba70 MNT-16381 Transformers must validate the content stream mimetype
- Tika has problems identifying eps - it guesses ps, so allow this through.
   - Fix lost line in DifferrentMimeTypeTest

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128176 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-16 15:23:07 +00:00
Alan Davis
60a8b718bc MNT-16381 Transformers must validate the content stream mimetype
- Addition of AbstractContentTransformer2.strictMimeTypeCheck(...) to check that the
     declared mimetype is the same as the Tika derived mimetype. Controlled by a new alfresco
     global property content.transformer.strict.mimetype.check (set to true by default).
   - Added the UnsupportedTransformationException to a number of transformation callers as
     they should have been handling it already.
   - Modified DifferrentMimeTypeTest to test the new strictMimeTypeCheck.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-15 16:11:15 +00:00
Ramona Neamtu
c4c30abae0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128140 cpopa: MNT-14026: LDAP sync fails to update attribute's value deletion
      - Update to null, the node properties for which the corresponding LDAP attribute is missing.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128144 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-13 14:39:16 +00:00
Constantin Popa
65baa06360 MNT-14026: LDAP sync fails to update attribute's value deletion
- Update to null, the node properties for which the corresponding LDAP attribute is missing.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@128140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-13 11:36:19 +00:00
Alan Davis
282bdf0449 Merged 5.2.N (5.2.1) to HEAD (5.2)
127399 rmunteanu: 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/HEAD/root@127888 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:25:48 +00:00
Alan Davis
e96b65773b Merged 5.2.N (5.2.1) to HEAD (5.2)
127394 rmunteanu: 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/HEAD/root@127886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:25:36 +00:00
Alan Davis
9379b1720a Merged 5.2.N (5.2.1) to HEAD (5.2)
127393 rmunteanu: 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/HEAD/root@127885 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:25:30 +00:00
Alan Davis
b7a3f669b2 Merged 5.2.N (5.2.1) to HEAD (5.2)
127392 rmunteanu: 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/HEAD/root@127884 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:25:23 +00:00
Alan Davis
702c88f8fb Merged 5.2.N (5.2.1) to HEAD (5.2)
127361 rmunteanu: 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/HEAD/root@127883 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:25:16 +00:00
Alan Davis
7593b222ee Merged 5.2.N (5.2.1) to HEAD (5.2)
127289 cturlica: 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/HEAD/root@127879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:22:18 +00:00
Alan Davis
2fbd64cda1 Merged 5.2.N (5.2.1) to HEAD (5.2)
127288 cturlica: 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/HEAD/root@127878 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:22:12 +00:00
Alan Davis
620e24ef29 Merged 5.2.N (5.2.1) to HEAD (5.2)
127287 cturlica: 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/HEAD/root@127877 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:22:05 +00:00
Alan Davis
db287e9c24 Merged 5.2.N (5.2.1) to HEAD (5.2)
127160 cturlica: 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/HEAD/root@127868 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:21:06 +00:00
Alan Davis
3bf3914916 Merged 5.2.N (5.2.1) to HEAD (5.2)
127124 cturlica: 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/HEAD/root@127867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:20:59 +00:00
Alan Davis
6131b34ad2 Merged 5.2.N (5.2.1) to HEAD (5.2)
127010 amorarasu: 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/HEAD/root@127861 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:19:01 +00:00
Alan Davis
9e72f69203 Merged 5.2.N (5.2.1) to HEAD (5.2)
126999 amorarasu: 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/HEAD/root@127855 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:17:18 +00:00
Alan Davis
a093515b79 Merged 5.2.N (5.2.1) to HEAD (5.2)
126997 amorarasu: 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/HEAD/root@127853 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:10:06 +00:00
Alan Davis
412d05e36a Merged 5.2.N (5.2.1) to HEAD (5.2)
126063 aleahu: 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/HEAD/root@127840 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:35:01 +00:00
Alan Davis
ce5a675361 Merged 5.2.N (5.2.1) to HEAD (5.2)
126004 aleahu: 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/HEAD/root@127835 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:34:29 +00:00
Alan Davis
640535fd09 Merged 5.2.N (5.2.1) to HEAD (5.2)
126003 aleahu: 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/HEAD/root@127834 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 08:34:20 +00:00
Alan Davis
b4576ce3ca Merged 5.2.N (5.2.1) to HEAD (5.2)
125792 rmunteanu: 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/HEAD/root@127813 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 11:00:24 +00:00
Alan Davis
bd2cf2c35d Merged 5.2.N (5.2.1) to HEAD (5.2)
125790 rmunteanu: 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/HEAD/root@127812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-04 11:00:15 +00:00
Alan Davis
84841e063f Merged 5.2.N (5.2.1) to HEAD (5.2)
125788 rmunteanu: 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/HEAD/root@127810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 17:08:06 +00:00
Alan Davis
12769c2923 Merged 5.2.N (5.2.1) to HEAD (5.2)
125783 rmunteanu: 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/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:45:04 +00:00
Alan Davis
91eb2644ad Merged 5.2.N (5.2.1) to HEAD (5.2)
125781 rmunteanu: 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/HEAD/root@127808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:40:56 +00:00
Alan Davis
c952c8d8b9 Merged 5.2.N (5.2.1) to HEAD (5.2)
125767 rmunteanu: 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/HEAD/root@127794 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:11:08 +00:00
Alan Davis
110e506417 Merged 5.2.N (5.2.1) to HEAD (5.2)
125448 amorarasu: 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/HEAD/root@127790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:10:38 +00:00
Alan Davis
6ca0d7f54f Merged 5.2.N (5.2.1) to HEAD (5.2)
125440 amorarasu: 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/HEAD/root@127784 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:09:37 +00:00
Alan Davis
7fb3e192ac Merged 5.2.N (5.2.1) to HEAD (5.2)
125326 rneamtu: 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/HEAD/root@127780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:09:05 +00:00
Alan Davis
9a1647fb60 Merged 5.2.N (5.2.1) to HEAD (5.2)
125324 rneamtu: 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/HEAD/root@127779 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:08:58 +00:00
Alan Davis
0cb9bc6dc9 Merged 5.2.N (5.2.1) to HEAD (5.2)
125038 cturlica: 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/HEAD/root@127773 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:08:08 +00:00
Alan Davis
702e72d6a0 Merged 5.2.N (5.2.1) to HEAD (5.2)
125037 cturlica: 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/HEAD/root@127772 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:08:01 +00:00
Alan Davis
2ae9cf58e2 Merged 5.2.N (5.2.1) to HEAD (5.2)
125036 cturlica: 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/HEAD/root@127771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:07:54 +00:00
Alan Davis
109204efbb Merged 5.2.N (5.2.1) to HEAD (5.2)
124856 cturlica: 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/HEAD/root@127766 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:05:21 +00:00
Alan Davis
3e5a51b778 Merged 5.2.N (5.2.1) to HEAD (5.2)
124656 rmunteanu: 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/HEAD/root@127764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:04:54 +00:00
Alan Davis
0c7488b7e7 Merged 5.2.N (5.2.1) to HEAD (5.2)
124520 rmunteanu: 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/HEAD/root@127761 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:04:15 +00:00
Alan Davis
9abc53e701 Merged 5.2.N (5.2.1) to HEAD (5.2)
124519 rmunteanu: 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/HEAD/root@127760 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:04:09 +00:00
Alan Davis
28fcd6efb9 Merged 5.2.N (5.2.1) to HEAD (5.2)
124414 aleahu: 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/HEAD/root@127754 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:03:35 +00:00
Alan Davis
c8aa156dda Merged 5.2.N (5.2.1) to HEAD (5.2)
124364 adragoi: 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/HEAD/root@127752 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:03:24 +00:00
Alan Davis
bffa610ff9 Merged 5.2.N (5.2.1) to HEAD (5.2)
124310 adragoi: 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/HEAD/root@127751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:03:18 +00:00
Alan Davis
d6119f7d57 Merged 5.2.N (5.2.1) to HEAD (5.2)
124278 adavis: 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/HEAD/root@127748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:00:41 +00:00
Alan Davis
ccfb98ccbd Merged 5.2.N (5.2.1) to HEAD (5.2)
124277 adavis: 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/HEAD/root@127747 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:00:35 +00:00
Alan Davis
cd61c4f1e0 Merged 5.2.N (5.2.1) to HEAD (5.2)
124222 amorarasu: 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/HEAD/root@127740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:55:11 +00:00
Alan Davis
53439f9771 Merged 5.2.N (5.2.1) to HEAD (5.2)
124217 amorarasu: 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/HEAD/root@127737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:52 +00:00
Alan Davis
638de653ab Merged 5.2.N (5.2.1) to HEAD (5.2)
124215 amorarasu: 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/HEAD/root@127735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:40 +00:00