Commit Graph

31 Commits

Author SHA1 Message Date
Alan Davis
68f7ce770e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
91057: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud)
      90986: MNT-11732: ephemeral locks have configurable threshold over which locks will be automatically made persistent instead.
      By setting the new property, administrators may control how ephemeral locks are created, for example:
      property alfresco.ephemeralLock.expiryThresh=30
      This will mean that when a LockService client requests that an ephemeral lock is created with a timeout of greater than 30 seconds, the lock will be created as a persistent lock instead (the ephemeral lifetime request is vetoed).
      By setting this property to -1, ALL locks will be created as persistent locks (giving the old, pre-ephemeral locking behaviour). By leaving this at the default (48 hours) the newer locking behaviour is completely unaffected, e.g. ephemeral locks may be created with up to 48 hour expiry time and over this limit an exception is thrown (and the lock is not created).
      By setting the value to something in between these settings it is possible to have quite a nice balance of behaviour. Using the example of 30 seconds, as above, will mean that using Share's "Edit Online" to edit a document in MS Word will result in a persistent lock (as MS Word requests approx 1 hour for its locks). After Solr has performed its next incremental index, then the Word document may be seen in the "Document's I'm Editing" filter in Share, since this is a persistent (in-DB) lock.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:11:51 +00:00
Pavel Yurke
7cf754053f Merged DEV to HEAD (5.0)
85993 : ACE-2181 : Non-owner cannot execute cancel editing for content
      - Tests changes according to new lock store behavior 
   86133 : ACE-2181 : Non-owner cannot execute cancel editing for content
      - Added test case - attempt to unlock node by user who has ALL_PERMISSIONS 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86239 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-02 09:43:43 +00:00
Pavel Yurke
ef5954a1a4 Reverse merged HEAD (5.0/Cloud)
<< Put the code back to HEAD >>
   86049 : Reverse merged HEAD (5.0/Cloud)
      << Cause of 4 errors in https://bamboo.alfresco.com/bamboo/browse/ALF-ENT-141 >>
      85880: ACE-2181 : Reverse Merge HEAD (5.0)
         << Implementing another approach for MNT-10946 and ACE-2181 >>
         Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
            71600: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
               70349: Merged DEV to V4.2-BUG-FIX (4.2.3)
                  70294 : MNT-10946 : Admin is no longer able to unlock files
                     - Check if node is locked before unlock for non-admin or System users. Fix related test
      85881: ACE-2181 : Merged DEV to HEAD (5.0)
         76214 : MNT-10946 : Admin is no longer able to unlock files
            - Drop check for lockowner from AbstractLockStore.set. Fix related test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86238 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-02 09:39:02 +00:00
Alan Davis
b8ddc53af2 Reverse merged HEAD (5.0/Cloud)
<< Cause of 4 errors in https://bamboo.alfresco.com/bamboo/browse/ALF-ENT-141 >>
   85880: ACE-2181 : Reverse Merge HEAD (5.0)
      << Implementing another approach for MNT-10946 and ACE-2181 >>
      Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
         71600: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
            70349: Merged DEV to V4.2-BUG-FIX (4.2.3)
               70294 : MNT-10946 : Admin is no longer able to unlock files
                  - Check if node is locked before unlock for non-admin or System users. Fix related test
   85881: ACE-2181 : Merged DEV to HEAD (5.0)
      76214 : MNT-10946 : Admin is no longer able to unlock files 
         - Drop check for lockowner from AbstractLockStore.set. Fix related test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-30 22:15:25 +00:00
Pavel Yurke
82bf270d41 ACE-2181 : Merged DEV to HEAD (5.0)
76214 : MNT-10946 : Admin is no longer able to unlock files 
      - Drop check for lockowner from AbstractLockStore.set. Fix related test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85881 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 10:23:20 +00:00
Pavel Yurke
c77ab4b347 ACE-2181 : Reverse Merge HEAD (5.0)
<< Implementing another approach for MNT-10946 and ACE-2181 >>
   Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
      71600: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
         70349: Merged DEV to V4.2-BUG-FIX (4.2.3)
            70294 : MNT-10946 : Admin is no longer able to unlock files
               - Check if node is locked before unlock for non-admin or System users. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85880 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 10:22:06 +00:00
Alan Davis
610afaf8a5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84030: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      83370: Merged V4.2.3 (4.2.3.1) to V4.2-BUG-FIX (4.2.4)
         79190: Merged DEV to PATCHES/V4.2.3
            79172 : MNT-12049 : After uploading a document via WebDAV using DnD or copy/paste, the document appears as locked to Alfresco
               - Unit test added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:21:03 +00:00
Will Abson
387eb1b37c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79307: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      79080: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
         78999: MNT-12049 : After uploading a document via WebDAV using DnD or copy/paste, the document appears as locked to Alfresco
            - Fixed build failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82699 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:20:22 +00:00
Will Abson
7a50449b81 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73457: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73376: Merged DEV to V4.2-BUG-FIX (4.2.3)
         73246 : MNT-11615 : LockServiceImpl.getLockState() throws ClassCastException
            - Added toString() call for ContentModel.PROP_LOCK_LIFETIME properties in LockableAspectInterceptor.
            - Unit test was corrected.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74778 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:03:05 +00:00
