Commit Graph

670 Commits

Author SHA1 Message Date
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
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
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
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
eba15572e6 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99489: Put tests back because they are not the issue (revert r99483)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99509 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:37:39 +00:00
Alan Davis
0e45287a6d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99483: Comment tests until we figure out how they are not working with other tests in the suite ... when run in Cloud build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:37:31 +00:00
Alan Davis
64627b758a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99399: Fix tests to dodge leaked security contexts from other tests in the suite and handle MLText better (BENCH-369)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99507 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:37:24 +00:00
Alan Davis
10cfe880d5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99397: Move tests into the suite (BENCH-369)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99505 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:37:08 +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
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
2443a9b771 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98969: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98862: Merged NESS/5.0.N-2015_03_04 (5.0.2) to 5.0.N (5.0.2)
         98854: MNT-13556 : Integrity check allows null values for mandatory properties
            - fixed failing tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98985 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-07 08:08:16 +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
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
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
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
Alan Davis
85f8b90098 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
95994: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      95823: MNT-12995: Items are not accessible using the urls received via IMAP
         - Modified the test to pass accordingly to the new IMAP message.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96023 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-04 07:45:02 +00:00
Alan Davis
b0d61a119b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
95993: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      95821: Reverse Merge 5.0.N (5.0.1)
         <<Not required>>
         95738: MNT-12995: Items are not accessible using the urls received via IMAP
         Modified the test to correspond with the new IMAP message.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96022 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-04 07:44:52 +00:00
Alan Davis
a4ca80e93c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
95990: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      95738: MNT-12995: Items are not accessible using the urls received via IMAP
      Modified the test to correspond with the new IMAP message.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96019 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-04 07:44:22 +00:00
Alan Davis
f0546e3819 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94379: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94324: Merged DEV to V5.0.N (5.0.1)
         94107: MNT-13084: Invitation email to the site are not received
            - Support both Object[] and List<> subject params.
         94248: MNT-13084: Invitation email to the site are not received
            - Add support for String value in PARAM_SUBJECT_PARAMS
            - Add unit test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95080 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:40:04 +00:00
Alan Davis
d623b63418 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94234: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94203: Reverse Merge 5.0.N (5.0.1)
        <<Caused build failures after 94116>>
        93680: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
        Fixed AuthenticationTest and RenditionServiceIntegrationTest not to hang on MS SQl Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95060 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:36:07 +00:00
Alan Davis
3929596255 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94232: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94116: MNT-13089 Reinstate the tests that had been disabled on SQLServer, before we understood the problem was with transaction isolation
      Reverted following commits:
         93292: Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelCreate in case of SQL Server
         93342: Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelDelete in case of MS SQl Server.
         93522: Disabled org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionRestore and org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionPurge in case of MS SQL Server.
         93680: Disabled org.alfresco.repo.rendition.RenditionServiceIntegrationTest.testCompositeReformatAndResizeRendition in case of SQL Server
         93772: Disabled for MS SQL Server AuthenticationTest.testLoginNotExistingTenant, RenditionServiceIntegrationTest.testALF3733, RenditionServiceIntegrationTest.testJavascriptAPI.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:35:56 +00:00
Alan Davis
8d0db021a5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94144: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94082: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93943: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            93775: Merged DEV to V4.1-BUG-FIX (4.1.10)
               93465: MNT-8810 : Audit: Double READ on first Share preview
                  - Audit READ for cm:content no longer occurs when thumbnail is created or read.
                  - Audit READ for cm:thumbnail occurs when content of doclib or webpreview is read.
            93874: MNT-8810 : Audit: Double READ on first Share preview
               - Fixed test failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95045 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:32:45 +00:00
Alan Davis
cb9064aa14 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94142: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94079: Merged DEV to 5.0.N (5.0.1)
         93735 : MNT-13078: Office2013 : Incorrect version history for .xlxs files created via CIFS
            - Added shuffle scenario for MS Excel 2013
         94001 : MNT-13078: Office2013 : Incorrect version history for .xlxs files created via CIFS
            - Added a test for "MultipleRenameShuffle" pattern


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95043 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:32:16 +00:00
Alan Davis
df3bc3d923 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94078: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94055: MNT-13089 Integration tests hanging on SQL Server
        Set the db.txn.isolation system property to 4096 when running on SQLServer - this was probably the problem from the beginning
        Plug back tests MultiTServiceImplTest.testGetName(), MultiTServiceImplTest.testGetUserDomain() and SubscriptionServiceActivitiesTest.testFollowingActivity() on SQLServer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95041 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:31:54 +00:00
