Commit Graph

6091 Commits

Author SHA1 Message Date
Alan Davis
53bdfb6e2a Merged V4.2-BUG-FIX (4.2.1) to HEAD (Cloud/4.3)
56439: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
      Merged V4.1.6 (4.1.6) to V4.1-BUG-FIX (4.1.7)
         56437: MNT-8891: Reverse merged in V4.1.6
            - Missing change to WikiServiceImplTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-14 17:24:07 +00:00
Alan Davis
ca7478955b Merged V4.2-BUG-FIX (4.2.1) to HEAD (Cloud/4.3)
56434: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
      Merged V4.1.6 (4.1.6) to V4.1-BUG-FIX (4.1.7)
         56432: MNT-8891: Reverse merged in V4.1.6
            51111: MNT-8891 Spaces in wiki page's title are replaced by underscores
            In name property spaces replased on "%20".
            51341: MNT-8891: Deleted the line of code where it was substituting whitespaces in the wiki's title with underscores (This might have been missed during merging. rev: 51111).
            ALF-19020: Added code to remove the leading and trailing whitespaces in the wiki's title.  
            52729: MNT-8891: Fixed wiki's title renaming issue by adding code to remove the leading and trailing whitespaces in the wiki's title instead of replacing all the whitespaces with underscores.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56641 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-14 17:23:38 +00:00
