Commit Graph

5622 Commits

Author SHA1 Message Date
Alan Davis
15b8c8f625 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100991: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100837: Fix another merge issue as a result of a re factor that has taken place in 5.0
         Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
            100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
               100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                  99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                     - Don't include PWC in a version series
                  99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                     - Return PWC as a part of version series. Fixes to pass TCK


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101006 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 01:28:15 +00:00
Alan Davis
f70dc05311 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100990: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100834: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100784: Merged DEV to V4.2-BUG-FIX (4.2.5)
            100732: MNT-13655 : Just first keyword of the IPTC keywords list is extracted as metadata and put into description field of an image
               - Added special way for handling multi-valued meta-data properties retrieved from parser.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 01:27:45 +00:00
Alan Davis
fd90fbf2a7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100988: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100831: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100731: MNT-13682 Reverting 100341 which caused a test failure.
         The failure was DocumentDetailsPageTest.addLikeDislike and it failed in
         https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-912/


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 01:26:40 +00:00
Alan Davis
a0874952a2 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100985: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100828: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100341: MNT-13682 Add multilanguage support to FileExistsException.
         +review CR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101000 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 01:25:23 +00:00
Alan Davis
6dcac7796e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100983: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100824: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
               99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                  - Don't include PWC in a version series
               99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                  - Return PWC as a part of version series. Fixes to pass TCK


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100998 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 01:24:34 +00:00
Alan Davis
448868345c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100870: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100832: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100751: MNT-13732 Merged CLOUD39 (Cloud 39.5) to V4.2-BUG-FIX (4.2.5)
            100220,100719: MNT-13731 Add NodeRef blacklist to transformation config
               - fix test failure in enterprise build (debug now included a noderef)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100940 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:22:30 +00:00
Alan Davis
9233e37c9d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100866: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100808: Fix compile error as a result of:
         Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
            99878: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
               99807: Merged DEV to V4.1-BUG-FIX (4.1.10)
                  99672: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
                     - Unit test to demonstrate issue was implemented.
                     - Previously suggested fix was also merged.
                  99781: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
                     - Updated javadoc for new method in ContentDataDAO.
                     - Corrected logic of eager cleaner. If store is read-only content should not be deleted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100936 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:21:05 +00:00
Alan Davis
676b681092 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100861: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100772: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100260: MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
            - Fix for tests failures


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:19:17 +00:00
Alan Davis
8a6d7da70e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100858: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100769: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100158: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
            100074: MNT-13579: IMAP: Sync doesn't work anymore after a Site which is already marked as IMAP favorite got deleted in Share.
               - Added a check to handle non-existent sites.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100928 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:18:14 +00:00
Alan Davis
6c78af5165 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100852: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100763: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100041: MNT-13692: Reverse Merge V4.2-BUG-FIX (4.2.5)
            <<Merge 99879 caused failures on build #898>>
            99877: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
               99796: MNT-10999: CMIS: Version is not increased after deleting Content Stream 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:16:06 +00:00
Alan Davis
0fbc74c6fc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100846: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100757: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99879: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99811: Merged DEV to V4.1-BUG-FIX (4.1.10)
               99257 : MNT-9557 : VersioningService.getAllVersions() does not include all applied aspects in the returned extension data
                  - Return a current node as head version in version series
               99649,99789 : MNT-9557 : VersioningService.getAllVersions() does not include all applied aspects in the returned extension data
                  - Test for the fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100916 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:13:54 +00:00
Alan Davis
17e4c1b55e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100845: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100756: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99878: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99807: Merged DEV to V4.1-BUG-FIX (4.1.10)
               99672: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
                  - Unit test to demonstrate issue was implemented.
                  - Previously suggested fix was also merged.
               99781: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
                  - Updated javadoc for new method in ContentDataDAO.
                  - Corrected logic of eager cleaner. If store is read-only content should not be deleted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:13:31 +00:00
Alan Davis
40fc727b0d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100844: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100755: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99877: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99796: MNT-10999: CMIS: Version is not increased after deleting Content Stream 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:13:09 +00:00
Alan Davis
3086f8d178 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100843: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      100754: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99876: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99778: Merged DEV to V4.1-BUG-FIX (4.1.10)
               81615 : MNT-12101: Workflow loses the line feed in the description
                  - Ignoring of trim for MLValues
               81620 : MNT-12101: Workflow loses the line feed in the description
                  - Added a property to show value with line breaks


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:12:47 +00:00
Alan Davis
3054ca3ebc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100265: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100257: Reverse Merge 5.0.N (5.0.2)
         << Cause 4 build errors >>
         100165: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
            99977: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
               - Filter inherited permissions before try to remove them
               - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100574 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:16:14 +00:00
