inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,628 Commits 339 Branches 2,245 Tags
ddbcd88aa11b17a2d3952bea1a4e2da29ea9e101
Commit Graph

9 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
5cd7deadec Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
104023: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103943: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         103908: Merged DEV to V4.2-BUG-FIX (4.2.5)
            103901 : MNT-13575 : Incorrect behaviour in org.alfresco.rep.i18n.MessageServiceImpl.java
               - Fixed getMessage(messageKey,locale) method according to the locale being passed
               - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104118 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-05-13 16:23:04 +00:00
Will Abson
93bf623381 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud) 
71624: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      71395: Merged PATCHES/V4.2.2 to V4.2-BUG-FIX (4.2.3)
         70201 : Merged DEV to PATCHES/V4.2.2
            70132 : MNT-11098 : 'Failed to get lock java.util.concurrent.locks.ReentrantReadWriteLock$ReadLock' error occurs during the startup
               - cluster.type changed to invalidating for resourceBundleBaseNamesSharedCache, loadedResourceBundlesSharedCache and messagesSharedCache
            70138 : MNT-11098 : 'Failed to get lock java.util.concurrent.locks.ReentrantReadWriteLock$ReadLock' error occurs during the startup
               - Test for MessageServiceImpl. Cache entries shouldn't be modified directly
            70187 : MNT-11098 : 'Failed to get lock java.util.concurrent.locks.ReentrantReadWriteLock$ReadLock' error occurs during the startup
               - Cache's entries is wrapped in unmodifiable collections


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74707 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-06-25 15:32:48 +00:00
Alan Davis
893c902a2d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
58390: Added more tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61973 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 23:22:57 +00:00
Alan Davis
e5e97719b3 Merged HEAD-BUG-FIX to HEAD (4.2) 
55489: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
      55002: Improved handling of deadlocks and improved test
         - MNT-9517 Deadlock when binding class behaviours during bootstrap    
         - MNT-9462 : WebContainer threads are deadlocked
         Added the LockTryException to RetryingTransactionHelper
         Test was waiting 1s for lock resolution, which would have been fine if it didn't also have to include
         actual dictionary/message initialization.  I also changed deadlock threads so that they run with full
         retrying and ensure that both threads succeed despite the deadlock.  To observe, run the
         MessageServiceImplTest with the following:
               log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=TRACE


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-09-20 20:45:36 +00:00
Alan Davis
9dabcdda93 Merged HEAD-BUG-FIX to HEAD (4.2) 
55486: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
      54914: Merged DEV to BRANCHES/DEV/V4.1-BUG-FIX:
         54811: Unit test for MNT-9462 : Demonstrate deadlock between DictionaryService and MessageService
         54899: MNT-9462 : WebContainer threads are deadlocked
         Relies on MNT-9517 changes as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-09-20 20:44:21 +00:00
Derek Hulley
d86666e0ea Removed diff-destroying tabs 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55178 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-09-10 12:22:15 +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