Commit Graph

5792 Commits

Author SHA1 Message Date
Alan Davis
c067ed1215 Merged 5.1.N (5.1.1) to HEAD (5.1)
118308 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      118237 aleahu: MNT-14853 : Unable to download zip with non primary child
         - Fixed spacing by removing tabs as per Derek's request.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123592 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:29:58 +00:00
Alan Davis
967c55b264 Merged 5.1.N (5.1.1) to HEAD (5.1)
118307 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      118231 aleahu: MNT-14853 : Unable to download zip with non primary child
         - Added the flag exportSecondaryNodes for the ExporterComponent, and if this is set on true we export the secondary nodes as actual nodes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123591 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:29:50 +00:00
Alan Davis
c2e645b2ae Merged 5.1.N (5.1.1) to HEAD (5.1)
118306 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      118229 aleahu: MNT-14730 : Approve and Reject workflow not working in subfolders after the rule has been applied
         - Renamed the copied file when executing a simple workflow rule in order to avoid name conflicts by using copyAndRename instead of copy.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:29:42 +00:00
Alan Davis
99bc1f16ac Merged 5.1.N (5.1.1) to HEAD (5.1)
117930 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      117707 aleahu: MNT-14341 : FTP authentication fails when External authentication is enabled
         - Checked that the instance of the authenticator used is not the same as the one from which the call is made


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:27:10 +00:00
Alan Davis
a9e033f2c5 Merged 5.1.N (5.1.1) to HEAD (5.1)
117597 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      117582 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
         116652 amorarasu: MNT-14983: CMIS: Euro character not encoded correctly
            Merged V4.2.4 (4.2.4.19) to V4.2-BUG-FIX (4.2.6)
               115140 115998 116396 amorarasu: MNT-15044: CLONE - CMIS: Euro character not encoded correctly
                  - Removed the unicode interval that was used to escape characters from the categories: currency, general punctuation, subscripts and superscripts (2000-20FF).
                  - Changed the way the control characters are filtered + adapted tests.
                  - Removed unnecessary j_string use from the ftl and added proper xml encoding.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123586 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:27:03 +00:00
Alan Davis
65918ed209 Merged 5.1.N (5.1.1) to HEAD (5.1)
113586 tvalkevych: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      113508 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         113395 tvalkevych: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
            113371 amorarasu: Merged DEV to V4.1-BUG-FIX (4.1.11)
               113345: MNT-10305: DeletedNodeCleanupWorker should be improved.
                  - Fixed the starting time for the purge old nodes process.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:26:04 +00:00
Alan Davis
52fbb8090c Merged 5.1.N (5.1.1) to HEAD (5.1)
113398 tvalkevych: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      113291 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         113279 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
            113102 amorarasu: MNT-10305: DeletedNodeCleanupWorker should be improved.
               - Moved the retrying transaction helper declaration back in the while loop - fix test attempt.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123577 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:25:47 +00:00
Alan Davis
f959c5d77b Merged 5.1.N (5.1.1) to HEAD (5.1)
113397 tvalkevych: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      113290 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         113278 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
            112985 amorarasu: Merged DEV to V4.1-BUG-FIX (4.1.11)
               111742: MNT-10305: DeletedNodeCleanupWorker should be improved
                  - Delete in multiple statements, filtering by transactions with commit time in a time interval.
               112722: Improved the algorithm that sets appropriate time windows for delete, based on the evolution of the purge process.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:25:39 +00:00
Alan Davis
2fab2cb742 Merged 5.1.N (5.1.1) to HEAD (5.1)
113042 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      112968 mrogers: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         112583: MNT-14817 - Alfresco keeps file handlers on deleted temporary files created by CIFSContentComparator


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:25:11 +00:00
Alan Davis
c6f0ce491f Merged 5.1.N (5.1.1) to HEAD (5.1)
- Merges from 5.1.0 (when it was 5.1) that did not make it to HEAD:
     122506,122513,123118-123119
   - RECORD ONLY Merges from HEAD: 119613-119617,119622,119706-119708,
     119752-119753,120076-120078,120116,120166-120178,120182-120183,
     120185-120193,120197-120201,120378-120385,120387,120431,120526,
     120604-120625,120832-120842,120844-120849,120977-120982,121142-121144,
     121313,121347-121348,121410,121412-121417,121684-121687,121802-121805,
     121810-121815,121861,122287,122342,122361,122439-122441,122579,122921
   - RECORD ONLY merges: 119602,119821-119822,119849,120065,120107,
     120159,120260,120295,120339,120342,120371,120411-120412,120524,120527,
     120696-120697,120705,120720,120746,120761,120819,120822,120893,
     120935-120936,120993,121045,121119,121121,121132,121156-121157,
     121299,121301,121309,121394,121408,121442,121481,121624,121626,
     121672,121675,121692,121753,121795,121798,121852,121898,121981,
     122030,122088,122114,122142,122213,122215,122217,122277,122340,
     122343,122426,122487,122552,122554,122607,122654,122734,122861,
     122906,122982,122985,122988,122996,123014,123031,123090,
     123115-123117,123120    
   - Merge from 5.1.N of fix that should have gone into 5.1 (found because of conflict on merge)
     123128: ACE-5155 Garbled message in patch-service.properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-04 18:14:23 +00:00
