Commit Graph

755 Commits

Author SHA1 Message Date
Alan Davis
741769a993 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124236 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (PARTIAL MERGE)
      124190 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124132 arebegea: MNT-15573 : Site finder slow for a user who's member of many sites
            - added a new method to InvitationService to make use of the limit in the searchInvitation
            - sent and used the 200 limit from the site-finder.get.js in the script/ScriptInvitationService.java and passed the new parameter
            - for searchModeratedInvitations and searchNominatedInvitations methods of InvitationServiceImpl.java I added the use of the limit parameter
            - added some comments on ActivitiWorkflowEngine.java and TaskComponent.java to inform developers about the performance issues and possible improvement
            - added junit tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124277 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 11:05:59 +00:00
Ancuta Morarasu
d8a66822f4 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124143 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124120 gjames: MNT-15830: Moved DynamicallySizedThreadPoolExecutorTest to alfresco-core, and removed from unit tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124226 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:50:32 +00:00
Ancuta Morarasu
851b1bf662 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124142 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124119 gjames: MNT-15830: Moved DynamicallySizedThreadPoolExecutorTest to alfresco-core


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124225 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:50:23 +00:00
Ancuta Morarasu
fef6fa3dd0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124096 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123996 sglover: MNT-15655 "Possible to violate child cm:name uniqueness constraint via NodeService.addAspect"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:49:57 +00:00
Ancuta Morarasu
a2d76025ad Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124091 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123490 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123221 mward: ACE-5120: further fixes (ADMLuceneTest)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:49:14 +00:00
Ancuta Morarasu
6f2b0f90ef Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124089 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123488 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123145 mward: ACE-5120: fix ADMLuceneCategoryTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:48:57 +00:00
Ancuta Morarasu
92500f8d91 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124088 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123487 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123142 mward: ACE-5120: further test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:48:48 +00:00
Ancuta Morarasu
eb64e2d3f3 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124087 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123486 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123028 mward: ACE-5120: test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124213 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:48:38 +00:00
Ancuta Morarasu
f43892ca62 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124085 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123477 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123368 gjames: MNT-15114: Test to ensure the policy fires


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124211 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:47:11 +00:00
Alan Davis
941ca950a9 Merged 5.0.N (5.0.4) to 5.2.N (5.2.1)
123880 rneamtu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123574 amorarasu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
         123414 123524 amorarasu: MNT-15798: CLONE - call to guessMimetype() on a node that has no content creates a content property
            - Content Data should be created only when it has a binary, not as a side effect of getters on ScriptNode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@123892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-14 16:15:59 +00:00
Alan Davis
d945d8d955 Merged 5.1.N (5.1.1) to HEAD (5.2)
123502 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123484 adavis: MNT-14295 TransformerConfigLimits Behavior Differs on Java 7 vs 8
         - Fixed TransformerPropertyNameExtractor so that it discarded limit or
           max properties if its sibling max or limit value is supplied and has
           a lower value (i.e. it should be used).
         - Cleaned up TransformerConfigLimits.setTransformationLimitsFromProperties
         - This has been a problem since 4.2.
         - The problem only came to light with the switch to Java 8, as the order in which
           transformer properties are loaded changed. They were being loaded in MapEntry order.
           The problem did not show up in the unit tests, because they too were impacted by
           the MapEntry order and ironically loaded the properties in the same order.
         - Added unit tests that are supply both max an limit values.
         - Enhanced the debug and toString methods in order to trace the problem.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:35:33 +00:00
Alan Davis
38f73d02ae Merged 5.1.N (5.1.1) to HEAD (5.2)
123152 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123098 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122976 tvalkevych: MNT-15783: Merged V4.2.4 (4.2.4.20) to V4.2-BUG-FIX (4.2.7)
            113807 adragoi: Merged DEV to V4.2.4 (4.2.4.16)
               113780: MNT-12240 : Loading of available Tags is slow at 'Edit Properties' -> 'Select Tags' dialog.
                  - limited query results sin webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123694 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:33:33 +00:00
