inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,212 Commits 339 Branches 2,245 Tags
30aae9969e96b45eceb3b1a88e4998f6b8993561
Commit Graph

695 Commits

Author SHA1 Message Date
Natalia Smintanca
30aae9969e Merged HEAD (5.1) to 5.1.N (5.1.1) 
117633 jphuynh: Merged JPHUYNH/BDE-443 (5.1.0) to HEAD (5.1)
      117189 adavis: BDE-443 Check whether we can buy licenses for the GPL components we ship
         - Removed unit test RenditionServiceIntegrationTest.testRenderPdfDocumentToFlash
           The only one that failed in the build.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117994 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:33:48 +00:00
Natalia Smintanca
9b21aed622 Merged HEAD (5.1) to 5.1.N (5.1.1) 
117625 sglover: ACE-4347 "5.1 Build has had three transient failures related to locking"
   Increase timeouts in JobLockServiceTest tests to account for slower database updates


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117991 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:29:47 +00:00
Natalia Smintanca
ecfdf3b35f Merged HEAD (5.1) to 5.1.N (5.1.1) 
117599 bhorje: CM-690 annotated test aspect for IDE compliance 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:26:22 +00:00
Alan Davis
9e202dcd66 Merged HEAD (5.1) to 5.1.N (5.1.1) 
117531 bhorje: CM-690 virtualization is disabled by default - virtualization integration tests and the integration tests suite  run with vf enabled 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117577 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-14 13:38:20 +00:00
Alan Davis
1ec4f05efc Merged HEAD (5.1) to 5.1.N (5.1.1) 
117489 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-14 13:37:20 +00:00
Alan Davis
80e02b2c8f Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117494 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      117395 gjames: MNT-14892: BCRYPT Added an additional test to CompositePasswordEncoderTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117496 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-12 23:20:46 +00:00
Gethin James
c2eb0c8277 MNT-14892 RA-604 BCRYPT test fix. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-12 16:48:21 +00:00
Tatyana Valkevych
3ca1dfd1ea Merged HEAD (5.1) to 5.1.N (5.1.1) 
117315 tpage: ACE-2671 Unit tests for QNameTypeEditor.
   The QNameTypeEditor was migrated from RM to repo in r83388, but
   at the time there were no unit tests. This closes the issue by
   adding unit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-12 10:21:30 +00:00
Gethin James
15f7d63375 Fixing a compilation error after the merge for AuthenticationTest 
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/BRANCHES/DEV/5.1.N/root@117375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-12 09:00:56 +00:00
Alan Davis
12ec947712 Fix compile error after: 
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/BRANCHES/DEV/5.1.N/root@117371 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 23:11:28 +00:00
Alan Davis
3e5bf71699 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/BRANCHES/DEV/5.1.N/root@117356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:03:28 +00:00
Alan Davis
de46f81829 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117262 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114826 gjames: BCRYPT RA-609: Not double hash encoders if not safe so fixing the test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117355 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:03:21 +00:00
Alan Davis
2e4871ec6e 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/BRANCHES/DEV/5.1.N/root@117354 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:03:10 +00:00
Alan Davis
5e217990c7 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/BRANCHES/DEV/5.1.N/root@117353 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:03:01 +00:00
Alan Davis
e0f9b3e705 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117259 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114532 adavis: Merged BCRYPT to 5.0.2-CLOUD
         114417 gjames: Test to confirm onpremise defaults to md4 for backwards compatibility MNT-14892,RA-599


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117352 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:02:52 +00:00
Alan Davis
4f3ec1b547 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/BRANCHES/DEV/5.1.N/root@117349 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:02:29 +00:00
Alan Davis
141b506072 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/BRANCHES/DEV/5.1.N/root@117348 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:02:21 +00:00
Alan Davis
aced90a40a Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117251 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114521 adavis: Merged BCRYPT to 5.0.2-CLOUD
         114037 gjames: Added UpgradePasswordHashTest to SecurityTestSuite MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117343 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:00:53 +00:00
