Commit Graph

5 Commits

Author SHA1 Message Date
Alan Davis
83c4f4826b Fix build error as a result of the merge of
58405 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
     58384: MNT-9979 : Merge DEV to V4.1-BUG-FIX
       58338 : MNT-9979 : External authentication fails if Kerberos SSO is also enabled, although Kerberos is later in the chain than External
       Add new unit test. Add remoteUserMapper for webDavAuthenticationFilter in kerberos authentication.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-02 16:51:12 +00:00
Alan Davis
d1ace29bf3 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
58384: MNT-9979 : Merge DEV to V4.1-BUG-FIX
    58338 : MNT-9979 : External authentication fails if Kerberos SSO is also enabled, although Kerberos is later in the chain than External
    Add new unit test. Add remoteUserMapper for webDavAuthenticationFilter in kerberos authentication.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58405 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-28 21:48:53 +00:00
Alan Davis
6e4c59fee5 Reverse Merged. Commit to wrong branch. Should have been HEAD-BUG-FIX.
57334: Moved test_indexCheckService.js to test-resources, BDE-195
   57335: Enterprise depends on wdr-deployment, BDE-195
   57336: An explicit instruction to Junit to ignore this class, BDE-195
   57337: Excluding wcm tests that aren't run in ant, BDE-195
   57339: Fixed failing tests by loading the test resource config from the class path, BDE-195


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57353 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-30 10:29:01 +00:00
Gethin James
21a71e8f34 Fixed failing tests by loading the test resource config from the class path, BDE-195
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57339 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-29 16:40:48 +00:00
Samuel Langlois
e60d57ea42 Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00