Commit Graph

742 Commits

Author SHA1 Message Date
Andreea Dragoi
1e7347116d Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
122668 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      122625 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
         122548 rmunteanu: Merged DEV to V4.2.6 (4.2.6)
            122546: MNT-14204: Enterprise bulkimport tool is not versioning for inplace import from two different batches
               - If only version files are imported, version history is no longer removed and the version number is incremented
               - Added new in-place import test and updated one streaming import test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-26 07:46:12 +00:00
Alexandra Leahu
f8473165df Merged HEAD (5.1) to 5.1.N (5.1.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/BRANCHES/DEV/5.1.N/root@122579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-22 15:12:43 +00:00
Derek Hulley
7f49e20a93 Speculative check for null to address failing build (ACE-5143)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122538 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-22 10:56:48 +00:00
Derek Hulley
bc78b5113a More explicit recording of attribute keys for multi-threaded test of property value cleaner (ACE-5153)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122526 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 17:47:18 +00:00
Derek Hulley
1f1678cc47 Relax the checking of the last attribute to go in on the thread (ACE-5143)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122482 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 11:11:17 +00:00
Derek Hulley
db7a5ec02a PostgreSQL and MySQL fixes for ACE-5143: CLONE - CleanAlfPropTables deleting more than it should
- New test PropertyValueCleanupTest
 - Generates some data for the script to clean up
 - Concurrently generates attribute values while cleanup script is running
 - Checks that the script cleaned up the orphaned data
 - Checks all newly-generated attributes to ensure that they survived the script in tact
 - The second SQL statement modification can be reverted to produce the failure mode observed in ACE-5143


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122471 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 02:01:13 +00:00
Ramona Neamtu
d7dd06fac3 Merged HEAD (5.1) to 5.1.N (5.1.1)
122265 slanglois: 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/BRANCHES/DEV/5.1.N/root@122361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-17 12:01:10 +00:00
Ramona Neamtu
eb7bc51e00 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
122101 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      122078 amukha: MNT-15654: Un-sharing updates the modified properties of a file
         - Disabled audit during unshare.
         - Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-15 14:00:52 +00:00
Ramona Neamtu
6200e0675e Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121772 amorarasu: Merged DEV to 5.0.N (5.0.4)
      120891 121263 amorarasu: MNT-14951: Using CMIS it is not possible to retrieve the secondary or the list of the parents of a folder
         - Changed getObjectParents() to return all the parents, not just the first one.
         - Added junit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121800 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-03 09:37:29 +00:00
Ramona Neamtu
704e64cfc0 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121764 nsmintanca: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      121709 rneamtu: Merged DEV to V4.2-BUG-FIX (4.2.7)
         121670 rneamtu: MNT-13814 : Using MS word Save As pdf does not work correctly.
            - Added new mimetype "application/applefile" and set it for files that starts with "._"
            - Added new test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-03 09:36:42 +00:00
Raluca Munteanu
9f2d3441df Merged HEAD (5.1) to 5.1.N (5.1.1)
121650 sdinuta: 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/BRANCHES/DEV/5.1.N/root@121687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-29 14:49:19 +00:00
Raluca Munteanu
81128204c6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121496 arebegea: MNT-14409 : Unable to configure search filter for TAG/SITE via extension
      - Modified the SolrFacetConfig QName resolver to use the FacetQNameUtils that was also used when added a filter from Share
      - Had to move the FacetQNameUtils and the test class FacetQNameUtilsTest to repository project
      - Added the FacetQNameUtilsTest test to the AllUnitTestsSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-28 13:11:37 +00:00
Ramona Neamtu
8d05a12205 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120555: Merged DEV to 5.0.N (5.0.4)
      120544 rneamtu: MNT-13723 : Error message not clear, when de-activating a model dynamically deployed and content still exists.
         - Added externalized error message, generic for both delete and deactivate
         - Do not merge this forward, it will be merged manually
   120572: MNT-13723 : Error message not clear, when de-activating a model dynamically deployed and content still exists.
      - Fixed failing tests
      - Do not merge this forward, it will be merged manually

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121494 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-27 09:58:37 +00:00
Ancuta Morarasu
6471ae8b38 Merged HEAD (5.1) to 5.1.N (5.1.1)
120966 jkaabimofrad: 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/BRANCHES/DEV/5.1.N/root@120982 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-18 09:37:15 +00:00
Ancuta Morarasu
2dd522eb64 Merged HEAD (5.1) to 5.1.N (5.1.1)
120953 jkaabimofrad: An attempt to fix build failure in Bamboo which appeared by r120912.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-18 09:36:54 +00:00
Ancuta Morarasu
1311c3af3a 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/BRANCHES/DEV/5.1.N/root@120969 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-18 09:23:41 +00:00
Derek Hulley
929e59bbdc Added test for the IntegrityChecker around list-of-values, including leading and trailing spaces (ACE-5000)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120880 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-14 12:15:03 +00:00
Alexandra Leahu
074da3efea Merged HEAD (5.1) to 5.1.N (5.1.1)
120808 amukha: ACE-4909: [Win 10, Chrome] - Site Members: Searching users with two chars results in wrapped exception
      - Changed the tests to correspond to the new behaviour.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120849 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-13 14:50:04 +00:00
Alexandra Leahu
4e38d63177 Merged HEAD (5.1) to 5.1.N (5.1.1)
120786 amukha: 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/BRANCHES/DEV/5.1.N/root@120848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-13 14:49:36 +00:00
Alexandra Leahu
c79dab110c Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120757 adragoi: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      120693 abalmus: MNT-14681 : No VersionType is set when content is updated and autoversion is active
         - Provided fix and tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120821 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-13 14:15:38 +00:00
Cristian Turlica
34a6a232df Merged HEAD (5.1) to 5.1.N (5.1.1)
120479 rdina: 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. + added java header


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-08 12:51:47 +00:00
Cristian Turlica
78f1f3108c Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120517 nsmintanca: Merged NESS/5.0.N-2016-01-05 (5.0.4) to 5.0.N (5.0.4)
      120487: MNT-14958: User cannot create public/public moderated site after set site.public.group to group id does not begin with 'GROUP_'   
         MNT-14958: User cannot create public/public moderated site after set site.public.group to group id does not begin with 'GROUP_'
         -added check and exception threat for  double-prefixed authorities
         -added unit test
         -formatted code; removed tabs
          
         


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120593 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-08 12:26:45 +00:00
Natalia Smintanca
e6ebb8109c Merged HEAD (5.1) to 5.1.N (5.1.1)
120273 skopf: ACE-4863 - Cannot save content back to Alfresco
   ACE-4887 - LockService.getLockState unaccessible
   Extended jUnit tests to test accessibility of getLockState method


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-18 13:04:12 +00:00
Natalia Smintanca
909823a936 Merged HEAD (5.1) to 5.1.N (5.1.1)
120229 rdina: 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/BRANCHES/DEV/5.1.N/root@120378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-18 13:03:25 +00:00
Andreea Dragoi
884bb19489 Merged HEAD (5.1) to 5.1.N (5.1.1)
120082 bhorje: ACE-4845 added definition retrieval transaction enforcement and denial of unauthenticated virtualization


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 14:28:20 +00:00
Andreea Dragoi
12b52aeed3 Merged HEAD (5.1) to 5.1.N (5.1.1)
119950 jphuynh: 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/BRANCHES/DEV/5.1.N/root@120197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 14:24:30 +00:00
Andreea Dragoi
2c82c256cb Merged HEAD (5.1) to 5.1.N (5.1.1)
119945 jphuynh: 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/BRANCHES/DEV/5.1.N/root@120192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 13:26:39 +00:00
Ramona Neamtu
c1cb1a43b2 Merged HEAD (5.1) to 5.1.N (5.1.1)
119732 sdinuta: ACE-4795: Adding as favorite a folder/file in virtual context doesn't work as expected


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120166 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-15 12:33:47 +00:00
Natalia Smintanca
0b95d698a8 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120046 abozianu: Merged DEV to 5.0.N (5.0.4)
      117528 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - added a new aspect for cmis checked out documents : ASPECT_CMIS_CHECKEDOUT
      118441 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - changed aspect name from ASPECT_CMIS_CHECKEDOUT to ASPECT_CMIS_CREATED_CHECKEDOUT
      118775 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - fixed commit error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120109 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:21:09 +00:00
Natalia Smintanca
03deaa808f Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120075 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      120039 amukha: Merged V4.2-BUG-FIX-MNT-14688 (4.2.6) to V4.2-BUG-FIX (4.2.6)
         120019 amukha: MNT-14688: version revert on first version failure if type has aspect
            - Restoring a version now restores the node's type.
            - Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:16:35 +00:00
Natalia Smintanca
e2d50154b5 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120045 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119806 gjames: MNT-15211 Re-enabled the non-auditable test, and corrected the createnode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:10:27 +00:00
Natalia Smintanca
71b8ebc2be Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120044 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119749 gjames: MNT-15211 Disabled the non-auditable test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120104 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:10:01 +00:00
Natalia Smintanca
70095470b6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120043 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119724 gjames: MNT-15211 Added a test for restoring non-auditable


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:09:35 +00:00
Raluca Munteanu
c62d655585 Merged HEAD (5.1) to 5.1.N (5.1.1)
119697 bhorje: ACE-4744 javadoc and cleanup


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120076 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-11 09:41:45 +00:00
Raluca Munteanu
206f8b08f9 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
119856 rmunteanu: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
      119809 cturlica: Merged DEV to 5.0.3 (5.0.3)
         119807 cturlica: MNT-15329: NodeDAOTest.testSelectNodePropertiesByDataType() failing on Oracle
            - updated unit test (removed duplicate check)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120064 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-11 08:54:09 +00:00
Raluca Munteanu
9cf547a63d Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
119829 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      119792 slanglois: MNT-13919 Enable new test MappingMetadataExtracterTest in test suite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119850 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:01:43 +00:00
Raluca Munteanu
093560c002 Merged HEAD (5.1) to 5.1.N (5.1.1)
119652 bhorje: ACE-4752 dynamic type filter creation - fixed invalid or missing namespace bug


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119706 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 09:59:09 +00:00
Raluca Munteanu
3c5a92f708 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
119612 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      119559 ragauss: MNT-13919: Check for Metadata Embed Support is Incorrect
        - Added unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 09:29:56 +00:00
Ancuta Morarasu
f187db02f3 Merged HEAD (5.1) to 5.1.N (5.1.1)
119450 mcozma: Merged BRANCHES/DEV/VF_REP_INT_51 to HEAD
   ACE-4716 Can't rename a document in a virtual context from CMIS
   ACE-4752 Type virtualization method does not work
   ACE-4717 Document name is renamed when making "Check in" for a document edited in Google Docs
   ACE-4700 Can't upload to a virtual folder when filename starts with a number and includes dashes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-04 09:10:57 +00:00
Ancuta Morarasu
38ab389189 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
119576 adavis: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
      119521 amukha: Merged 5.0.3-MNT-15258 (5.0.3) to 5.0.3 (5.0.3)
         118559 amukha: MNT-15258: Huge database after upgrade to 5.1.c
            - Added usage of JobLockService for prop cleanup job.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119609 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-04 08:58:36 +00:00
Ancuta Morarasu
fe9b8480a8 Merged HEAD (5.1) to 5.1.N (5.1.1)
118826 mrogers: Rolled back CIFSComparator stuff incorrectly checked in


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-02 10:11:24 +00:00
Andrei Rebegea
721b1640e7 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118653 cturlica: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      118604 amukha: Merged V4.2.3 (4.2.3.21) to V4.2-BUG-FIX (4.2.6)
         118292 adragoi: MNT-15169 : Receiving error when bulk deleting content in Share
            - fixed tests by translating test_alf_17260.js to java code


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118715 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 09:12:50 +00:00
Natalia Smintanca
efb26c99dc Merged HEAD (5.1) to 5.1.N (5.1.1)
118256 sdinuta: ACE-4699: Document preview is changed to the physical location after "Edit Offline \ Cancel Editing" action


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118350 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 11:31:38 +00:00
Natalia Smintanca
0c55fc5905 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/BRANCHES/DEV/5.1.N/root@118308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 10:57:08 +00:00
Natalia Smintanca
e00500f6f0 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/BRANCHES/DEV/5.1.N/root@118307 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 10:56:56 +00:00
Natalia Smintanca
f274fc9ce7 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/BRANCHES/DEV/5.1.N/root@118306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 10:56:43 +00:00
Natalia Smintanca
76b0d1dffb Merged HEAD (5.1) to 5.1.N (5.1.1)
117981 amukha: Merged DEV (5.1) to HEAD (5.1)
      117318: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
      117293: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
         - Changed the ClassBehaviourIndex#find as the main logic is handled by BehaviourFilterImpl#isEnabled
         - Updated the BehaviourFilter interface accordingly.,
      115822: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
         - Reworked the solution to use only one new method: disable(QName className, boolean includeSubClasses)
         - Modified the isEnabled(QName className) to correspond with the new logic
         - Modified the JUnit tests.,
      115078: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
      115071: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
         - Added new API for disabling behaviours.
         - Added JUnit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-19 09:48:28 +00:00
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