Commit Graph

5844 Commits

Author SHA1 Message Date
Ancuta Morarasu
143b52b51c Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
124106 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      124105 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
         123915 rmunteanu: Merged V4.1.7 (4.1.7.18) to V4.1-BUG-FIX (4.1.11)
            MNT-15801 : onContentUpdate policies not working for updates via webdav
               - Reverted changes made for MNT-11185 and MNT-10966 , reverts that will fix MNT-15746
               - Changed fix for MNT-5882 by adding the ASPECT_NO_CONTENT after the content is updated, this way preventing MNT-10966 from reproducing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124145 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-16 14:26:29 +00:00
Ancuta Morarasu
0bedf1813d 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.1.N/root@124096 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 15:06:16 +00:00
Ancuta Morarasu
5ad98616ca Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
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.1.N/root@124094 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 15:04:08 +00:00
Alan Davis
666a4bd587 Tidy up after merge from 5.1.N to HEAD
- This batch are to do with Mark's commits and reverts
     The 5.1.N 119393 record only merge should have had some changes from HEAD 118791

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 00:05:06 +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
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
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
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
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
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
8894536641 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
121659 abozianu: Merged DEV to 5.0.N (5.0.4)
      121643 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - fixed webscript error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121674 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-29 14:33:26 +00:00
Raluca Munteanu
46b53eb6c8 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121619 mrogers: MNT-14860 - Unit test failure in CIFS Content Comparator for PPT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121671 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-29 14:32:32 +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
Alex Mukha
a9f5ced0c4 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
121273 amukha: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4) (PARTIAL MERGE)
      121272 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
         121271 amukha: MNT-15543: CLONE - Remote access via JMX should be disabled by default
            - Added additional bean configuration to fully disable RMI by default.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121275 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-21 18:53:50 +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
1de7d64a22 Merged HEAD (5.1) to 5.1.N (5.1.1)
120912 jkaabimofrad: ACE-4924: Added a patch to ensure 'cm: extensions' and 'cm: module-deployments' folders within the surf-config folder exists, then adds the ALFRESCO_MODEL_ADMINISTRATORS Group to their Permission list.
    - Also, added ALFRESCO_MODEL_ADMINISTRATORS to the permission list for surf-config folders (i.e. cm:extensions and cm: module-deployments) created on bootstrap of a new install.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120979 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-18 09:35:31 +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
Ancuta Morarasu
480038998d Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120952 aleahu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      120889 amukha: Merged AMUKHA/MNT-15398 (4.2.6) to V4.2-BUG-FIX (4.2.6)
         120887 amukha: MNT-15398: Supportability - warn about MS-SQL server mis-configuration
            - Added a check for the db.txn.isolation to be set to 4096 for the MS SQL Server dialect.
            - Used the message bundle for all logger messages.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120968 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-18 09:22:29 +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
Derek Hulley
3a7941d473 Fixed code warnings
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-11 14:16:30 +00:00
Alexandra Leahu
05a0978f56 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120675 dungureanu: Merged DEV to 5.0.N (5.0.4)
      120674 dungureanu: MNT-14922: Workflow console's user command is case sensitive
         - Look up the correct user, throw error if not found. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120715 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-11 13:39:52 +00:00
Cristian Turlica
6785aa607d Merged HEAD (5.1) to 5.1.N (5.1.1)
120465 ahind: Fix for     ACE-4900  "java.lang.IllegalArgumentException: bound must be positive" in DynamicSolrStoreMappingWrapperFactory
   - improved logging and fallback options


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-08 12:50:49 +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