Commit Graph

16 Commits

Author SHA1 Message Date
Alan Davis
acdeda373e Merged 5.1.N (5.1.1) to HEAD (5.1)
120969 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120957 rneamtu: Merged NESS/5.0.N-2016-01-05/ (5.0.4) to 5.0.N (5.0.4)
         120843: MNT-14386 : renditionService.render method is creating a temporary file in User's trashcan
            - Added temporary aspect on temporary rendition before delete it
         120927: MNT-14386 : renditionService.render method is creating a temporary file in User's trashcan
            - Added a test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:41:01 +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
2c9020a904 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/HEAD/root@117633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-16 14:05:17 +00:00
Derek Hulley
7763a63f9d 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/HEAD/root@114820 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-20 17:43:38 +00:00
Alan Davis
fb978c53cc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
97593: Merged NESS/5.0.N-2015_01-20 (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      97514: MNT-13392 : Rendition - Error in AbstractRenderingEngine with model param using FreemarkerRenderingEngine
         - FIxed isAssignbleFrom issue when FreemarkerRenderingEngine is using params; added new test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@97631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-20 15:04:58 +00:00
Alan Davis
d623b63418 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94234: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94203: Reverse Merge 5.0.N (5.0.1)
        <<Caused build failures after 94116>>
        93680: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
        Fixed AuthenticationTest and RenditionServiceIntegrationTest not to hang on MS SQl Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95060 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:36:07 +00:00
Alan Davis
3929596255 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94232: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94116: MNT-13089 Reinstate the tests that had been disabled on SQLServer, before we understood the problem was with transaction isolation
      Reverted following commits:
         93292: Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelCreate in case of SQL Server
         93342: Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelDelete in case of MS SQl Server.
         93522: Disabled org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionRestore and org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionPurge in case of MS SQL Server.
         93680: Disabled org.alfresco.repo.rendition.RenditionServiceIntegrationTest.testCompositeReformatAndResizeRendition in case of SQL Server
         93772: Disabled for MS SQL Server AuthenticationTest.testLoginNotExistingTenant, RenditionServiceIntegrationTest.testALF3733, RenditionServiceIntegrationTest.testJavascriptAPI.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:35:56 +00:00
Alan Davis
8d0db021a5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94144: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94082: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93943: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            93775: Merged DEV to V4.1-BUG-FIX (4.1.10)
               93465: MNT-8810 : Audit: Double READ on first Share preview
                  - Audit READ for cm:content no longer occurs when thumbnail is created or read.
                  - Audit READ for cm:thumbnail occurs when content of doclib or webpreview is read.
            93874: MNT-8810 : Audit: Double READ on first Share preview
               - Fixed test failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95045 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:32:45 +00:00
Alan Davis
f1cfb74849 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93839: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93772: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
      Fixed RenditionServicePermissionsTest.userWithoutDeleteAccessToNodeShouldNotCauseFailedThumbnailProblemsOnUpdate.
      Disabled for MS SQL Server AuthenticationTest.testLoginNotExistingTenant, RenditionServiceIntegrationTest.testALF3733, RenditionServiceIntegrationTest.testJavascriptAPI.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95000 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:23:40 +00:00
Alan Davis
001e1846db Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93833: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93717: Merged DEV (5.0.1) to 5.0.N (5.0.1)                                                                                                                                                                                                          
         93680: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server                                                                                                                                                                            
         Fixed AuthenticationTest and RenditionServiceIntegrationTest not to hang on MS SQl Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94994 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:31:57 +00:00
Alan Davis
d60e9bb983 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
91712: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      91645: Merged DEV to 5.0.N(5.0.1)
         91602: MNT-12770: Test failures on DB2
          - Update SchemaReference
          - Increase delay in renderPdfDocumentLongRunningTest() 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94827 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:37:59 +00:00
Alan Davis
c5abaaec03 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69767: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69723: MNT-11123 : Test failure in TestEnterpriseAtomPubTCK
       Added code which check status of node (it has private working copy).
      Merged DEV to 4.2-BUG-FIX
      67109 : MNT-11123 : Test failure in TestEnterpriseAtomPubTCK
       Fixed RenditionServiceIntegrationTest.testRenderPdfDocumentLongRunningCheckout test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:50:11 +00:00
Alan Davis
96c87c2d9c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59897: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59791: Merged DEV to V4.2-BUG-FIX (4.2.2)
         59719: MNT-10178 : BM-0012: Run v420b1527_01: Cannot find Content Reader for document RenditionServiceException
         Added a check to skip the nodes without content before trying to render.
         Fixed test.
         59739: MNT-10178 : BM-0012: Run v420b1527_01: Cannot find Content Reader for document RenditionServiceException
         Corrected mistakes in the fix r59719.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:29:21 +00:00
Alan Davis
1253d2d40e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58397: Added more tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61977 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:26:07 +00:00
Alan Davis
f25a37e97c Merged HEAD-BUG-FIX to HEAD (4.2)
55504: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
      55467: Merged V4.1.6 (4.1.6) to V4.1-BUG-FIX (4.1.7)
         55414: Speculative fix to allow retrying to proceed during concurrent node modification
          - I suspect that DB2 choosing a different connection to kick out from the other DBs
          - MNT-9598: RenditionServiceIntegrationTest failing on DB2 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55785 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-20 20:51:06 +00:00
Samuel Langlois
ab4ca7177f 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