Commit Graph

6509 Commits

Author SHA1 Message Date
Alexandra Leahu
c79dab110c Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120757 adragoi: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      120693 abalmus: MNT-14681 : No VersionType is set when content is updated and autoversion is active
         - Provided fix and tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120821 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-13 14:15:38 +00:00
Alex Mukha
e33ac7c249 Merged AMUKHA/PLAT-HEAD-2016-01-11 (5.1) to HEAD (5.1)
120772 amukha: ACE-4909: [Win 10, Chrome] - Site Members: Searching users with two chars results in wrapped exception
      - Added a check if the tenant is disabled;
      - Added JUnit test for disabled tenant and for deleted tenant.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@120786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-12 15:52:52 +00:00
Derek Hulley
3a7941d473 Fixed code warnings
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-11 14:16:30 +00:00
Alexandra Leahu
05a0978f56 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120675 dungureanu: Merged DEV to 5.0.N (5.0.4)
      120674 dungureanu: MNT-14922: Workflow console's user command is case sensitive
         - Look up the correct user, throw error if not found. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120715 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-11 13:39:52 +00:00
Cristian Turlica
6785aa607d Merged HEAD (5.1) to 5.1.N (5.1.1)
120465 ahind: Fix for     ACE-4900  "java.lang.IllegalArgumentException: bound must be positive" in DynamicSolrStoreMappingWrapperFactory
   - improved logging and fallback options


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-08 12:50:49 +00:00
Cristian Turlica
78f1f3108c Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120517 nsmintanca: Merged NESS/5.0.N-2016-01-05 (5.0.4) to 5.0.N (5.0.4)
      120487: MNT-14958: User cannot create public/public moderated site after set site.public.group to group id does not begin with 'GROUP_'   
         MNT-14958: User cannot create public/public moderated site after set site.public.group to group id does not begin with 'GROUP_'
         -added check and exception threat for  double-prefixed authorities
         -added unit test
         -formatted code; removed tabs
          
         


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120593 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-08 12:26:45 +00:00
Andrew Hind
5af684f7cf Fix for ACE-4900 "java.lang.IllegalArgumentException: bound must be positive" in DynamicSolrStoreMappingWrapperFactory
- improved logging and fallback options

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@120465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-04 14:25:56 +00:00
Natalia Smintanca
909823a936 Merged HEAD (5.1) to 5.1.N (5.1.1)
120229 rdina: ACE-4836 Modifications on the FileInfoPropsComparator class so that it takes into account the IS_FOLDER attribute, which is not among the properties. Added FileInfoComparatotTest class.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-18 13:03:25 +00:00
Alan Davis
d67de89729 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120335 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      120325 cturlica: MNT-15399: Need to be able to turn off vulnerable classes bootstrap check
         - new alfresco global property added (default is true): unserializer.validator.enabled


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120340 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-18 06:50:00 +00:00
Ramona Neamtu
a2c245e353 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120179 amorarasu: Merged DEV to 5.0.N (5.0.4)
      120074 nabacioaiei: MNT-15252 : Any repository amp having set module.repo.version.min=5.0.2.1 cannot be applied to an Alfresco One 5.0.2.1 instance.
         - modified ModuleDetailsImpl to ignore version.label(if it exists) from module.repo.version.min and module.repo.version.max and log a warning.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120259 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-16 09:33:59 +00:00