Alan Davis
e19772b892 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100261: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100252: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         99925: MNT-13677:  Added model validation to make sure the model cannot be deleted/deactivated when its types/aspects are parent to other models� types/aspects.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:15:36 +00:00
Alan Davis
e72f8ed937 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100243: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100165: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         99977: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
            - Filter inherited permissions before try to remove them
            - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:14:56 +00:00
Alan Davis
ac9b2206bc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100117: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99965: Merged DEV to 5.0.N (5.0.2)
         98656: MNT-13529 : Just-installed Alfresco does not return a CMIS latestChangeLogToken
            - Add initial change log token
         99911: MNT-13529 : Just-installed Alfresco does not return a CMIS latestChangeLogToken
            - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:06:50 +00:00
Alan Davis
a4a7c5f8e7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:00:01 +00:00
Alan Davis
8109be0920 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99772: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99715: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99478: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
            96530: MNT-13161: Disabling Archive Core in SOLR breaks admin-searchservice reporting for Alfresco core
               - Changed the logic of org.alfresco.repo.search.impl.solr.SolrChildApplicationContextFactory.getProperty(String) to gracefully parse the properties if one of the cores is missing.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100499 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:57:29 +00:00
Alan Davis
bc6720c6cc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99771: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99702: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99655: Reverse Merge V4.2-BUG-FIX (4.2.5)
            << Caused build failures >>
            99553: MNT-12628: Following on from MNT-12501 - Rollback of synchronous transactions is not behaving consistently
               - Added a static variable holding the RollbackOnly state to RetryingTransactionHelper. Currently used by RetryingTransactionInterceptor.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100498 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:57:20 +00:00
Alan Davis
ea2418e9be Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99769: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99700: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99635: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99570: MNT-11219: Incorrect behavior during alternate replication from multiple repositories.
            The fix for https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV41BUGFIX-JOB1-1279/test/case/7777610 test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100496 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:57:01 +00:00
Alan Davis
40d0ff9f62 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99768: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99699: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99634: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99442: Merged DEV to V4.1-BUG-FIX (4.1.10)
               99036:   MNT-13357: LDAP SSL Certificate not checked.
                 - Create custom socket factory for LDAPS.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100495 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:56:51 +00:00
Alan Davis
accd81fc21 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99766: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99697: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99632: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99437: MNT-11219 and MNT-13533: Merged DEV. V4.1-BUG-FIX (4.1.10) to V4.1-BUG-FIX (4.1.10):
                98490: MNT-11219: Incorrect behavior during alternate replication from multiple repositories.
                    - Pruning has been changed to be done for 'manifestRepositoryId' instead of 'fromRepositoryId', to avoid removals for repositories for which replication has not been initiated. Also the calculation of invasions has been modified to take into account the situation, when the folder is invaded only by one repository (by the source repository, from which this folder has come; MNT-11219). Additionally, the 'expectedChildNodeRefs' initialization was modified to resolve nodes from another repository by path, to avoid comparison of NodeRefs of two different repositories. This modification removes redundant and dangerous pruning. And it is needed for both MNT-11219 and MNT-13533


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100493 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:56:27 +00:00
Alan Davis
783c24a2a5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99764: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99695: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99553: MNT-12628: Following on from MNT-12501 - Rollback of synchronous transactions is not behaving consistently
            - Added a static variable holding the RollbackOnly state to RetryingTransactionHelper. Currently used by RetryingTransactionInterceptor.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100491 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:56:07 +00:00
Alan Davis
58aa01da0e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99691: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99496: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99400: Merged DEV to V4.2-BUG-FIX (4.2.5)
            99360 : MNT-13234 : Duplicate activities in activities feed
               - Added check for avoid duplicate activities
               - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:52:23 +00:00
Alan Davis
168da1866d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99533: Put back the package level methods overridden by the Cloud mock FileContentStore
    - The FileContentStore changes reduced some string parsing by calling different, internal
      methods.  Unfortunately, these are overridden in the Cloud build, to mimic the the behaviour of the TenantS3ContentStore.
    - Files were being written to tenant-specific stores but read from the general store, where they didn't exist.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-17 09:39:45 +00:00
Alan Davis
fc1cb0841f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99486: Merged DEREK/BM-0004 (5.1.0.BM4) to HEAD-BUG-FIX (5.1/Cloud)
      98804: Part 2:         ACE-1021    SOLR 4 - Sharding/Replication/Cluster/Cloud
      - SOLR 4 - support multiple stores requested via search parameters
      - explicit federation over a specified set of stores and related SOLR 4 indexes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99545 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-17 09:39:28 +00:00
