Commit Graph

14 Commits

Author SHA1 Message Date
Raluca Munteanu
6afb44e712 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
8674e2bfc8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Tatyana Valkevych
e11febd09e Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)
110088: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
      110052: MNT-14579: TS starting in read-only mode after applying 5.0.2 build 64
       - This intermittent issue was probably caused by the SysAdminParams.afterPropertiesSet
         checking for a valid dictionary.  If this call took place too early, then it would
         never allow the system to be in read-write mode unless rebooted.
       - Removed the dictionary check from SysAdminParamsImpl; it is now only responsible for the 'server.allowWrite' property
       - Call the TransactionServiceImpl's read-write veto code if the 'server.allowWrite' property changes
       - Better logging when vetoes are placed but also when vetoes are removed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-17 11:47:37 +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
6871012e46 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92474: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92384: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92310: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            92297: MNT-9899: Change default value for db.pool.max to 275
            Reenabled the ConnectionPoolOverloadTest.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94883 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:51:58 +00:00
Alan Davis
99a54ab938 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92471: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92381: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92307: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            92294: Merged DEREK/MNT-9899-V42 (4.2.3) to V4.1-BUG-FIX (4.1.10)
               71894: MNT-9899 : Change default value for db.pool.max to 275
               Hardened the test to rollback all of the opened transactions.
               Added installer configuration to set the max_connections of the shipped PostgreSQL. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94880 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:51:28 +00:00
Mark Rogers
4e0c564d02 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84690: Merged ACE-2801 to HEAD-BUG-FIX (5.0.0)
      Fix ACE-2801: Method signature change for AlfrescoTransactionSupport.bindListener
         - Added tests for the older method as well.
         - Deprecated repo version of the TransactionListenerAdapter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85097 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:16:42 +00:00
Will Abson
bfc837b9d7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71628: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      71467: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         71466: MNT-9899 : Change default value for db.pool.max to 275
         Fixed the test hanging if db.pool.wait.max=-1 and disabled the test as it is not necessary until valid configuration is discovered.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:33:19 +00:00
Will Abson
21670732fa Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71604: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70359: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70323: Merged DEV to V4.1-BUG-FIX (4.1.9)
            70317: MNT-9899 : Change default value for db.pool.max to 275
            Converted CannotCreateTransactionException to the new ConnectionPoolException when the DB connection pool is depleted.
            Implemented test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:31:17 +00:00
Alan Davis
5763abbf6d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69949: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69867: Fix handling of non-propagating transactions embedded in write transactions that have been forced writable (MNT-11310)
       - Test to demonstrate the failure
       - Regardless of whether a RetryingTransactionHelper was going to create a new transaction (non-propagating) or not,
         it did a sanity check of its read-write state against the desired state.  This was kicking things out for cases
         where the RetryingTransactionInterceptor should just have been going along with the current transaction.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:09:47 +00:00
Alan Davis
b00157153f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63647: Fixed ACE-290: ServiceRegistry.getRetryingTransactionHelper has been deprecated, with no public alternative
    - Removed final bits of deprecation required for ACE-290
    - Added test to ensure that ALF-18718 does not regress (need new instances of RetryingTransactionHelper)
    - Cleaned up pointless 'Non-Javadoc', added @Override, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:29:01 +00:00
Alan Davis
8a8cf1b81a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59123: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59111: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59070: Merged DEV to V4.1-BUG-FIX (4.1.8)
            58849: MNT-10096: MT: AbstractTenantRoutingContentStore can return null list of stores
              - Ensure that RetryingTransactionHelper starts a transaction in txn-after-completion phase (MNT-9806).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:06:17 +00:00
Alan Davis
068939e250 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58376: Added additional tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61971 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:20:56 +00:00
Samuel Langlois
ab4ca7177f Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00