Alan Davis
4c2947f897 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94076: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94047: MNT-12705 : Cannot upgrade Xalan to 2.7.2 because DbObjectXMLTransformerTest fails
         - Test has been changed according to new SAXTransformer behavior


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95040 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:31:42 +00:00
Alan Davis
0fc76cf7ca Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94042: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94000: Merged DEV to 5.0.N (5.0.1)
         91309,91311 : MNT-12705 : Cannot upgrade Xalan to 2.7.2 because DbObjectXMLTransformerTest fails
            - Put STANDALONE to transformet to force newline after xml declaration. pox.xml dependency is changed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95035 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:30:47 +00:00
Alan Davis
aad85cd6f9 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93993: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93950: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
      Disabled MultiTServiceImplTest.testGetName in case of MS SQL Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95031 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:29:30 +00:00
Alan Davis
f1ebfb963f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93992: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93945: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93895: MNT-12873: Merged V4.2.3 (4.2.3.16) to V4.2-BUG-FIX(4.2.5)
            93552 :Merged DEV to V4.2.3 (4.2.3.16)
               93524: MNT-13156: CLONE - Introduction of SiteRole in 4.2.x breaks sites API when there is a custom role defined
                  - Implement site role as String instead of enumeration to allow custom roles. Add CustomRoleTest Unit Test. In SitesImpl convert UnknownAuthorityException into InvalidArgumentException.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:29:20 +00:00
Alan Davis
35771b4879 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93988: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93891: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
         - Disabled SubscriptionServiceActivitiesTest.testFollowingActivity and MultiTServiceImplTest.testGetUserDomain in case of MS SQL Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95028 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:28:53 +00:00
Alan Davis
151537105d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93938: Merged BRANCHES/DEV/mward/post50_hbf_fixes to BRANCHES/DEV/HEAD-BUG-FIX:
      93561: Cache stats: Fixed concurrency issue with 'get' count. Added method to retrieve stats snapshot.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95014 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:26:15 +00:00
Alan Davis
f1cfb74849 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93839: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93772: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
      Fixed RenditionServicePermissionsTest.userWithoutDeleteAccessToNodeShouldNotCauseFailedThumbnailProblemsOnUpdate.
      Disabled for MS SQL Server AuthenticationTest.testLoginNotExistingTenant, RenditionServiceIntegrationTest.testALF3733, RenditionServiceIntegrationTest.testJavascriptAPI.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95000 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:23:40 +00:00
Alan Davis
001e1846db Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93833: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93717: Merged DEV (5.0.1) to 5.0.N (5.0.1)                                                                                                                                                                                                          
         93680: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server                                                                                                                                                                            
         Fixed AuthenticationTest and RenditionServiceIntegrationTest not to hang on MS SQl Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94994 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:31:57 +00:00
Alan Davis
33a3a89e34 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93784: ALF-21099 - Unit test correction.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94992 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:31:25 +00:00
Alan Davis
c9ca04c8dc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93668: ALF-21099 - MailActionExecutor.java doesn't support sending email by doing CC/BCC


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94991 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:31:16 +00:00
Alan Davis
127d6c6ca8 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93591: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93523: Merged DEV (5.0.1) to 5.0.N (5.0.1)
         93517: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
         Fixed MultiUserRenditionTest.testRenditionOwnerHasChangedAfterSourceOwnerChange() to run on MS SQL Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:28:35 +00:00
Alan Davis
faf2708844 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93590: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93522: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
      Disabled org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionRestore and org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionPurge in case of MS SQL Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94977 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:28:25 +00:00
Alan Davis
0ac6c532d7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93533: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93417: Merged DEV (5.0.1) to 5.0.N (5.0.1)
         93411: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
         Fixed DictionaryRepositoryBootstrapTest to run on MS SQL Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94963 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:25:42 +00:00
Alan Davis
d40f2568b0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93378: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93342: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
      Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelDelete in case of MS SQl Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:22:10 +00:00
Alan Davis
a1ca7da9e8 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93368: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93293: Merged DEV (5.0.1) to 5.0.N (5.0.1)
         93287: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
         Modified DictionaryModelTypeTest to execute before test actions in a separate transaction to pass on MS SQL Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94954 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:21:18 +00:00
Alan Davis
c3d26637a4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93367: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93292: Merged DEV (5.0.1) to 5.0.N (5.0.1)
         93020: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
         Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelCreate in case of SQL Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94953 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:21:08 +00:00
Alan Davis
744d19fdae Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93247: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93129: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93098: MNT-12849 "My Sites public API is not returning the expected list of sites"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:14:27 +00:00