inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,182 Commits 337 Branches 2,253 Tags
c9618fdb696c73440e23035fbcdb5181d76f234c
Commit Graph

6086 Commits

Author SHA1 Message Date
Tatyana Valkevych
c9618fdb69 Merged HEAD (5.1) to 5.1.N (5.1.1) 
117316 gcornwell: ACE-4598: ServiceRegistry exposes services that are not part of the public API (i.e. not annotated via @AlfrescoPublicApi)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117385 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-12 10:22:23 +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
d9211f4d13 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/BRANCHES/DEV/5.1.N/root@117351 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:02:44 +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
a744153cb5 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/BRANCHES/DEV/5.1.N/root@117347 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:02:13 +00:00
Alan Davis
f9ff45eda1 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/BRANCHES/DEV/5.1.N/root@117346 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:01:59 +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
6114fd34bf 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/BRANCHES/DEV/5.1.N/root@117337 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:50:40 +00:00
Alan Davis
38c51705ab 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/BRANCHES/DEV/5.1.N/root@117336 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:50:34 +00:00
Alan Davis
4ef78ff58f 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/BRANCHES/DEV/5.1.N/root@117335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:50:27 +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
e14af3c7aa Merged HEAD (5.1) to 5.1.N (5.1.1) 
116895 dhulley: Fix leaked 'MLPropertyInterceptor.setMLAware' in data load API implementation (ACE-4552)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117208 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 12:07:51 +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
e5685d6885 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116423: Fix for     ACE-4038    SOLR 4 - Sharded - Suggestor fails 
   - sharded and unsharded suggestion behave the same,
   116559: Build fix after 116423  - Fix for     ACE-4038    SOLR 4 - Sharded - Suggestor fails 
   - missed default value in mock


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 11:55:39 +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
Tatyana Valkevych
900c723a70 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116394 gcornwell: ACE-4570: RatingService is currently not marked with @AlfrescoPublicApi


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117193 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 11:50:07 +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
7c4d5789b7 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/BRANCHES/DEV/5.1.N/root@116130 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-05 07:59:33 +00:00
Alan Davis
2efb428d36 Merged HEAD (5.1) to 5.1.N (5.1.1) 
115803 mgardner: ACE-4317 parse emailed potential dbid as a long before using as a solr query parameter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-03 08:09:55 +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
e78dc206db Merged HEAD (5.1) to 5.1.N (5.1.1) 
115346 dhulley: More formatting during investigation of ACE-4510


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-29 23:12:34 +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
Alan Davis
09e16185ee Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) 
115533 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.N (5.0.3)
      115531 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
         115517 abozianu: Merged DEV to 5.0.2-PLUS (5.0.2-PLUS)
            115450 abozianu: MNT-15064 : [Cloud Upgrade] Errors apear in alfresco.log after Stop & Start upgrade Alfresco Cloud 39.6.5 to 40 on DP


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115535 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-29 15:14:40 +00:00
Andreea Dragoi
50827d7789 Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) 
115032 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.N (5.0.3)
      115030 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
         114982 gcornwell: RA-608: Cloud repo fails to startup following successful bootstrap


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-27 08:42:27 +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