Kevin Roast
2806038302 Updated version and schema properties for final 4.2.e Community release (confirmed with Samuel)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56596 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-14 09:36:32 +00:00
Frederik Heremans
0fe59ba78d ALF-20268: Altered "maxAuthoritiesForPooledTasks" value to more sensible default
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56526 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-11 09:08:25 +00:00
Mark Rogers
c3ea90dbc5 add comment to unit test so we can see which assert is failing.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56428 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-09 14:14:16 +00:00
Mark Rogers
1122e25137 ALF-19527 - No description and unfriendly result are got for patch.emailAliasableAspect
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56427 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-09 14:13:09 +00:00
Frederik Heremans
35de5d1ff1 ALF-20240: Fixed issue with non-localized task title in notification email
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-08 18:57:43 +00:00
Samuel Langlois
7e49140c4a Update version to 4.3.0 (except for community, still 4.2.e), pom files to 4.3.0-SNAPSHOT and version.schema to 7000
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-08 16:01:10 +00:00
Steven Glover
787abaaf4e ALF-20169 "cmis:secondary type properties are not visible " : fix failing build tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-02 07:55:18 +00:00
Pavel Yurke
ee8816e7af ALF-19942 : Failed to displayed Process Engines page in Admin Console after creation of workflow by tenant user
- Fixed failing unit tests.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56220 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-01 17:34:19 +00:00
Andrew Hind
4ffade2d96 Fix for ALF-20173 Alfresco TAGS Exceptions: java.lang.ArrayIndexOutOfBoundsException: 1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-01 10:04:44 +00:00
Steven Glover
4034089d18 ALF-20169 "cmis:secondary type properties are not visible " : fix + build tests (though I'm going to do a bit more testing), removal of unused imports, slight refactoring of some tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56189 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-01 09:48:22 +00:00
Brian Remmington
1521b6b76f Fixes ALF-19964: Breaking API change in JobLockService.releaseLock
- Reverted releaseLock to return void
- Added "releaseLockVerify" that returns boolean

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56164 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-30 11:52:50 +00:00
Gloria Broadbent
d27eecf069 BRAZILIAN PORTUGUESE: Fix for ALF-20159
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56162 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-30 11:50:52 +00:00
Gloria Broadbent
b310cfdd58 RUSSIAN: new strings in Russian bundle based on EN rev55893
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56157 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-30 11:43:57 +00:00
Pavel Yurke
0932f9eea0 ALF-19942: Failed to displayed Process Engines page in Admin Console after creation of workflow by tenant user
Do special tenant specific filtering for WorkflowInstances and TaskInstances: for default tenant all instances included, for other tenants - only tenant-specific.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56139 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-30 08:31:34 +00:00
Andrew Hind
2429d0a852 Reversed revision 56078
Fix for     ALF-20138   Metadata query results include nodes that would be hidden (ie not indexed) in SOLR or lucene 
    Fix for     ALF-20148   Hidden files such as surf-config are visible in dashlets etc. after upgrade from 4.0.2 > 4.2.0 if using MDQ


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56096 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-27 14:04:15 +00:00
Andrew Hind
5081066738 Fix for ALF-20138 Metadata query results include nodes that would be hidden (ie not indexed) in SOLR or lucene
Fix for     ALF-20148   Hidden files such as surf-config are visible in dashlets etc. after upgrade from 4.0.2 > 4.2.0 if using MDQ

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56078 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-27 09:26:51 +00:00
Gloria Broadbent
180341ae5f SIMPLIFIED CHINESE: new strings in Simplified Chinese file based on EN rev55893
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-27 07:22:22 +00:00
Gloria Broadbent
2e440bcaae DUTCH: new strings in Dutch file based on EN rev55893
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56069 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-27 07:21:09 +00:00
Gloria Broadbent
09caddc64d NORWEGIAN: new strings in Norwegian (Bokmal) file based on EN rev55893
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56068 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-27 07:20:21 +00:00
Gloria Broadbent
22f9a379f3 JAPANESE: new strings in Japanese file based on EN rev55893
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56067 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-27 07:19:08 +00:00
Gloria Broadbent
4343d163ee ITALIAN: new strings in Italian file based on EN rev55893
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56066 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-27 07:18:16 +00:00
Gloria Broadbent
14d0f4f03a FRENCH: new strings in French file based on EN rev55893
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56064 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-27 07:17:14 +00:00
Gloria Broadbent
33b4e9b89f SPANISH: new strings in Spanish file based on EN rev55893
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56063 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-27 07:16:21 +00:00
Gloria Broadbent
9f485fc900 GERMAN: new strings in German file based on EN rev55893
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56062 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-27 07:15:43 +00:00
Matt Ward
e0ff9648ae Removed concurrency lock methods from LockStore and implementations (ALF-20031)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56052 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-26 16:29:02 +00:00
Matt Ward
1a339d90db Caching content store's in-memory cache should be local, i.e. non-distributed.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56024 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-26 10:09:48 +00:00
Derek Hulley
0b7bceb769 Add a bit more 'wiggle room' to the timeout test, which missed the cutoff by 8ms, and fixed formatting
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56009 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-26 03:30:36 +00:00
Derek Hulley
6f5e0966bf Fix formatting during investigations
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56001 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-25 21:59:04 +00:00
Andrew Hind
7306ddb215 More fixes for ALF-19690 CMIS TCK Test Failures
- fixed multi-tenancy impact for PARENT queries
- while this looks like a big impact it is an API change and a fix in one section of common code - which is covered by the CMIS API test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55967 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-25 14:07:48 +00:00
Andrew Hind
d9deb51e29 Build fix - remove tests that use meta-data query +multi-tenancy
- fix 3.4 CMIS api to use metadata query

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55965 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-25 13:35:19 +00:00
Alex Mukha
71cf67b6fe Merged DEV to HEAD (4.2)
55905: ALF-20066 : Changes made on any page of admin system-summary are not synchronised between nodes
   The DefaultPropertyBackedBeanRegistry was made transaction aware if the transaction is present, to ensure the transaction
   modifications to be replicated to other nodes in the cluster before the node restart signal is sent to them.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-25 07:01:30 +00:00
Steven Glover
7735720353 ALF-20118 "appendContentStream causes VersionServiceException" workaround for bug in Chemistry OpenCMIS libraries means that objectId is not being returned from appendContentStream
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-24 21:12:50 +00:00
Andrew Hind
b891428c34 Build fix for failing TCK tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55921 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-24 20:45:29 +00:00
Frederik Heremans
998621d807 CLOUD-2081: cloud-worklfow tasks shouldn't allow users to add/remove content from package
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-24 13:57:48 +00:00
Frederik Heremans
c50bc56921 WOR-107: String properties that exceed DB-column TEXT_ max length are stored as binary automatically
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55894 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-24 12:25:28 +00:00
Matt Ward
4055228bdb Merged BRANCHES/DEV/mward/head_locktry_fix to HEAD:
55423: ALF-20031: LockStore is no longer used as a cache for persistent locks - it only holds Lifetime.EPHEMERAL locks.
   55458: ALF-20031: added repeatable read within transactions to LockStores
   55461: ALF-20031: moved transactional test code into separate test classes to avoid clutter.
   55470: ALF-20031: added test for LockStore reads when no transaction is available.
   55473: Generated LockState.toString() to aid debugging, stack trace clarity etc.
   55481: ALF-20031: added tests for null value behaviour (transactional repeatable reads).
   55663: ALF-20031: (work in progress, broken tests) removing concurrency locks from AbstractLockStore.
   55664: ALF-20031: moved inner Thread classes to anonymous inner classes as there will be more of these coming.
   55675: ALF-20031: fixed AbstractLockStoreTxTest
   55681: ALF-20031: added more test cases to AbstractLockStoreTxTest
   55683: Added missing tests to enterprise.repo.cluster package's BuildSafeTestSuite.
   55684: ALF-20031: Fix HazelcastLockStoreTest to clear lock store backing map in createLockStore() fixture setup.
   55688: Commented LockStore.clear() as a DO NOT USE method.
   55694: ALF-20031: removed LockStore.contains() as this is not required, and was currently unsafe (no repeatable reads).
   55696: ALF-20031: Fix AbstractLockStore.clear(): was not clearing transactionally scoped map.
   55700: ALF-20031: removed concurrency locks from LockServiceImpl.getLockState(NodeRef)
   55712: ALF-20031: removed concurrency lock from LockServiceImpl.lock()
   55716: ALF-20031: removed lockstore locking from LockableAspectInterceptor.
   55718: ALF-20031: renamed method to isEphemeralLock()
   55719: ALF-20031: removed concurrency lock from LockServiceImpl.unlock()
   55728: ALF-20031: added cm:lockLifetime property to content model, and added persistence within lockservice.
   55732: ALF-20031: LockableAspectInterceptor no longer uses ephemeral lockstore for setProperties() handling.
   55753: ALF-20031: upon tx rollback, ephemeral locks are now rolled back to the last known value, rather than always being unlocked.
   55759: ALF-20031: temporary fix, AbstractLockStoreTxTest needs further attention for thread coordination.
   55760: ALF-20091: disabled spawning of new transactions in LockKeeperImpl.refreshAllLocks()
   55767: ALF-20031: changed AbstractLockStore to use getFullyAuthenticatedUser() instead of getRunAsUser().
   55833: ALF-20091: reverted LockKeeperImpl to previous (create new tx) behaviour. Altered test to use separate transactions per lock phase.
   55855: ALF-20031: fixed ReplicationServiceIntegrationTest, LockableAspectInterceptor's handling of cm:lockLifetime.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55893 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-24 12:14:46 +00:00
Andrew Hind
50bf8c4948 Fix for ALF-19690 CMIS TCK Test Failures
- queries for checked out docs go to the DB

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55865 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-23 19:04:40 +00:00
Andrew Hind
4025646982 Fix for MNT-8840 Incorporate the Solr RAM capacity planning formula into the Solr admin page
Fix for  MNT-8662 	capacity planning: document formula to calculate the disk space needed by the DB

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-23 11:51:39 +00:00
Alan Davis
edba25bbac Merged HEAD-BUG-FIX to HEAD (4.2)
55814: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
      55813: MNT-9643: Merged DEV to V4.1-BUG-FIX (4.1.7)
         55733: ALF-19912 : Impossible to upload/create content when lifecycle workflow
         is deployed
         Added a MessageService wrapped in a transaction interceptor for
         org.alfresco.service.cmr.i18n.MessageLookup interface.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55816 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-23 07:15:25 +00:00
Greg Melahn
8ff70d0542 Added Annotation for Alfresco Public API per ALF-19471
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-22 21:05:30 +00:00
Greg Melahn
5dc418c9e5 Add additional annotations of Alfresco Public API per ALF-19074
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55804 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-22 21:05:02 +00:00
Alan Davis
0d3580b1c8 Merged HEAD-BUG-FIX to HEAD (4.2)
55488: MNT-9648: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
      55001: Merged DEV to BRANCHES/DEV/V4.1-BUG-FIX:
         54951: Test to reproduce MNT-9580: Daisy chained cm:original associations are cascade-deleted when the first original is deleted
         54952: Fix MNT-9580: Daisy chained cm:original associations are cascade-deleted when the first original is deleted
               When an aspect is removed, the associations defined on the aspect were also being removed.
               However, the *inbound* associations instances were also being removed; in effect the behaviour of aspects on
               other nodes was being activated, which is incorrect.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-21 16:07:46 +00:00
Alan Davis
9e406a53ba Fix TransformerConfigImplTest test failure
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-21 07:35:21 +00:00
Alan Davis
f25a37e97c Merged HEAD-BUG-FIX to HEAD (4.2)
55504: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
      55467: Merged V4.1.6 (4.1.6) to V4.1-BUG-FIX (4.1.7)
         55414: Speculative fix to allow retrying to proceed during concurrent node modification
          - I suspect that DB2 choosing a different connection to kick out from the other DBs
          - MNT-9598: RenditionServiceIntegrationTest failing on DB2 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55785 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-20 20:51:06 +00:00
Alan Davis
43b8974563 Merged HEAD-BUG-FIX to HEAD (4.2)
55501: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
      << Had a conflict on merge - think it is okay >>
      55463: Merged V4.1.6 (4.1.6) to V4.1-BUG-FIX (4.1.7)
         55227: MNT-9074: Merged V4.1.6-PATCHES-2013_09_03 to PATCHES/V4.1.6
          55046: MNT-9074 : My Tasks fails to render if tasks quantity is excessive
          Were implemented code for getting definite count of workflow instances and applying them to page. It makes the opening page more quickly.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55782 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-20 20:49:30 +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
b4dbcde79d Merged HEAD-BUG-FIX to HEAD (4.2)
55487: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
      54917: Follow up to fixes for MNT-9462:
       - Remove pattern where lock-try is in the try-finally block, thereby forcing conditional unlocking
         If the lock is not achieved, then the finally block is not needed so the try-lock can go outside.
       - Fixed lock upgrade to use check, upgrade and recheck; now it's less like the script of Inception


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55776 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-20 20:44:54 +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