Commit Graph

6326 Commits

Author SHA1 Message Date
Alan Davis
5e19feeb3f Merged 5.1.N (5.1.1) to HEAD (5.1)
120259 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120179 amorarasu: Merged DEV to 5.0.N (5.0.4)
         120074 nabacioaiei: MNT-15252 : Any repository amp having set module.repo.version.min=5.0.2.1 cannot be applied to an Alfresco One 5.0.2.1 instance.
            - modified ModuleDetailsImpl to ignore version.label(if it exists) from module.repo.version.min and module.repo.version.max and log a warning.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:35:17 +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
6e32e3e145 Merged 5.1.N (5.1.1) to HEAD (5.1)
120102 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120042 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
         119705 gjames: MNT-15211 Restoring data from Trashcan with MySQL Cluster NDB backend doesn't work


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123608 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:34:14 +00:00
Alan Davis
d77c2c456a Merged 5.1.N (5.1.1) to HEAD (5.1)
120101 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120041 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
         119608 gjames: MNT-15211 Restoring data from Trashcan with MySQL Cluster NDB backend doesn't work


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123607 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:34:04 +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
3be51e756c Merged 5.1.N (5.1.1) to HEAD (5.1)
118714 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      118652 cturlica: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
         118603 amukha: Merged V4.2.3 (4.2.3.21) to V4.2-BUG-FIX (4.2.6)
            117952 adragoi: MNT-15169 : Receiving error when bulk deleting content in Share
               - moved deletion in a retrying context 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123594 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:30:14 +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
99bc1f16ac Merged 5.1.N (5.1.1) to HEAD (5.1)
117930 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      117707 aleahu: MNT-14341 : FTP authentication fails when External authentication is enabled
         - Checked that the instance of the authenticator used is not the same as the one from which the call is made


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:27:10 +00:00
Alan Davis
a9e033f2c5 Merged 5.1.N (5.1.1) to HEAD (5.1)
117597 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      117582 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
         116652 amorarasu: MNT-14983: CMIS: Euro character not encoded correctly
            Merged V4.2.4 (4.2.4.19) to V4.2-BUG-FIX (4.2.6)
               115140 115998 116396 amorarasu: MNT-15044: CLONE - CMIS: Euro character not encoded correctly
                  - Removed the unicode interval that was used to escape characters from the categories: currency, general punctuation, subscripts and superscripts (2000-20FF).
                  - Changed the way the control characters are filtered + adapted tests.
                  - Removed unnecessary j_string use from the ftl and added proper xml encoding.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123586 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:27:03 +00:00
Alan Davis
65918ed209 Merged 5.1.N (5.1.1) to HEAD (5.1)
113586 tvalkevych: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      113508 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         113395 tvalkevych: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
            113371 amorarasu: Merged DEV to V4.1-BUG-FIX (4.1.11)
               113345: MNT-10305: DeletedNodeCleanupWorker should be improved.
                  - Fixed the starting time for the purge old nodes process.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:26:04 +00:00
Alan Davis
52fbb8090c Merged 5.1.N (5.1.1) to HEAD (5.1)
113398 tvalkevych: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      113291 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         113279 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
            113102 amorarasu: MNT-10305: DeletedNodeCleanupWorker should be improved.
               - Moved the retrying transaction helper declaration back in the while loop - fix test attempt.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123577 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:25:47 +00:00
Alan Davis
f959c5d77b Merged 5.1.N (5.1.1) to HEAD (5.1)
113397 tvalkevych: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      113290 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         113278 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
            112985 amorarasu: Merged DEV to V4.1-BUG-FIX (4.1.11)
               111742: MNT-10305: DeletedNodeCleanupWorker should be improved
                  - Delete in multiple statements, filtering by transactions with commit time in a time interval.
               112722: Improved the algorithm that sets appropriate time windows for delete, based on the evolution of the purge process.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:25:39 +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
da58d9fe29 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/BRANCHES/DEV/5.1.N/root@123502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 20:33:58 +00:00
Ancuta Morarasu
57562b2557 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123356 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123206 adavis: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
         123099 amorarasu: MNT-15798: CLONE - call to guessMimetype() on a node that has no content creates a content property
               Reverse merged V4.2.6 (4.2.6)
                  104274 mbobyleu: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
                     102794: MNT-8678 : call to guessMimetype() on a node that has no content creates a content property
                        - add check for empty content before saving a node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123433 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 13:14:11 +00:00
Ancuta Morarasu
80aa1b0ba3 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
123349 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123109 adragoi: Merged DEV to V4.2-BUG-FIX (4.2.7)
         123105 adragoi: MNT-15705 : CLONE - Receiving error when bulk deleting content in Share
            - created remove overloaded method in script node that uses a new transaction and used it for bulk delete


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 13:13:34 +00:00
Alan Davis
c6919d115a Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123406 adavis: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123405 adavis:       Reverse merged V4.2-BUG-FIX (4.2.7)
               123400 adavis: Merged 5.0.N (5.0.4) to V4.2-BUG-FIX (4.2.7)
                  123386 adavis: MNT-14295 TransformerConfigLimits Behavior Differs on Java 7 vs 8
                     - Fix TransformerConfigLimits.setTransformationLimitsFromProperties(...)
                       so that it does not clear the limit (e.g. readLimitTimeMs) when setting
                       the max value (e.g. timeoutMs) or the other way around. It is normal to
                       have both values defined for the default.transformer. 
                     - 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 not impacted by MapEntry order.
                     - Enhanced the debug and toString methods in order to trace the problem.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-09 23:29:42 +00:00