Roxana Dina
b0801bfbb4 ACE-4836 Modifications on the FileInfoPropsComparator class so that it takes into account the IS_FOLDER attribute, which is not among the properties. Added FileInfoComparatotTest class.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@120229 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 15:27:24 +00:00
Andreea Dragoi
884bb19489 Merged HEAD (5.1) to 5.1.N (5.1.1)
120082 bhorje: ACE-4845 added definition retrieval transaction enforcement and denial of unauthenticated virtualization


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 14:28:20 +00:00
Andreea Dragoi
12b52aeed3 Merged HEAD (5.1) to 5.1.N (5.1.1)
119950 jphuynh: Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
      119722 mrogers: Merge Activiti update ACE-1636


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 14:24:30 +00:00
Andreea Dragoi
2c82c256cb Merged HEAD (5.1) to 5.1.N (5.1.1)
119945 jphuynh: Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
      119558 gcornwell: Merged code coverage improvements to 5.1-MC1 (5.1.0)
         r117774 gjames: RA-567: Increase /workflow/processes API code coverage
         r117773 gjames: RA-567: /workflow/processes coverage, removed unused ActivitiTypeConverter
         r116883 gjames: RA-531: reapplied change after merge, for MultiTServiceImpl test coverage
         r116629 gjames: RA-568 Increase /workflow/process-definitions API code coverage
         r116574 gjames: RA-569 Increase /workflow/tasks API code coverage
         r116286 gjames: RA-567: Increase /workflow/processes API code coverage
         r115853 gjames: RA-566: Increasing /people api coverage (description field)
         r115811 gjames: RA-566: Increasing /people api coverage
         r113007 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DynamicNamespacePrefixResolver RA-521
         r113006 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DictionaryComponent RA-514
         r112969 gjames: Adding additional test coverage for TemplateServiceImpl RA-530
         r112960 gjames: Alternative test approach for ModuleServiceImpl RA-520
         r112703 gjames: Adding additional test coverage for NodeLocatorService RA-522
         r112702 gjames: Adding additional test coverage for JobLockServiceImpl RA-516
         r112699 gjames: Adding additional test coverage for ModuleServiceImpl RA-520
         r112508 gjames: Adding additional test coverage for RenditionServiceImpl RA-526
         r112476 gjames: Adding additional test coverage for ContentServiceImpl RA-513
         r112475 gjames: Adding additional test coverage for MimetypeMap RA-519
         r112238 gjames: Adding additional test coverage for MimetypeMap RA-519
         r112237 gjames: Adding additional test coverage for TaggingService RA-529
         r112236 gjames: Adding additional test coverage for MultiTServiceImpl RA-531
         r112206 gjames: Adding additional test coverage for ContentServiceImpl RA-513
         r112167 gcornwell: RA-523: Increase NodeService code coverage (removed redundant code that was testing a version store we no longer use)
         r112102 gjames: Reverted changes to PermissionServiceImpl for RA-524
         r112048 gjames: Temporarily removed some PermissionServiceImpl code. I need to put it back.
         r111620 gjames: Adding additional test coverage for PermissionService RA-524
         r111619 gjames: Added some @Override to make Sonar happier
         r111456 gjames: Adding additional test coverage for AuthenticationService RA-509
         r111427 gjames: Adding additional test coverage for AttributeService RA-509
         r111317 gjames: Adding additional test coverage for WorkflowService RA-533


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 13:26:39 +00:00
Ramona Neamtu
db6475fae6 Merged HEAD (5.1) to 5.1.N (5.1.1)
119838 gjames: ACE-4855: Added @AlfrescoPublicApi to AbstractModuleComponent and ImporterModuleComponent


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120172 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 12:53:26 +00:00
Ramona Neamtu
72b9e58ee9 Merged HEAD (5.1) to 5.1.N (5.1.1)
119739 mcozma: ACE-4715 Severe degradation of performance when opening a semi virtual folder root 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 12:36:06 +00:00
Ramona Neamtu
04fd7e80f4 Merged HEAD (5.1) to 5.1.N (5.1.1)
119738 mcozma: ACE-4715 Severe degradation of performance when opening a semi virtual folder root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 12:35:55 +00:00
Ramona Neamtu
4962ffe47c Merged HEAD (5.1) to 5.1.N (5.1.1)
119733 bhorje: ACE-4752 dynamic type filter creation - fixed invalid or missing namespace bug


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 12:35:44 +00:00
Ramona Neamtu
c1cb1a43b2 Merged HEAD (5.1) to 5.1.N (5.1.1)
119732 sdinuta: ACE-4795: Adding as favorite a folder/file in virtual context doesn't work as expected


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120166 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 12:33:47 +00:00
Natalia Smintanca
0b95d698a8 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120046 abozianu: Merged DEV to 5.0.N (5.0.4)
      117528 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - added a new aspect for cmis checked out documents : ASPECT_CMIS_CHECKEDOUT
      118441 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - changed aspect name from ASPECT_CMIS_CHECKEDOUT to ASPECT_CMIS_CREATED_CHECKEDOUT
      118775 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - fixed commit error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120109 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:21:09 +00:00
