Merged V2.9 to HEAD

9018: MT: system-wide jobs should run across all stores/indexes
   9204: Merged V2.2 to V2.9
      8633: Merged V2.1 to V2.2
         8629: Merged V2.1-A to V2.1
            8493: Fixed ADB-51: ImporterBootstrap doesn't use transaction retrying
            8494: EHCache and JGroup patches and upgrades
            8546: ACT-1650: performance optimization
            8550: Fixes to transactional cache handling
            8553: Fixed tests: MLText is a Map, but will always have at least one entry, even that entry is null.
            8583: ACT-954: IndexInfo files now reopen when they close (for whatever reason)
      8640: Merged V2.1 to V2.2
         8638: Used correct exception type for IO channel reopen logic
      9102: Unit test to check that transactional cache size overrun is handled
      9106: Merged V2.1 to V2.2
         9043: Fixed AR-2291: SchemaBootstrap lock is only required before first SQL execution
         9045: Fix AR-2291: SchemaBootstrap lock is only required before first SQL execution
         9047: Fixed AR-2305: Index tracking in AUTO mode doesn't report anything on bootstrap
         9048: Fixed AR-2300: Random-based GUID instead of time-based GUIDs
         9049: Fix patches to only run once
         9050 <Defered>: Changed getString() method to use the available buffer length rather than a hard coded value.
         9060: Fixed ETWOONE-109 and ETWOONE-128: RetryingTransactionHelper fixes and improvements
         9061: Fixed NodeRefPropertyMethodInterceptorTest
         9075 <Defered>: Added delete permission check when marking a file for delete on close. ETWOONE-141/ACT-2416.
         9080: Fixed EHCache source zip
         9081: Fixed ETWOONE-118: Tomcat failed bootstrap doesn't clean up EHCache cluster structures
         9085: Fixed ETWOONE-154: Added JSR107 Jar to WAR
      9115: Fixed test: TransactionalCache uses LRU so repeatedly checking if a entry is there keeps it in the cache.
   9206: Merged V2.2 to V2.9
      8857: Improvements to ACL performance for large ACLs
      8951: Always check permission entry changes are made at position 0
   9219 <No change>: Made NTLMLogonDetails class Serializable, port of r8973.
   9220: Added delete permission check when marking a file for delete on close. Port of r9075.
   9222: Merged V2.1 to V2.9
      8683: Early warning for nodes indexed in the wrong store (ACT-964)
      8684: Enhanced tests
      8685: Enhanced tests
      8686: Additional tests
   9223: Merged V2.2 to V2.9
      9120: Merged V2.1 to V2.2
         8740: Fix for AR-2173 - do no recheck case of the user name when validating tickets (it has been done)
      9122: Additional unit test from support case.
   9224: Merged V2.2 to V2.9
      9076: Fixed ETWOTWO-426: Upgrading alfresco from 2.1.1 to 2.2 throws errors with Mysql 5.0.51
      9104: Merged V2.1 to V2.2
         9025: Fixed AR-2314, AR-2299: Optimizations after profiling
      9105: Merged V2.1 to V2.2
         8745: Fix AR-2233 (regression introduced by fix for AR-2221)
      9121: Merged V2.1 to V2.2
         9017: Fix index back up failing due to background index merge/deletions (inlcudes back port of CHK-2588)
      9137: Incorporated additions from Will into AVM console (ETWOTWO-439)
   9225: Merged V2.1 to V2.9
      8641: Merged V2.1-A to V2.1
         7729: Fix to Repository Web Service (queryAssociated) to allow reverse association lookup (ie. given target, get the source)
      8673: Fix for AR-2098 - shorter URL form now has NTLM filter mapping example in web.xml
      8682: Fix for AR-2005
      8695: AR-2054.
      8696: Improved sort test to include prefix form of field name
   9226: Fix ALFCOM-994 (see also earlier change in r9223)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-05-22 12:40:46 +00:00
parent 86027f41f1
commit 6e225ce15d
60 changed files with 2359 additions and 1164 deletions

View File