Alan Davis
76dc3c06f5 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123386 adavis: MNT-14295 TransformerConfigLimits Behavior Differs on Java 7 vs 8
      - Fix TransformerConfigLimits.setTransformationLimitsFromProperties(...)
        so that it does not clear the limit (e.g. readLimitTimeMs) when setting
        the max value (e.g. timeoutMs) or the other way around. It is normal to
        have both values defined for the default.transformer. 
      - 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 not impacted by MapEntry order.
      - Enhanced the debug and toString methods in order to trace the problem.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123402 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-09 19:31:53 +00:00
Cristian Turlica
b2789f4f12 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123182 gjames: MNT-15494: Added a blacklist of attributes (passwords) no longer shown via JMX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-09 12:22:33 +00:00
Ancuta Morarasu
12f7eeba90 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/BRANCHES/DEV/5.1.N/root@123152 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-07 11:14:26 +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
Alan Davis
5b53ff357c Merged 5.1.0 (5.1.0) to 5.1.N (5.1.1)
122920 jphuynh: Merged SAVA/BRANCHES/ACE-5162 (5.1.0) to 5.1.0 (5.1.0)
      122864 sdinuta: ACE-5162: added some logging and made a little change after Bogdan's review


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-04 15:01:54 +00:00
Alan Davis
927878fba2 Merged 5.1.0 (5.1.0) to 5.1.N (5.1.1)
122919 jphuynh: Merged SAVA/BRANCHES/ACE-5162 (5.1.0) to 5.1.0 (5.1.0)
      122838 sdinuta: ACE-5162: commited the changes for the solution before internal review


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123118 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-04 15:01:45 +00:00
Raluca Munteanu
779c0fc241 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
122981 rmunteanu: MNT-15167 : PageLimit value no longer pick up in 5.x with or without Transformation Server installed
      - Preserved transformer properties order.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-03 12:00:54 +00:00
Mark Rogers
74686dc957 Merged WOLF-8 (5.1.0) to 5.1.N (5.1.1)
114287 mward: UTF-170: Move TrueZip unmount call to a final block.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122997 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-02 14:52:16 +00:00
Raluca Munteanu
7721384025 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
122911 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      122835 gjames: MNT-15114: Adding invokeBeforeDeleteChildAssociation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122984 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-02 13:04:35 +00:00
Raluca Munteanu
06dc388d3d 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/BRANCHES/DEV/5.1.N/root@122983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-02 13:04:05 +00:00
Andreea Dragoi
6a3df9f323 Merged HEAD (5.1) to 5.1.N (5.1.1)
122918 adragoi:       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/BRANCHES/DEV/5.1.N/root@122921 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-01 10:49:17 +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
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
31afcc9f1b Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
122615 rneamtu: Merged DEV to 5.0.N (5.0.4)
      122454 rneamtu: MNT-14602: Add config to support Visio 2013 previews and thumbnails
         - Added support for vsdx mimetype


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-24 14:55:27 +00:00
Alexandra Leahu
87091fccaa Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
122623 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      122577 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
         122484 amukha:       Reverse merged V4.2.6 (4.2.6)
                  118603 amukha: Merged V4.2.3 (4.2.3.21) to V4.2-BUG-FIX (4.2.6)
                     117952 adragoi: MNT-15169 : Receiving error when bulk deleting content in Share
                        - moved deletion in a retrying context 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122653 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-24 14:41:02 +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
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
Ancuta Morarasu
0689f35f52 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
122474 rneamtu: Merged DEV to 5.0.N (5.0.4)
      122425 rneamtu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - fixed cancel editing and delete failures


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 12:25:09 +00:00
Derek Hulley
c7c9bbf7f3 Increase the TTL for the property value cleaner to 1 hour (ACE-5153)
- Simplify the lock code because it's not iterative i.e. just lock and unlock


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 02:48:25 +00:00
Derek Hulley
d433d01b9f Request failure details from SQL execution in method 'PropertyValueDAOImpl.cleanupUnusedValues()' (ACE-5143)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122470 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 01:35:14 +00:00
Derek Hulley
509a828b43 Add option to propagate exceptions out during SQL execution, in order to detect failures (ACE-5143)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122469 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 01:33:19 +00:00
Derek Hulley
4b0293602c Add back missing code for MNT-12716 in order to address ACE-5143 correctly
- MNT-12716: 3.4 -> 4.2 Upgrade does not migrate locales of translated documents 
 - ACE-5143: CLONE - CleanAlfPropTables deleting more than it should
 - The move of the SQL execution framework to a ScriptExecutor seems to have dropped the feature allowing --ASSIGN to have a default value
 - Added back the feature
 - Added check of variable assignment with system message giving details e.g.
    Caused by: ... Variable assignment '--ASSIGN:PROP_DOUBLE_MAX_ID' produced no value. A default can be assigned e.g. '--ASSIGN:PROP_DOUBLE_MAX_ID!-1'. (line 80 of ...\CleanAlfPropTables.sql).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-19 01:24:25 +00:00
Ramona Neamtu
9d2679400f Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
122412 nsmintanca: MNT-15642 CLONE - Request to join a moderated site multiple times
      -added validation on backend to prevent multiple requests for joining a site
      -updated unit tests
      -added widget to display "Cancel request" button


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122427 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-18 12:51:10 +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
b335799e86 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
122280 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      122237 amukha: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
         122236 amukha: Merged AMUKHA/MNT-15509 (4.2.6) to V4.2.6 (4.2.6)
            122202 amukha: MNT-15509: Changing a Site from Private to Public duplicates permissions
               - Removed duplicate permissions for ScripNodes
               - Added JUnit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122341 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-17 11:41:40 +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
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
ddb229c65c Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121765 nsmintanca: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      121735 rneamtu: 121670: MNT-13814 : Using MS word Save As pdf does not work correctly.
         - Fixed failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-03 09:36:54 +00:00