Alan Davis
68759a226f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99398: Use TransactionalResourceHelper.getList and correct TransactionListenerAdapter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99506 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:37:16 +00:00
Alan Davis
ebeea13b8b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99377: BENCH-369: BM-0004: API and internals for Alfresco server
    - Move commons Math3 to 'core' project for general reuse
    - Clone NormalDistributionHelper class from Benchmark projects to Alfresco 'core'
    - API added: http://localhost:8080/alfresco/s/api/model/filefolder/load
      JSON:
      {
      "folderPath":"/Sites/t2/documentLibrary",
      "fileCount":"1",
      "minFileSize":"1024",
      "maxFileSize":"2048",
      "maxUniqueDocuments":"10000"
      }
    - Above JSON will create 1 file in the 't2' site document library with spoofed plain text
    - Change away from deprecated API for TransactionListenerAdapter
    - Fix imports and neatness
    - Improve FileNotFoundException details
    - Disable timestamp propagation on the parent folder to reduce CPU overhead
    - Document changes relating to the addition of cm:description properties
    - Add options to control generation of MLText cm:description fields
      - descriptionCount: number of cm:description translations to include
      - descriptionSize:  size in bytes of each cm:description translation
    - Use released 'alfresco-text-gen' V1.1
    - Use fixed text-gen component to prevent ArrayIndexOutOfBOunds
    - Tighten up error message when errors occur on reading content strings
    - Fix random seed generation bug


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99503 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:36:33 +00:00
Alan Davis
9e3ae9c8e4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99376: BENCH-371: BM-0004: Copy Alfresco and set up build plan
    - Modify FileContentStore to service 'spoof://' URLs
    - SpoofedTextContentReader to generate consistent text for URL
    - Fix FileContentStoreTest so that tests actually execute
    - Add override for @After so that no NPEs are thrown
    - Add tests for the 'spoof://' protocol
    - Some additional checks for IllegalArgumentException on SpoofedTextContentReader construction
    - Force delete of 'spoof' to return false but not fail with an exception
      This is handled neatly by the EagerContentStoreCleaner, which accepts that the stores may protect data according to their own needs e.g. Centera
    - Add spoofing option to FileFolderPerformanceTester
      290 files/s for 1K files vs 460 files/s for spoofed text files (no binary streaming required)
    - Start FileFolderLoader component that will be used by the API  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:35:57 +00:00
Alan Davis
43ffcaaaaa Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99297: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99194: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99083: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99042: Merged DEV to V4.1-BUG-FIX (4.1.10)
               98346 : MNT-13351 : MMT corrupts file names during module installation
                  - Use JarDriver to consider UTF8 files within an AMP


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99307 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-11 22:42:56 +00:00
Alan Davis
361b62755f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99080: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99031: Merged NESS/5.0.N-2015_03-04 (5.0.2) to 5.0.N (5.0.2)
         99041: MNT-13556 : Integrity check allows null values for mandatory properties
            - replaced "0" string with -1L


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99091 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-10 05:01:12 +00:00
Alan Davis
dcc1ce2994 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98999: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98978: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98931: MNT-13562: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            98757: Merged DEV to V4.1-BUG-FIX (4.1.10)
               94378 : MNT-6400: Issue with versioning and comments
                  - Ignore comments properties/aspects/children
               96791 : MNT-6400: Issue with versioning and comments
                  - Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99002 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-07 16:36:22 +00:00
Alan Davis
f764bfec04 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98998: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98976: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98929: Reverse Merge V4.2-BUG-FIX (4.2.5)
            98859: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
               98757: Merged DEV to V4.1-BUG-FIX (4.1.10)
                  94378 : MNT-6400: Issue with versioning and comments
                     - Ignore comments properties/aspects/children
                  96791 : MNT-6400: Issue with versioning and comments
                     - Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99001 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-07 16:36:10 +00:00
Alan Davis
af76d879cb Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98997: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98975: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98859: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            98757: Merged DEV to V4.1-BUG-FIX (4.1.10)
               94378 : MNT-6400: Issue with versioning and comments
                  - Ignore comments properties/aspects/children
               96791 : MNT-6400: Issue with versioning and comments
                  - Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99000 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-07 16:35:57 +00:00
Alan Davis
12c3514477 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98971: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98947: Merged DEV to 5.0.N (5.0.2)
         98946: MNT-13556 : Integrity check allows null values for mandatory properties
            - fixed failing tests and new issue caused by initial changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98987 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-07 08:08:37 +00:00
Alan Davis
19ba57da33 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98967: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98775: Merged NESS/5.0.N-2015_03_04 (5.0.2) to 5.0.N (5.0.2)
         98751: MNT-13556 : Integrity check allows null values for mandatory properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-07 08:07:55 +00:00