Alan Davis
88aa26aa17 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117250 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114520 adavis: Merged BCRYPT to 5.0.2-CLOUD
         114036 gjames: Improving UpgradePasswordHashTest MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117342 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:00:47 +00:00
Alan Davis
b175a6421c 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/BRANCHES/DEV/5.1.N/root@117341 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:00:40 +00:00
Alan Davis
d048e04218 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/BRANCHES/DEV/5.1.N/root@117340 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:52:16 +00:00
Alan Davis
1c1a381c2c 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/BRANCHES/DEV/5.1.N/root@117339 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:52:09 +00:00
Alan Davis
d2185fc267 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/BRANCHES/DEV/5.1.N/root@117338 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:52:02 +00:00
Alan Davis
d916cc40dd 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/BRANCHES/DEV/5.1.N/root@117334 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:50:20 +00:00
Alan Davis
dbc4c03da7 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/BRANCHES/DEV/5.1.N/root@117333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:50:09 +00:00
Alan Davis
e53f2ad430 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/BRANCHES/DEV/5.1.N/root@117332 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:49:46 +00:00
Alan Davis
571afcb46c Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117239 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114508 adavis: Merged BCRYPT to 5.0.2-CLOUD
         113726 gjames: Fixing AuthenticationTest, switch char[] to String for MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117331 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:49:36 +00:00
Alan Davis
4d1580c256 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117237 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114506 adavis: Merged BCRYPT to 5.0.2-CLOUD
         113723 gjames: Fixing up failing AuthenticationTest for MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:49:23 +00:00
Alan Davis
fa42023233 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/BRANCHES/DEV/5.1.N/root@117327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:49:01 +00:00
Alan Davis
a39107a09e 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/BRANCHES/DEV/5.1.N/root@117325 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:47:49 +00:00
Tatyana Valkevych
a634613842 Merged HEAD (5.1) to 5.1.N (5.1.1) 
117106 mward: ACE-4565: removed redundant test.
   Test checked that the job wouldn't run in the forseable future.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117212 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 12:19:35 +00:00
Tatyana Valkevych
ee559fcc8b Merged HEAD (5.1) to 5.1.N (5.1.1) 
116662 aowian: Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1)
      116654 aowian: ACE-4500: Updating links to the help from within Alfresco
         - Code formatting according to Alfresco standards. No functionality changes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117205 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 12:05:52 +00:00
Tatyana Valkevych
5073f04767 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116661 aowian: Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1)
      116550 aowian: ACE-4500: Updating links to the help from within Alfresco
         - Updated error message to include correct version of the docs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117204 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 12:05:36 +00:00
Tatyana Valkevych
a5f0efb1d4 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116653 sglover: ACE-4347 "5.1 Build has had three transient failures related to locking"
   Increase the logging for the failing tests to DEBUG so that we can see what's happening during the next failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117202 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 12:03:42 +00:00
Tatyana Valkevych
9fe591aca0 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116560 mrogers: ACE-4523 - Binary File mimetype is set to files edited via CIFS/FTP


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 11:57:19 +00:00
Tatyana Valkevych
d908acd417 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116418 mrogers: ACE-4523 - Binary File mimetype is set to files edited via CIFS/FTP


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117194 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 11:50:23 +00:00
Alex Mukha
e69303c33c ACE-4513: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) 
116327 amukha: Merged 5.0.2 (5.0.2.5) to 5.0.N (5.0.3)
      116326 amukha: MNT-15091: CLONE - 5.0.2 [Pentest 121015] ZIP extraction code execution
         - Fixed the test to use a classloader to load a test file, not the relative path.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@116331 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-05 17:34:51 +00:00
Alex Mukha
a38969a845 ACE-4513: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) 
116284 amukha: MNT-15091: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      116280 amukha: MNT-15090: Merged DEV to V4.2-BUG-FIX (4.2.6)
         115799: MNT-15075 : [Pentest 121015] ZIP extraction code execution
            Fix and test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@116289 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-05 15:21:35 +00:00