Natalia Smintanca
03deaa808f Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120075 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      120039 amukha: Merged V4.2-BUG-FIX-MNT-14688 (4.2.6) to V4.2-BUG-FIX (4.2.6)
         120019 amukha: MNT-14688: version revert on first version failure if type has aspect
            - Restoring a version now restores the node's type.
            - Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:16:35 +00:00
Natalia Smintanca
4dbb27041f Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120071 rmunteanu: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
      119848 adragoi: Merged DEV to 5.0.3 (5.0.3)
         119808 adragoi: MNT-15338 : CMIS get object by path only shows the working copy file and not the original file
            - reverted commits related to "Ghost versions when Document is created with CheckinType CHECKOUT" stask :  
            100772 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
               100260: MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                  - Fix for tests failures
            100824 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
               100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                  100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                     99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                        - Don't include PWC in a version series
                     99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                        - Return PWC as a part of version series. Fixes to pass TCK
            100837 : Fix another merge issue as a result of a re factor that has taken place in 5.0
               Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                     100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                        99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Don't include PWC in a version series
                        99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Return PWC as a part of version series. Fixes to pass TCK
            101404 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
               101273: Merged DEV to V4.2-GUB-FIX (4.2.5)
                  100792 : MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                     - Added init-method for CMISConnector. Test is added
            101597 : Merged DEV to 5.0.N (5.0.2)
               101560 : MNT-13813 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                  - Fix to test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120106 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:15:04 +00:00
