Commit Graph

5504 Commits

Author SHA1 Message Date
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
Tatyana Valkevych
5d45c38a06 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
97181: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97111: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         97019: Merged V4.2.0 (4.2.0.11) to V4.2-BUG-FIX (4.2.5)
            92266: MNT-12936: Temporary GenericCertificateIntegrityException causes repo to go into readOnly
             - Retry transaction if got GenericCertificateIntegrityException 
            92373: MNT-12936: Temporary GenericCertificateIntegrityException causes repo to go into readOnly
             - Remove stale try{}catch{}, modify unit test.
            92842: MNT-12936: Temporary GenericCertificateIntegrityException causes repo to go into readOnly
             - Use exception from repo for retrying
            92899: MNT-12936: Temporary GenericCertificateIntegrityException causes repo to go into readOnly
             - Fix unit test failing: use new exception that was introduced in original fix 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@97196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-17 10:02:44 +00:00
Alan Davis
33528c5045 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96980: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96874: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         96701: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            96519: Merged DEV (4.1.10) to V4.1-BUG-FIX (4.1.10)
               80890: MNT-12155 : Attempt to create a new rule or view existing rules fails with TypeError: Cannot find default value for object
               Added special handling of properties with a dot in the name.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96997 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-13 09:51:12 +00:00
Alan Davis
dc32dbc168 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96799: Remove unused '@Suppress...' annotations


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96860 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-12 07:54:53 +00:00
Alan Davis
cadf017c30 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96479: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96424: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         96414: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            96401: Merged DEV to V4.1-BUG-FIX 
             96343 : MNT-11041 : Share SSOAuthenticationFilter and non-ascii username strings
              'userHeader' for alfrescoHeader connector is detected to apply userName base64 encoded (support non-ASCII symbols) or not.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:33:50 +00:00
Alan Davis
b732ec7175 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96478: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96419: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         96413: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            96399: MNT-11041: Reverting previous commits 93709 and 93669


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96507 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:33:41 +00:00
Alan Davis
5331b3925d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96473: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96360: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         96323: Reverse Merge V4.2-BUG-FIX (4.2.5)
            << Reverted as build has been broken for 4 days >>
            95704: Merged DEV to V4.2-BUG-FIX (4.2.5)
               94398: MNT-13234 : Duplicate activities in activities feed
                  - Changed getFollowers() method with implementing username case sensitive specific, like it done in getSiteMembers() method.
               94483: MNT-13234: Duplicate activities in activities feed
                  - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:32:52 +00:00
Alan Davis
34b24b7d07 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96472: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96359: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         96305: MNT-13212: Merged DEV to V4.2-BUG-FIX (4.2.5)
            96032: MNT-13212: Details of tasks assigned to any user are visible to all users via API call
               - Restore workflow permission check in interceptor for getAssignedTasks and getPooledTasks methods. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:32:43 +00:00
Alan Davis
bc748b7f22 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96471: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96358: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         95704: Merged DEV to V4.2-BUG-FIX (4.2.5)
            94398: MNT-13234 : Duplicate activities in activities feed
               - Changed getFollowers() method with implementing username case sensitive specific, like it done in getSiteMembers() method.
            94483: MNT-13234: Duplicate activities in activities feed
               - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96500 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:32:33 +00:00
Alan Davis
a069bf7000 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96412: Merged DEV to HEAD-BUG-FIX (5.1.0)
      94103: ACE-3729: unhandled Exception: org.springframework.dao.CannotAcquireLockException on Cloud Staging
         - JobLockRefreshCallback will be used to refresh a lock.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96497 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:32:05 +00:00
Alan Davis
90d417a6a9 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
95988: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94475: Merged DEV to 5.0.N (5.0.1).
         94140: MNT-13010: CIFS: CIFS desktop action ShowDetails is absent. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-04 07:43:30 +00:00
Alan Davis
0e93619358 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
95987: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94457: Merged DEV (5.0.1) to 5.0.N (5.0.1)
         94445: MNT-12995: Items are not accessible using the urls received via IMAP
         Added a patch which replaces the IMAP template's content.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96016 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-04 07:43:17 +00:00
Alan Davis
7d2b335d5d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
95986: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94456: Merged DEV (5.0.1) to 5.0.N (5.0.1)
         94352: MNT-12995: Items are not accessible using the urls received via IMAP
         Changed the URLs in IMAP templates to point to Share instead of Explorer(EOL).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-04 07:42:57 +00:00
Alan Davis
8c6c739a5e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
95693: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94442: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         94393: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
            94233: MNT-12802: CachingContentStore Quota & Performance
            Made the quota thresholds configurable.
            Introduced a property to configure a gap between normal cleanups.
            Changed cachingContentStoreCache configuration.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-02 10:05:36 +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
0f26537193 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94149: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94086: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         94049: MNT-8810: Audit: Double READ on first Share preview
            - Fixed build failure for V4.2-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:33:29 +00:00
Alan Davis
c98ab72301 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94147: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94085: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         94037: Merged DEV to V4.2-BUG-FIX (4.2.5)
            94032 : MNT-13118 : VersionService randomly returns unexpected results
               - Throw ConcurrencyFailureException if there is version inconsistency


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95048 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:33:17 +00:00
Alan Davis
68e217aa0b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94145: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94083: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93997: Merged DEV to V4.2-BUG-FIX
            93952: MNT-12841: Xenit Fred: AuthorityService is not public but should be
             - Mark AuthorityService and dependencies as AlfrescoPublicApi 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95046 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:32: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