Alan Davis
a330f85a38 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98900: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98891: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98889: Reverse merged V4.1-BUG-FIX (4.1.10)
            << Caused a performance problem found in 5.0.1 testing >>
            Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
               93762: Fix for     MNT-13198    BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow 
               - use the bridge table to list sites.
               93802: Fix for     MNT-13198    BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow 
               - use hasSite to check for existence and fix person lookup case sensitivity configuration


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98956 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-06 22:37:09 +00:00
Alan Davis
0c51454940 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98899: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98890: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98886: Reverse merged V4.1-BUG-FIX (4.1.10)
            << Original commits for this issue caused a performance problem found in 5.0.1 testing >>
            98334: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
               98326: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
                 - Changed the PersonSitesRelation to use a faster API (SiteServiceImpl.listSiteMemberships(String, int)).
            98452: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
               - Corrected the solution to fix the build failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-06 22:36:57 +00:00
Alan Davis
d3331bcd0f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98874: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98718: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98561: Merged NESS/4.2.N-2015-02-10 (4.2.5) to V4.2-BUG-FIX (4.2.5)
            98467: MNT-13358 : Share fails to render imported documents when metadata has empty cm:creator or cm:modifier values
               - modified the username decorator and the people bean to handle empty usernames
            98550: MNT-13358 : Share fails to render imported documents when metadata has empty cm:creator or cm:modifier values
               - added unit tests and corrected formating of previous commit


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98951 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-06 22:36:03 +00:00
Alan Davis
bcd9bfd7bc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98723: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98580: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98457: Merged NESS/4.2.N-2015-02-10 (4.2.5) to V4.2-BUG-FIX (4.2.5)
            98405: MNT-13502 : Possible concurrency issue in StoreRedirectorProxyFactory
               - Used unmodifiable collection for redirectProtocolBindings and redirectedStoreBindings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98814 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-06 08:06:02 +00:00
Alan Davis
e99737fc8b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98720: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98568: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98334: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
            98326: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
              - Changed the PersonSitesRelation to use a faster API (SiteServiceImpl.listSiteMemberships(String, int)).
         98452: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
            - Corrected the solution to fix the build failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98811 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-06 08:05:06 +00:00
Alan Davis
1657b582c5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98423: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98310: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98244: Merged V4.2.3 (4.2.3.18) to V4.2-BUG-FIX (4.2.5)
            97968: Merged DEV to PATCHES/V4.2.3 (4.2.3.18)
               97890: MNT-13349: OpenCMIS bulkUpdateProperties method fails when run against more than one document
                  - Implemented Batch Processing for bulk update properties.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-03 23:41:16 +00:00
Tatyana Valkevych
c753d6dee3 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98317: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98235: MNT-13497: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         97915: MNT-13204: Long reindex times with nodes with Multiple Parents
            - Implement search.solrTrackingSupport.ignorePathsForSpecificAspects option to skip paths calculation for nodes with the defined aspects


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-03 11:45:59 +00:00
Tatyana Valkevych
28eca9cea1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98197: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98079: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         97973: Merged NESS/4.2.N-2015-02-10 (4.2.5) to V4.2-BUG-FIX (4.2.5)
            97883: MNT-13331 : Unfriendly error displayed to user while trying to complete a task once more
               - added check on task status in workflow/TaskFormPersister.java;
               - added localization for the error message in workflow/workflow-messages.properties;
               - added js condition to display a friendly error message in alfresco.js
            97924: MNT-13331 : Unfriendly error displayed to user while trying to complete a task once more


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98321 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-02 12:08:20 +00:00
Alan Davis
46a73e07e5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
97694: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97684: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         97652: Merged DEV to PATCHES/5.0.1 
          97486 : MNT-13315 : CLONE - Share SSOAuthenticationFilter and non-ascii username strings
           External authentication supports non-ASCII symbols for user name. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@97706 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-21 07:53:17 +00:00
Alan Davis
75c151e08d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
97693: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97683: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         97651: Merged DEV to PATCHES/5.0.1 (5.0.1)
            97532 : MNT-13418 : When performing upgrade with a tenant, patch.siteAdministrators and patch.alfrescoSearchAdministrators throw an error
               - Using AuthenticationUtils to get administrator's username


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@97705 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-21 07:53:00 +00:00
Alan Davis
a1e1f0791b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
97677: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97594: Merged DEV to 5.0.N (5.0.2)
         97048: MNT-13339: No exception is present in log files when Alfresco IMAP Service port is blocked
            - extended ImapServer class and overridden openServerSocket method to add exceptions logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@97698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-21 07:50:07 +00:00
Alan Davis
fb978c53cc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
97593: Merged NESS/5.0.N-2015_01-20 (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      97514: MNT-13392 : Rendition - Error in AbstractRenderingEngine with model param using FreemarkerRenderingEngine
         - FIxed isAssignbleFrom issue when FreemarkerRenderingEngine is using params; added new test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@97631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-20 15:04:58 +00:00