Natalia Smintanca
e2d50154b5 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120045 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119806 gjames: MNT-15211 Re-enabled the non-auditable test, and corrected the createnode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:10:27 +00:00
Natalia Smintanca
5e1515a7e8 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120042 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119705 gjames: MNT-15211 Restoring data from Trashcan with MySQL Cluster NDB backend doesn’t work


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120102 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:09:13 +00:00
Natalia Smintanca
1f479a1c88 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120041 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119608 gjames: MNT-15211 Restoring data from Trashcan with MySQL Cluster NDB backend doesn’t work


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120101 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:08:27 +00:00
Bogdan Horje
56ffc625c9 ACE-4845 added definition retrieval transaction enforcement and denial of unauthenticated virtualization
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@120082 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-11 15:00:20 +00:00
Raluca Munteanu
fcc7d9bb1e Merged HEAD (5.1) to 5.1.N (5.1.1)
119729 bhorje: ACE-4804 forced read permission on allowed for read-only (due to missing filing path) virtual nodes  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120078 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-11 09:44:48 +00:00
Raluca Munteanu
c62d655585 Merged HEAD (5.1) to 5.1.N (5.1.1)
119697 bhorje: ACE-4744 javadoc and cleanup


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120076 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-11 09:41:45 +00:00
Jean-Pierre Huynh
e7411917d5 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119722 mrogers: Merge Activiti update ACE-1636


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:38:08 +00:00
Jean-Pierre Huynh
e3c4cb6561 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119558 gcornwell: Merged code coverage improvements to 5.1-MC1 (5.1.0)
      r117774 gjames: RA-567: Increase /workflow/processes API code coverage
      r117773 gjames: RA-567: /workflow/processes coverage, removed unused ActivitiTypeConverter
      r116883 gjames: RA-531: reapplied change after merge, for MultiTServiceImpl test coverage
      r116629 gjames: RA-568 Increase /workflow/process-definitions API code coverage
      r116574 gjames: RA-569 Increase /workflow/tasks API code coverage
      r116286 gjames: RA-567: Increase /workflow/processes API code coverage
      r115853 gjames: RA-566: Increasing /people api coverage (description field)
      r115811 gjames: RA-566: Increasing /people api coverage
      r113007 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DynamicNamespacePrefixResolver RA-521
      r113006 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DictionaryComponent RA-514
      r112969 gjames: Adding additional test coverage for TemplateServiceImpl RA-530
      r112960 gjames: Alternative test approach for ModuleServiceImpl RA-520
      r112703 gjames: Adding additional test coverage for NodeLocatorService RA-522
      r112702 gjames: Adding additional test coverage for JobLockServiceImpl RA-516
      r112699 gjames: Adding additional test coverage for ModuleServiceImpl RA-520
      r112508 gjames: Adding additional test coverage for RenditionServiceImpl RA-526
      r112476 gjames: Adding additional test coverage for ContentServiceImpl RA-513
      r112475 gjames: Adding additional test coverage for MimetypeMap RA-519
      r112238 gjames: Adding additional test coverage for MimetypeMap RA-519
      r112237 gjames: Adding additional test coverage for TaggingService RA-529
      r112236 gjames: Adding additional test coverage for MultiTServiceImpl RA-531
      r112206 gjames: Adding additional test coverage for ContentServiceImpl RA-513
      r112167 gcornwell: RA-523: Increase NodeService code coverage (removed redundant code that was testing a version store we no longer use)
      r112102 gjames: Reverted changes to PermissionServiceImpl for RA-524
      r112048 gjames: Temporarily removed some PermissionServiceImpl code. I need to put it back.
      r111620 gjames: Adding additional test coverage for PermissionService RA-524
      r111619 gjames: Added some @Override to make Sonar happier
      r111456 gjames: Adding additional test coverage for AuthenticationService RA-509
      r111427 gjames: Adding additional test coverage for AttributeService RA-509
      r111317 gjames: Adding additional test coverage for WorkflowService RA-533


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:35:05 +00:00
Jean-Pierre Huynh
73561a5fa3 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119086 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118716 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
         118657 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.0.N (5.0.4)
            118656 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
               118655 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
                  118542 amorarasu: Merged DEV to 5.0.2-PLUS (5.0.2-PLUS)
                     117462 118473 amorarasu: MNT-15147: Cloud 40 Upgrade takes too long
                        - Make the patch.fixPersonSizeCurrentType to not apply to tenants
                        - Added support for making patch.addUnmovableAspect deferred


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119927 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:22:56 +00:00
Jean-Pierre Huynh
6a404625ad Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119081 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118524 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
         118435 cturlica: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
            118397 cturlica: MNT-15229: Add check of vulnerable classes to bootstrap
               -  changes on bootstrap bean validator and bootstrap-context.xml 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119920 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:03:13 +00:00
Jean-Pierre Huynh
73630bc71f Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119079 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118314 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
         118271 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.0.N (5.0.4)
            118270 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
               118269 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
                  118268 adavis:       Reverse merged 5.0.2-PLUS (5.0.2-PLUS)
                        << Caused lots of failures with the real fix rather than the patched one in 39.6.6 >>
                           118213 adavis: Merged CLOUD39.6 (Cloud 39.6.6) to 5.0.2-PLUS (5.0.2-PLUS)
                              116649 cturlica: MNT-15229/MNT-15170: [Security] Java unserialize remote code execution
                                 - added bootstrap unserializer validator: a bootstrap bean that checks that the classes that would favor Java unserialize remote code execution are not available. Check is needed because libs could be introduced by the application server (attached jars should be uploaded).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:02:31 +00:00