Alan Davis
3675027287 Merged HEAD (5.1) to 5.1.N (5.1.1) 
115382 dhulley: CachingContentStore handles "spoof://" content URLs (ACE-4516:DataLoad file spoofing fails with S3 connector)
    - Any store can now be used with the spoofed data load by wrapping it in the CachingContentStore (see S3 Connector)
    - Will work with S3 Connector against Alfresco 5.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115618 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-29 23:12:55 +00:00
Alan Davis
50e331445f Merged HEAD (5.1) to 5.1.N (5.1.1) 
115350 ahind: Fix for     ACE-4510     NodeServiceTest Platform Unit test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-29 23:12:48 +00:00
Alan Davis
47211f01d7 Merged HEAD (5.1) to 5.1.N (5.1.1) 
115310 dhulley: Fix formatting during investigation of ACE-4510


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115614 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-29 23:12:24 +00:00
Raluca Munteanu
d0f097601a Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE) 
114790 amorarasu: MNT-15007: CLONE - String values when migrating from MySQL to other DBs
      Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         114311 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
            114245 tvalkevych: Merged V4.1.9 (4.1.9.13) to V4.1-BUG-FIX (4.1.11)
               113717 dhulley: MNT-14911: String values when migrating from MySQL to other DBs
                - Add a new job that allows node string values to be re-persisted according to the current 'system.maximumStringLength' value
                - Job is unscheduled by default
                - Set the 'system.maximumStringLength' and the 'system.maximumStringLength.jobCronExpression'
                - Various touched code format fixes, method naming fixes, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-23 07:46:06 +00:00
Raluca Munteanu
717b90a2d2 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114820 dhulley: ACE-4479: RenditionServiceIntegrationTest failing on MariaDB
    - Add 60 iterations of 1s waits while checking for appearance of correct data
    - Will succeed faster (when working) while allowing 60s when things are running a little slower


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-21 09:03:34 +00:00
Raluca Munteanu
5ea0ea018f Merged HEAD (5.1) to 5.1.N (5.1.1) 
114774 gcornwell: ACE-4465: PolicyComponent is part of the public API for Spring injection, but getter is not available via ServiceRegistry


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114857 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-21 09:03:25 +00:00
Raluca Munteanu
9fb3f0772c Merged HEAD (5.1) to 5.1.N (5.1.1) 
114726 sglover: ACE-3542 "server.maxusers count does not work correctly - TicketCountAll can be greater MaxUsers"
   Fix test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114853 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-21 08:54:05 +00:00
Raluca Munteanu
4262d7e705 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114666 sglover: ACE-3542 "server.maxusers count does not work correctly - TicketCountAll can be greater MaxUsers"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-21 08:53:40 +00:00
Raluca Munteanu
508e6e3d06 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114654 ahind: Fix for     ACE-4420   SOLR 4 - sharded - rename and move operations will not update descendants and add incorrect nodes to the shard


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114850 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-21 08:53:28 +00:00
Ana Bozianu
664a2a766d Merged HEAD (5.1) to 5.1.N (5.1.1) 
114288 sglover: ACE-4347 "5.1 Build has had three transient failures related to locking"
   Increase the logging for the failing tests to DEBUG so that we can see what's happening during the next failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114402 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-15 08:43:40 +00:00
Ancuta Morarasu
59251d836b Merged HEAD (5.1) to 5.1.N (5.1.1) 
114219 jvonka: ACE-4250: Revert r110119 (except keep 2 out of 4 unit tests)
   - note: related to ACE-4421/MNT-13836


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114317 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-14 09:21:11 +00:00
Ancuta Morarasu
f9525f7723 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114044 ahind: Fix for     ACE-4412    Dynamic shard registration should be an enterprise only feature


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114313 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-14 09:17:16 +00:00