Will Abson
133428c149 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73355: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73281: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         73054 (REDO MERGE): Added LockDAO.releaseLockQuiet and used it for the callback's precautionary lock release
                - Fixes MNT-11507: JobLockService automatic refresh is triggering a retry under normal conditions
                - Prevents a DEBUG message from RetryingTransactionInterceptor when the normal condition is for
         	    the lock to no longer exist
         73279: Fix javadoc for JobLockService.releaseLock to include @throws
         This revision undoes the behaviour change of JobLockService.releaseLock introduced by:
           56164: Fixes ALF-19964: Breaking API change in JobLockService.releaseLock
         The JobLockService now behaves the same on 4.1.x and 4.2.x, while all bug fixes are preserved.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74773 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:59:34 +00:00
Will Abson
f7534027fb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71600: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70349: Merged DEV to V4.2-BUG-FIX (4.2.3)
         70294 : MNT-10946 : Admin is no longer able to unlock files
            - Check if node is locked before unlock for non-admin or System users. Fix related test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74694 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:30:54 +00:00
Alan Davis
10f8ccb903 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70226: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70137: Reverse Merge V4.2-BUG-FIX (4.2.3)
         << Commit appears to have resulted in lots of build errors. Not obvious why. >>
         70056: Merged DEV to V4.2-BUG-FIX (4.2.3)
            69689 : MNT-10946 : Admin is no longer able to unlock files 
               - Check if node is locked for non-admin users. Fix related test
            69751 : MNT-10946 : Admin is no longer able to unlock files 
               - Changed warn message


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70491 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:36:33 +00:00
Alan Davis
a6e1c48e84 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70223: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70056: Merged DEV to V4.2-BUG-FIX (4.2.3)
         69689 : MNT-10946 : Admin is no longer able to unlock files 
            - Check if node is locked for non-admin users. Fix related test
         69751 : MNT-10946 : Admin is no longer able to unlock files 
            - Changed warn message


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:33:29 +00:00
Alan Davis
d9de96b496 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65781: Created ACE-1249: Fix HazelcastLockStoreTxTest.testReadsWhenNoTransaction


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 22:20:17 +00:00
Alan Davis
3caceb54e3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65738: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65639: Merged DEV to V4.2-BUG-FIX (4.2.2)
         65624 : MNT-10477 : Lock on document being edited online persists when updating name of document
            - LockableAspectInterceptor checks for EPHEMERAL locks if they exists. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66268 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 22:13:54 +00:00
Alan Davis
72662536a7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60595: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60362: Merged DEV to V4.2-BUG-FIX (4.2.2)
         58112: Added missing transaction(s) in CheckOutCheckInServiceImplTest (MNT-9806)
         58113: Added missing transaction(s) in LockableAspectInterceptorTest (MNT-9806)
         58114: Added missing transaction(s) in LockableAspectInterceptorTest (MNT-9806)
         58115: Added missing transaction(s) in TransactionCleanupTest (MNT-9806)
         58116: Added missing transaction(s) in GetChildrenCannedQueryTest (MNT-9806)
         58118: Added missing transaction(s) in RatingServiceIntegrationTest (MNT-9806)
         58119: Added missing transaction(s) in ReplicationServiceIntegrationTest (MNT-9806)
         58121: Added missing transaction(s) in PersonTest (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:08:49 +00:00
Alan Davis
1cc54d1d24 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60178: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60175: Merged V4.2.1 (4.2.1) to V4.2-BUG-FIX (4.2.2)
         60174: Merged DEV (V4.2.1-2014_01_09) to V4.2.1 (4.2.1)
            60167: ACE-183 Intermittent test failure: LockStoreImplTxTest testReadsWhenNoTransaction
               - Stop running LockStoreImplTxTest - testReadsWhenNoTransaction (Matt says there is little value)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62297 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 12:48:57 +00:00
Alan Davis
1785ab9818 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59936: Added extra assertions (test pre-conditions) to help debug sporadic failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62234 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:43:00 +00:00
Alan Davis
68bfd2b72e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59120: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59105: Fix broken tests in LockableAspectInterceptorTest.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62100 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:03:54 +00:00
Alan Davis
d156901f44 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59113: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59084: MNT-10028: Editing online document is not displayed in "I'm Editing" (and similar) filters in Share.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62093 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:58:28 +00:00
Alan Davis
bfa69dcca9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58807: Categorised some more tests, less experimentation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62037 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:13:59 +00:00
Alan Davis
b9507acf29 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58794: Further experimentation with running tests together vs in their own jvm.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62035 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:12:23 +00:00
Alan Davis
436dfd3bfc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58572: Added some tests to the own Jvm category


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:50:03 +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
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
Alan Davis
49a7bf551e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57064: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56553: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56034: Merged DEV to 4.1-BUG-FIX (4.1.7)
            MNT-9475 : Moving locked content breaks edit online
               - Unit Test to ensure that lock owner can copy, move, delete, restore locked node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61697 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 19:09:33 +00:00
Matt Ward
963b858b02 CLOUD-2165, CLOUD-2189: unable to save document via Sharepoint or WebDAV.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@58098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-21 18:04:16 +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
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
Matt Ward
6ba121eb00 Merged BRANCHES/DEV/HEAD-BUG-FIX to HEAD:
54579: ALF-19785: Deadlock during build



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-02 07:52:11 +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