Andreea Dragoi
0845c93af0 Reverse merged HEAD (5.1)
122540 adragoi: Merged DEV to HEAD (5.1)
            122252 ACE-5093 : Allow file content URLs to be generated by a provider
               - implemented TimeBasedFileContentUrlProvider,VolumeAwareFileContentUrlProvider  and test classes
            121979 ACE-5093 : Allow file content URLs to be generated by a provider
               - added deprecated annotation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@122918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-01 10:36:14 +00:00
Andreea Dragoi
04b6f386d7 122540 adragoi: Merged DEV to HEAD (5.1)
122252 ACE-5093 : Allow file content URLs to be generated by a provider
            - implemented TimeBasedFileContentUrlProvider,VolumeAwareFileContentUrlProvider  and test classes
         121979 ACE-5093 : Allow file content URLs to be generated by a provider
            - added deprecated annotation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@122540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-22 11:34:59 +00:00
Samuel Langlois
b931841074 Merged 5.1.0 (5.1.0) to HEAD (5.1)
122178 slanglois: Merged DEV/ACE-5111 to 5.1.0
      122171: ACE-5111 CMIS dictionary loading fails to resolve prefix for Smart Folders 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@122265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-16 12:13:36 +00:00
Silviu Dinuta
113598e08c CM-710: Merged from alfresco/BRANCHES/DEV/VF_REP_INT_51/root into/alfresco/HEAD/root
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-28 17:03:18 +00:00
Tatyana Valkevych
863f91e15c ACE-5040: Merged 5.1.N (5.1.1) to HEAD (5.1)
120106 nsmintanca: 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/HEAD/root@121388 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 12:16:13 +00:00
Alex Mukha
ae21671f1f Merged 5.1.N (5.1.1) to HEAD (5.1)
121275 amukha: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      121273 amukha: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4) (PARTIAL MERGE)
         121272 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
            121271 amukha: MNT-15543: CLONE - Remote access via JMX should be disabled by default
               - Added additional bean configuration to fully disable RMI by default.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-22 10:07:52 +00:00
Jamal Kaabi-Mofrad
e9c5927bb6 ACE-4994: Removed the local cache to avoid issues when updating the custom model in a clustered env.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@120966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-17 20:35:00 +00:00
Jamal Kaabi-Mofrad
ef6c759375 ACE-4924: Added a patch to ensure 'cm: extensions' and 'cm: module-deployments' folders within the surf-config folder exists, then adds the ALFRESCO_MODEL_ADMINISTRATORS Group to their Permission list.
- Also, added ALFRESCO_MODEL_ADMINISTRATORS to the permission list for surf-config folders (i.e. cm:extensions and cm: module-deployments) created on bootstrap of a new install.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@120912 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-15 06:27:33 +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
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
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
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
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
Jean-Pierre Huynh
fc74df4ab8 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119051 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117333 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117241 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114510 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113765 gcornwell: MNT-14892: Users password now gets re-hashed when they login if it is not using the preferred encoding (removes old MD4 and SHA encoded passwords)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119889 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:58:31 +00:00
Jean-Pierre Huynh
cdb95db67c Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119050 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117332 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117240 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114509 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113728 gjames: Changed updateUser to use a List MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119888 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:58:23 +00:00
Jean-Pierre Huynh
d97bed0aaa Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119045 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117327 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117235 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114504 adavis: Merged BCRYPT to 5.0.2-CLOUD (PARTIAL MERGE)
               113666 gjames: Initial integration of CompositePasswordEncoder for MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119883 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:57:42 +00:00
Jean-Pierre Huynh
01ffcc2511 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119044 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117325 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117234 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114503 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113532 gjames: Adding a CompositePasswordEncoder for MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:57:28 +00:00
Jean-Pierre Huynh
0f0037ae10 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119029 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      116130 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         115965 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
            115823 arebegea: MNT-14887 : Rework ChainingUserRegistrySynchronizer's methods that uses RetryingTransaction with 'requiresNew=true'.
               - removed the code that deleted the older property value that may have been present when updating a value.
               - fixed the tests from RepoUsageComponentTest.java
               - updated the authorised-users jar with the version that uses the attributeService again.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:50:23 +00:00
Gethin James
e9c42fa4f3 ACE-4855: Added @AlfrescoPublicApi to AbstractModuleComponent and ImporterModuleComponent
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119838 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-09 16:18:25 +00:00