Alan Davis
9aea46c7ae Merged 5.1.N (5.1.1) to HEAD (5.2)
122983 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122910 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122808 adavis: MNT-15738 Property to disable transformers by use (e.g. doclib thumbnail generation) in 4.2 is not working
            - Allow 'use' style properties to be set
            - Combine 'use' properties more flexibly with the default ones.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123686 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:32:22 +00:00
Alan Davis
c6eef005f3 Merged 5.1.N (5.1.1) to HEAD (5.2)
122735 adragoi: 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/HEAD/root@123684 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:32:08 +00:00
Alan Davis
bbc9a4ac8b Merged 5.1.N (5.1.1) to HEAD (5.2)
122538 dhulley: Speculative check for null to address failing build (ACE-5143)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123674 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:27:36 +00:00
Alan Davis
d3cc1d0761 Merged 5.1.N (5.1.1) to HEAD (5.2)
122526 dhulley: 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/HEAD/root@123673 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:27:29 +00:00
Alan Davis
63501315b7 Merged 5.1.N (5.1.1) to HEAD (5.2)
122482 dhulley: 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/HEAD/root@123668 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:26:54 +00:00
Alan Davis
1f3c23e969 Merged 5.1.N (5.1.1) to HEAD (5.2)
122471 dhulley: 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/HEAD/root@123665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:26:32 +00:00
Alan Davis
06cc11ae36 Merged 5.1.N (5.1.1) to HEAD (5.2)
122216 rneamtu: 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/HEAD/root@123657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:25:32 +00:00
Alan Davis
d46bb2d208 Merged 5.1.N (5.1.1) to HEAD (5.1)
121800 rneamtu: 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/HEAD/root@123653 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:43:13 +00:00
Alan Davis
05fd2f8800 Merged 5.1.N (5.1.1) to HEAD (5.1)
121796 rneamtu: 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/HEAD/root@123651 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:42:56 +00:00
Alan Davis
88cbc99047 Merged 5.1.N (5.1.1) to HEAD (5.1)
121627 rmunteanu: 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/HEAD/root@123645 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:42:09 +00:00
Alan Davis
0357d35817 Merged 5.1.N (5.1.1) to HEAD (5.1)
121494 rneamtu: 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/HEAD/root@123643 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:41:53 +00:00
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
Alan Davis
4d3ad92812 Merged 5.1.N (5.1.1) to HEAD (5.1)
120880 dhulley: 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/HEAD/root@123634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:40:36 +00:00
Alan Davis
fa1613fa7e Merged 5.1.N (5.1.1) to HEAD (5.1)
120821 aleahu: 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/HEAD/root@123631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:40:13 +00:00
Alan Davis
8198a383f3 Merged 5.1.N (5.1.1) to HEAD (5.1)
120593 cturlica: 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/HEAD/root@123624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:36:27 +00:00
Alan Davis
0f53f8c413 Merged 5.1.N (5.1.1) to HEAD (5.1)
120109 nsmintanca: 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/HEAD/root@123614 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:35:01 +00:00
Alan Davis
096c5871d8 Merged 5.1.N (5.1.1) to HEAD (5.1)
120108 nsmintanca: 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/HEAD/root@123613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:34:50 +00:00
Alan Davis
e39037672c Merged 5.1.N (5.1.1) to HEAD (5.1)
120105 nsmintanca: 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/HEAD/root@123612 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:34:41 +00:00
Alan Davis
4a5059192b Merged 5.1.N (5.1.1) to HEAD (5.1)
120104 nsmintanca: 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/HEAD/root@123611 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:34:32 +00:00
Alan Davis
fd3c5c2b64 Merged 5.1.N (5.1.1) to HEAD (5.1)
120103 nsmintanca: 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/HEAD/root@123609 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:34:22 +00:00
Alan Davis
11cf39ec0f Merged 5.1.N (5.1.1) to HEAD (5.1)
120064 rmunteanu: 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/HEAD/root@123606 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:33:55 +00:00
Alan Davis
899f40fd1b Merged 5.1.N (5.1.1) to HEAD (5.1)
119850 rmunteanu: 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/HEAD/root@123605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:33:47 +00:00
Alan Davis
4314768f44 Merged 5.1.N (5.1.1) to HEAD (5.1)
119696 rmunteanu: 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/HEAD/root@123602 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:26:32 +00:00
Alan Davis
4437411508 Merged 5.1.N (5.1.1) to HEAD (5.1)
119609 amorarasu: 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/HEAD/root@123601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:26:23 +00:00
Alan Davis
0aa655a4cf Merged 5.1.N (5.1.1) to HEAD (5.1)
118715 arebegea: 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/HEAD/root@123595 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:30:21 +00:00
Alan Davis
c067ed1215 Merged 5.1.N (5.1.1) to HEAD (5.1)
118308 nsmintanca: 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/HEAD/root@123592 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:29:58 +00:00
Alan Davis
967c55b264 Merged 5.1.N (5.1.1) to HEAD (5.1)
118307 nsmintanca: 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/HEAD/root@123591 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:29:50 +00:00
Alan Davis
c2e645b2ae Merged 5.1.N (5.1.1) to HEAD (5.1)
118306 nsmintanca: 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/HEAD/root@123590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:29:42 +00:00
Alan Davis
2fab2cb742 Merged 5.1.N (5.1.1) to HEAD (5.1)
113042 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      112968 mrogers: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         112583: MNT-14817 - Alfresco keeps file handlers on deleted temporary files created by CIFSContentComparator


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:25:11 +00:00
Alan Davis
c6f0ce491f Merged 5.1.N (5.1.1) to HEAD (5.1)
- Merges from 5.1.0 (when it was 5.1) that did not make it to HEAD:
     122506,122513,123118-123119
   - RECORD ONLY Merges from HEAD: 119613-119617,119622,119706-119708,
     119752-119753,120076-120078,120116,120166-120178,120182-120183,
     120185-120193,120197-120201,120378-120385,120387,120431,120526,
     120604-120625,120832-120842,120844-120849,120977-120982,121142-121144,
     121313,121347-121348,121410,121412-121417,121684-121687,121802-121805,
     121810-121815,121861,122287,122342,122361,122439-122441,122579,122921
   - RECORD ONLY merges: 119602,119821-119822,119849,120065,120107,
     120159,120260,120295,120339,120342,120371,120411-120412,120524,120527,
     120696-120697,120705,120720,120746,120761,120819,120822,120893,
     120935-120936,120993,121045,121119,121121,121132,121156-121157,
     121299,121301,121309,121394,121408,121442,121481,121624,121626,
     121672,121675,121692,121753,121795,121798,121852,121898,121981,
     122030,122088,122114,122142,122213,122215,122217,122277,122340,
     122343,122426,122487,122552,122554,122607,122654,122734,122861,
     122906,122982,122985,122988,122996,123014,123031,123090,
     123115-123117,123120    
   - Merge from 5.1.N of fix that should have gone into 5.1 (found because of conflict on merge)
     123128: ACE-5155 Garbled message in patch-service.properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-04 18:14:23 +00:00
Andreea Dragoi
0845c93af0 Reverse merged HEAD (5.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/HEAD/root@122918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-01 10:36:14 +00:00
Andreea Dragoi
04b6f386d7 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/HEAD/root@122540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-22 11:34:59 +00:00
Samuel Langlois
b931841074 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/HEAD/root@122265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-16 12:13:36 +00:00
Silviu Dinuta
113598e08c 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/HEAD/root@121650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-28 17:03:18 +00:00
Jamal Kaabi-Mofrad
e9c5927bb6 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/HEAD/root@120966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-17 20:35:00 +00:00
Jamal Kaabi-Mofrad
1a380c16ea An attempt to fix build failure in Bamboo which appeared by r120912.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@120953 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-15 13:41:55 +00:00
Alex Mukha
2e50187a57 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/HEAD/root@120808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-12 19:17:24 +00:00
Alex Mukha
e33ac7c249 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/HEAD/root@120786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-12 15:52:52 +00:00