Jean-Pierre Huynh
3f00433ac8 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119078 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118305 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
         118217 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
            118216 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to V4.2-BUG-FIX (4.2.6)
               118215 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
                  118214 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
                     118213 adavis: Merged CLOUD39.6 (Cloud 39.6.6) to 5.0.2-PLUS (5.0.2-PLUS)
                        116649 cturlica: MNT-15229/MNT-15170: [Security] Java unserialize remote code execution
                           - added bootstrap unserializer validator: a bootstrap bean that checks that the classes that would favor Java unserialize remote code execution are not available. Check is needed because libs could be introduced by the application server (attached jars should be uploaded).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:02:26 +00:00
Jean-Pierre Huynh
76dfb467ff Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119073 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117356 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117263 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114898 gjames: BCRYPT MNT-14892 RA-609, better logging messages and added OnStartup validation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119912 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:01:39 +00:00
Jean-Pierre Huynh
1d9ad4fcac Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119071 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117354 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117261 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114795 gjames: BCRYPT RA-609: Ensure system does not double hash encoders if not safe


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119910 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:01:25 +00:00
Jean-Pierre Huynh
9b124acb5b Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119070 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117353 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117260 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114674 gjames: BCRYPT MNT-14892 RA-604, Handling MD4 hashing as default


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119909 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:01:19 +00:00
Jean-Pierre Huynh
91e21c3bd6 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119068 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117351 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117258 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114531 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114416 gjames: Added debug on startup MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119907 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:01:09 +00:00
Jean-Pierre Huynh
5d17b7e9f3 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119066 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117349 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117256 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114527 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114255 gjames: createUser with a password that has already been hashed MNT-14892,RA-601


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119905 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:58 +00:00
Jean-Pierre Huynh
cb6e5c77c0 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119065 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117348 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117255 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114526 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114254 gjames: Making sure md4 doesn't use a salt MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119904 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:52 +00:00
Jean-Pierre Huynh
7e58e926d0 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119064 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117347 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117254 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114524 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114104 gjames: Added trace debugging MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119903 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:44 +00:00
Jean-Pierre Huynh
9b89c2c4c4 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119063 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117346 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117253 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114523 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114045 gcornwell: MNT-14892: Enabled the UpgradePasswordHashJob (it won't run until 2099 though due to the default cron experssion) and tweaked log statements.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119902 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:34 +00:00
Jean-Pierre Huynh
ae043651cb Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119059 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117341 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117249 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114518 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114018 gcornwell: MNT-14892: Fixed tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119898 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:09 +00:00
Jean-Pierre Huynh
47373d2dc0 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119058 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117340 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117248 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114517 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114012 gcornwell: MNT-14892: Updates to upgrade password hash job and test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:59 +00:00
Jean-Pierre Huynh
1670fcce1e Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119057 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117339 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117247 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114516 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114004 gjames: Added a hashUserPassword method, and working on UpgradePasswordHashTest MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:53 +00:00
Jean-Pierre Huynh
05375c63fc Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119056 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117338 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117246 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114515 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113961 gcornwell: MNT-14892: Added UpgradePasswordHashWorker job and skeleton test class


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:44 +00:00
Jean-Pierre Huynh
f7631e37b8 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119055 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117337 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117245 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114514 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113819 gcornwell: MNT-14892: Final test fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119893 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:15 +00:00
Jean-Pierre Huynh
5cd45df966 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119054 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117336 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117244 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114513 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113804 gcornwell: MNT-14892: More test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:09 +00:00
Jean-Pierre Huynh
eda3bd18fc Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119053 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117335 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117243 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114512 adavis: Merged BCRYPT to 5.0.2-CLOUD (PARTIAL MERGE)
               113778 gcornwell: MNT-14892: Fixed tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119891 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:04 +00:00
Jean-Pierre Huynh
133c8bf8ca Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119052 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117334 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117242 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114511 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113774 gjames: Better updateUser and test MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119890 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:58:59 +00:00