@@ -341,8 +341,46 @@ public class CacheTest extends TestCase
}
}
/**
* Add 50K objects into the transactional cache and checks that the first object added
* has been discarded.
*/
public void testMaxSizeOverrun() throws Exception
{
TransactionService transactionService = serviceRegistry.getTransactionService();
UserTransaction txn = transactionService.getUserTransaction();
try
{
txn.begin();
Object startValue = new Integer(-1);
String startKey = startValue.toString();
transactionalCache.put(startKey, startValue);
assertEquals("The start value isn't correct", startValue, transactionalCache.get(startKey));
for (int i = 0; i < 50000; i++)
{
Object value = Integer.valueOf(i);
String key = value.toString();
transactionalCache.put(key, value);
}
// Is the start value here?
Object checkStartValue = transactionalCache.get(startKey);
// Now, the cache should no longer contain the first value
assertNull("The start value didn't drop out of the cache", checkStartValue);
txn.commit();
}
finally
{
try { txn.rollback(); } catch (Throwable ee) {}
}
}
/** Execute the callback and ensure that the backing cache is left with the expected value */
private void executeAndCheck(RetryingTransactionCallback callback, Serializable key, Object expectedValue) throws Throwable
private void executeAndCheck(RetryingTransactionCallback<Object> callback, Serializable key, Object expectedValue) throws Throwable
{
TransactionService transactionService = serviceRegistry.getTransactionService();
UserTransaction txn = transactionService.getUserTransaction();
@@ -368,7 +406,7 @@ public class CacheTest extends TestCase
*/
public void testConcurrentAddAgainstAdd()throws Throwable
{
RetryingTransactionCallback callback = new RetryingTransactionCallback()
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
{
public Object execute() throws Throwable
{
@@ -389,7 +427,7 @@ public class CacheTest extends TestCase
public void testConcurrentAddAgainstAddSame()throws Throwable
{
final Object commonValue = "AAA";
RetryingTransactionCallback callback = new RetryingTransactionCallback()
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
{
public Object execute() throws Throwable
{
@@ -409,7 +447,7 @@ public class CacheTest extends TestCase
*/
public void testConcurrentAddAgainstClear()throws Throwable
{
RetryingTransactionCallback callback = new RetryingTransactionCallback()
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
{
public Object execute() throws Throwable
{
@@ -430,7 +468,7 @@ public class CacheTest extends TestCase
*/
public void testConcurrentUpdateAgainstUpdate()throws Throwable
{
RetryingTransactionCallback callback = new RetryingTransactionCallback()
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
{
public Object execute() throws Throwable
{
@@ -452,7 +490,7 @@ public class CacheTest extends TestCase
*/
public void testConcurrentUpdateAgainstUpdateNull()throws Throwable
{
RetryingTransactionCallback callback = new RetryingTransactionCallback()
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
{
public Object execute() throws Throwable
{
@@ -474,7 +512,7 @@ public class CacheTest extends TestCase
*/
public void testConcurrentUpdateNullAgainstUpdate()throws Throwable
{
RetryingTransactionCallback callback = new RetryingTransactionCallback()
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
{
public Object execute() throws Throwable
{
@@ -496,7 +534,7 @@ public class CacheTest extends TestCase
*/
public void testConcurrentUpdateAgainstRemove()throws Throwable
{
RetryingTransactionCallback callback = new RetryingTransactionCallback()
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
{
public Object execute() throws Throwable
{
@@ -518,7 +556,7 @@ public class CacheTest extends TestCase
*/
public void testConcurrentUpdateAgainstClear()throws Throwable
{
RetryingTransactionCallback callback = new RetryingTransactionCallback()
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
{
public Object execute() throws Throwable
{
@@ -540,7 +578,7 @@ public class CacheTest extends TestCase
*/
public void testConcurrentRemoveAgainstUpdate()throws Throwable
{
RetryingTransactionCallback callback = new RetryingTransactionCallback()
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
{
public Object execute() throws Throwable
{
@@ -562,7 +600,7 @@ public class CacheTest extends TestCase
*/
public void testConcurrentRemoveAgainstRemove()throws Throwable
{
RetryingTransactionCallback callback = new RetryingTransactionCallback()
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
{
public Object execute() throws Throwable
{
@@ -584,7 +622,7 @@ public class CacheTest extends TestCase
*/
public void testConcurrentRemoveAgainstClear()throws Throwable
{
RetryingTransactionCallback callback = new RetryingTransactionCallback()
RetryingTransactionCallback<Object> callback = new RetryingTransactionCallback<Object>()
{
public Object execute() throws Throwable
{