[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/optimistic ...

Manik Surtani msurtani at jboss.com
Thu Aug 17 17:57:59 EDT 2006


  User: msurtani
  Date: 06/08/17 17:57:59

  Modified:    tests/functional/org/jboss/cache/optimistic                  
                        CacheTest.java MockInterceptor.java
                        NodeInterceptorGetChildrenNamesTest.java
                        NodeInterceptorGetKeyValTest.java
                        NodeInterceptorGetKeysTest.java
                        NodeInterceptorKeyValTest.java
                        NodeInterceptorPutEraseTest.java
                        NodeInterceptorPutMapTest.java
                        NodeInterceptorRemoveDataTest.java
                        NodeInterceptorRemoveKeyValTest.java
                        NodeInterceptorRemoveNodeTest.java
                        NodeInterceptorTransactionTest.java
                        OpLockingInterceptorTest.java
                        OptimisticCreateIfNotExistsInterceptorTest.java
                        OptimisticReplicationInterceptorTest.java
                        ThreadedOptimisticCreateIfNotExistsInterceptorTest.java
                        TxInterceptorTest.java
                        ValidatorInterceptorTest.java
  Log:
  Habanero stabilisation efforts - getCacheSPI() method
  
  Revision  Changes    Path
  1.20      +12 -12    JBossCache/tests/functional/org/jboss/cache/optimistic/CacheTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/CacheTest.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- CacheTest.java	20 Jul 2006 09:03:54 -0000	1.19
  +++ CacheTest.java	17 Aug 2006 21:57:59 -0000	1.20
  @@ -99,13 +99,13 @@
           TreeCache cache = createCacheWithListener();
   
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
           dummy.setCache(cache);
   
  @@ -152,13 +152,13 @@
           TreeCache cache = createCacheWithListener();
   
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
           dummy.setCache(cache);
   
  @@ -197,13 +197,13 @@
           TreeCache cache = createCacheWithListener();
   
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
           dummy.setCache(cache);
   
  
  
  
  1.5       +1 -1      JBossCache/tests/functional/org/jboss/cache/optimistic/MockInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MockInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/MockInterceptor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- MockInterceptor.java	20 Jul 2006 10:54:01 -0000	1.4
  +++ MockInterceptor.java	17 Aug 2006 21:57:59 -0000	1.5
  @@ -22,7 +22,7 @@
   
       public void setCache(TreeCache cache)
       {
  -        super.setCache(cache.getSPI());
  +        super.setCache(cache.getCacheSPI());
   
       }
   
  
  
  
  1.8       +9 -9      JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorGetChildrenNamesTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeInterceptorGetChildrenNamesTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorGetChildrenNamesTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- NodeInterceptorGetChildrenNamesTest.java	20 Jul 2006 10:54:01 -0000	1.7
  +++ NodeInterceptorGetChildrenNamesTest.java	17 Aug 2006 21:57:59 -0000	1.8
  @@ -33,11 +33,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -103,11 +103,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -154,11 +154,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  
  
  
  1.8       +8 -8      JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorGetKeyValTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeInterceptorGetKeyValTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorGetKeyValTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- NodeInterceptorGetKeyValTest.java	20 Jul 2006 08:05:18 -0000	1.7
  +++ NodeInterceptorGetKeyValTest.java	17 Aug 2006 21:57:59 -0000	1.8
  @@ -31,9 +31,9 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
           dummy.setCache(cache);
   
  @@ -99,9 +99,9 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
           dummy.setCache(cache);
   
  @@ -158,9 +158,9 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
           dummy.setCache(cache);
   
  @@ -216,9 +216,9 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
           dummy.setCache(cache);
   
  
  
  
  1.8       +9 -9      JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorGetKeysTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeInterceptorGetKeysTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorGetKeysTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- NodeInterceptorGetKeysTest.java	20 Jul 2006 10:54:01 -0000	1.7
  +++ NodeInterceptorGetKeysTest.java	17 Aug 2006 21:57:59 -0000	1.8
  @@ -33,11 +33,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -102,11 +102,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -151,11 +151,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  
  
  
  1.9       +15 -15    JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorKeyValTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeInterceptorKeyValTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorKeyValTest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- NodeInterceptorKeyValTest.java	20 Jul 2006 10:31:45 -0000	1.8
  +++ NodeInterceptorKeyValTest.java	17 Aug 2006 21:57:59 -0000	1.9
  @@ -31,11 +31,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -84,11 +84,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -141,11 +141,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -197,11 +197,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -255,11 +255,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  
  
  
  1.8       +9 -9      JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorPutEraseTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeInterceptorPutEraseTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorPutEraseTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- NodeInterceptorPutEraseTest.java	20 Jul 2006 09:03:54 -0000	1.7
  +++ NodeInterceptorPutEraseTest.java	17 Aug 2006 21:57:59 -0000	1.8
  @@ -33,11 +33,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -87,11 +87,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -144,11 +144,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  
  
  
  1.8       +9 -9      JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorPutMapTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeInterceptorPutMapTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorPutMapTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- NodeInterceptorPutMapTest.java	20 Jul 2006 09:03:54 -0000	1.7
  +++ NodeInterceptorPutMapTest.java	17 Aug 2006 21:57:59 -0000	1.8
  @@ -33,11 +33,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
   
           interceptor.setNext(nodeInterceptor);
  @@ -90,11 +90,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -149,11 +149,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  
  
  
  1.9       +12 -12    JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeInterceptorRemoveDataTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- NodeInterceptorRemoveDataTest.java	20 Jul 2006 09:03:54 -0000	1.8
  +++ NodeInterceptorRemoveDataTest.java	17 Aug 2006 21:57:59 -0000	1.9
  @@ -33,11 +33,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -84,11 +84,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -141,11 +141,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -201,11 +201,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  
  
  
  1.8       +6 -6      JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorRemoveKeyValTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeInterceptorRemoveKeyValTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorRemoveKeyValTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- NodeInterceptorRemoveKeyValTest.java	20 Jul 2006 08:05:18 -0000	1.7
  +++ NodeInterceptorRemoveKeyValTest.java	17 Aug 2006 21:57:59 -0000	1.8
  @@ -40,9 +40,9 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
           dummy.setCache(cache);
   
  @@ -91,9 +91,9 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
           dummy.setCache(cache);
   
  @@ -149,9 +149,9 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
           dummy.setCache(cache);
   
  
  
  
  1.10      +21 -21    JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeInterceptorRemoveNodeTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorRemoveNodeTest.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- NodeInterceptorRemoveNodeTest.java	20 Jul 2006 10:31:45 -0000	1.9
  +++ NodeInterceptorRemoveNodeTest.java	17 Aug 2006 21:57:59 -0000	1.10
  @@ -40,11 +40,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -91,11 +91,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -152,11 +152,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -213,11 +213,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -297,11 +297,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -383,11 +383,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -470,11 +470,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  
  
  
  1.7       +6 -6      JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorTransactionTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeInterceptorTransactionTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/NodeInterceptorTransactionTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- NodeInterceptorTransactionTest.java	20 Jul 2006 10:31:45 -0000	1.6
  +++ NodeInterceptorTransactionTest.java	17 Aug 2006 21:57:59 -0000	1.7
  @@ -33,11 +33,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -65,11 +65,11 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  
  
  
  1.12      +12 -12    JBossCache/tests/functional/org/jboss/cache/optimistic/OpLockingInterceptorTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OpLockingInterceptorTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/OpLockingInterceptorTest.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- OpLockingInterceptorTest.java	20 Jul 2006 09:03:54 -0000	1.11
  +++ OpLockingInterceptorTest.java	17 Aug 2006 21:57:59 -0000	1.12
  @@ -46,13 +46,13 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor lockingInterceptor = new OptimisticLockingInterceptor();
  -        lockingInterceptor.setCache(cache.getSPI());
  +        lockingInterceptor.setCache(cache.getCacheSPI());
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
           lockingInterceptor.setNext(interceptor);
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -137,13 +137,13 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor lockingInterceptor = new OptimisticLockingInterceptor();
  -        lockingInterceptor.setCache(cache.getSPI());
  +        lockingInterceptor.setCache(cache.getCacheSPI());
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
           lockingInterceptor.setNext(interceptor);
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -254,13 +254,13 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor lockingInterceptor = new OptimisticLockingInterceptor();
  -        lockingInterceptor.setCache(cache.getSPI());
  +        lockingInterceptor.setCache(cache.getCacheSPI());
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
           lockingInterceptor.setNext(interceptor);
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  
  
  
  1.9       +6 -6      JBossCache/tests/functional/org/jboss/cache/optimistic/OptimisticCreateIfNotExistsInterceptorTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticCreateIfNotExistsInterceptorTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/OptimisticCreateIfNotExistsInterceptorTest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- OptimisticCreateIfNotExistsInterceptorTest.java	20 Jul 2006 10:54:01 -0000	1.8
  +++ OptimisticCreateIfNotExistsInterceptorTest.java	17 Aug 2006 21:57:59 -0000	1.9
  @@ -64,9 +64,9 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(dummy);
   
  @@ -100,9 +100,9 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           interceptor.setNext(dummy);
   
  @@ -152,9 +152,9 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
           interceptor.setNext(dummy);
   
           cache.setInterceptorChain(interceptor);
  
  
  
  1.14      +65 -65    JBossCache/tests/functional/org/jboss/cache/optimistic/OptimisticReplicationInterceptorTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticReplicationInterceptorTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/OptimisticReplicationInterceptorTest.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- OptimisticReplicationInterceptorTest.java	20 Jul 2006 09:03:54 -0000	1.13
  +++ OptimisticReplicationInterceptorTest.java	17 Aug 2006 21:57:59 -0000	1.14
  @@ -47,15 +47,15 @@
           final TreeCache cache = createCache();
   
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(replicationInterceptor);
           replicationInterceptor.setNext(createInterceptor);
  @@ -100,15 +100,15 @@
           TreeCache cache = createCache();
   
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(replicationInterceptor);
           replicationInterceptor.setNext(createInterceptor);
  @@ -147,15 +147,15 @@
           TreeCache cache = createCache();
   
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(replicationInterceptor);
           replicationInterceptor.setNext(createInterceptor);
  @@ -279,15 +279,15 @@
           TreeCache cache = createCache();
   
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           OptimisticNodeInterceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(replicationInterceptor);
           replicationInterceptor.setNext(createInterceptor);
  @@ -427,15 +427,15 @@
           TreeCache cache = createCache();
   
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           OptimisticNodeInterceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(replicationInterceptor);
           replicationInterceptor.setNext(createInterceptor);
  @@ -554,15 +554,15 @@
           TreeCache cache = createCache();
   
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           OptimisticNodeInterceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(replicationInterceptor);
           replicationInterceptor.setNext(createInterceptor);
  @@ -675,15 +675,15 @@
           TreeCache cache = createCache();
   
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           OptimisticNodeInterceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(replicationInterceptor);
           replicationInterceptor.setNext(createInterceptor);
  @@ -825,15 +825,15 @@
   
   
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           OptimisticNodeInterceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(replicationInterceptor);
           replicationInterceptor.setNext(createInterceptor);
  @@ -847,15 +847,15 @@
   
   
           Interceptor txInterceptor2 = new TxInterceptor();
  -        txInterceptor2.setCache(cache2.getSPI());
  +        txInterceptor2.setCache(cache2.getCacheSPI());
           Interceptor replicationInterceptor2 = new OptimisticReplicationInterceptor();
  -        replicationInterceptor2.setCache(cache2.getSPI());
  +        replicationInterceptor2.setCache(cache2.getCacheSPI());
           Interceptor createInterceptor2 = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor2.setCache(cache2.getSPI());
  +        createInterceptor2.setCache(cache2.getCacheSPI());
           OptimisticNodeInterceptor nodeInterceptor2 = new OptimisticNodeInterceptor();
  -        nodeInterceptor2.setCache(cache2.getSPI());
  +        nodeInterceptor2.setCache(cache2.getCacheSPI());
           MockInterceptor dummy2 = new MockInterceptor();
  -        dummy2.setCache(cache2.getSPI());
  +        dummy2.setCache(cache2.getCacheSPI());
   
           txInterceptor2.setNext(replicationInterceptor2);
           replicationInterceptor2.setNext(createInterceptor2);
  @@ -918,15 +918,15 @@
   
   
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           OptimisticNodeInterceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(replicationInterceptor);
           replicationInterceptor.setNext(createInterceptor);
  @@ -940,18 +940,18 @@
   
   
           Interceptor txInterceptor2 = new TxInterceptor();
  -        txInterceptor2.setCache(cache2.getSPI());
  +        txInterceptor2.setCache(cache2.getCacheSPI());
           Interceptor replicationInterceptor2 = new OptimisticReplicationInterceptor();
  -        replicationInterceptor2.setCache(cache2.getSPI());
  +        replicationInterceptor2.setCache(cache2.getCacheSPI());
           Interceptor createInterceptor2 = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor2.setCache(cache2.getSPI());
  +        createInterceptor2.setCache(cache2.getCacheSPI());
           OptimisticNodeInterceptor nodeInterceptor2 = new OptimisticNodeInterceptor();
  -        nodeInterceptor2.setCache(cache2.getSPI());
  +        nodeInterceptor2.setCache(cache2.getCacheSPI());
           MockFailureInterceptor dummy2 = new MockFailureInterceptor();
           List failures = new ArrayList();
           failures.add(MethodDeclarations.optimisticPrepareMethod);
           dummy2.setFailurelist(failures);
  -        dummy2.setCache(cache2.getSPI());
  +        dummy2.setCache(cache2.getCacheSPI());
   
           txInterceptor2.setNext(replicationInterceptor2);
           replicationInterceptor2.setNext(createInterceptor2);
  @@ -1022,19 +1022,19 @@
   
   
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           OptimisticNodeInterceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
   
           MockFailureInterceptor dummy = new MockFailureInterceptor();
           List failures = new ArrayList();
           failures.add(MethodDeclarations.optimisticPrepareMethod);
           dummy.setFailurelist(failures);
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(replicationInterceptor);
           replicationInterceptor.setNext(createInterceptor);
  @@ -1048,16 +1048,16 @@
   
   
           Interceptor txInterceptor2 = new TxInterceptor();
  -        txInterceptor2.setCache(cache2.getSPI());
  +        txInterceptor2.setCache(cache2.getCacheSPI());
           Interceptor replicationInterceptor2 = new OptimisticReplicationInterceptor();
  -        replicationInterceptor2.setCache(cache2.getSPI());
  +        replicationInterceptor2.setCache(cache2.getCacheSPI());
           Interceptor createInterceptor2 = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor2.setCache(cache2.getSPI());
  +        createInterceptor2.setCache(cache2.getCacheSPI());
           OptimisticNodeInterceptor nodeInterceptor2 = new OptimisticNodeInterceptor();
  -        nodeInterceptor2.setCache(cache2.getSPI());
  +        nodeInterceptor2.setCache(cache2.getCacheSPI());
   
           MockInterceptor dummy2 = new MockInterceptor();
  -        dummy2.setCache(cache2.getSPI());
  +        dummy2.setCache(cache2.getCacheSPI());
   
   
           txInterceptor2.setNext(replicationInterceptor2);
  
  
  
  1.14      +4 -4      JBossCache/tests/functional/org/jboss/cache/optimistic/ThreadedOptimisticCreateIfNotExistsInterceptorTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ThreadedOptimisticCreateIfNotExistsInterceptorTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/ThreadedOptimisticCreateIfNotExistsInterceptorTest.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- ThreadedOptimisticCreateIfNotExistsInterceptorTest.java	20 Jul 2006 10:54:01 -0000	1.13
  +++ ThreadedOptimisticCreateIfNotExistsInterceptorTest.java	17 Aug 2006 21:57:59 -0000	1.14
  @@ -58,9 +58,9 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
           interceptor.setNext(dummy);
   
           cache.setInterceptorChain(interceptor);
  @@ -123,9 +123,9 @@
           final TreeCache cache = createCacheWithListener(listener);
   
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
           interceptor.setNext(dummy);
   
           cache.setInterceptorChain(interceptor);
  
  
  
  1.13      +60 -60    JBossCache/tests/functional/org/jboss/cache/optimistic/TxInterceptorTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TxInterceptorTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/TxInterceptorTest.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- TxInterceptorTest.java	20 Jul 2006 10:31:45 -0000	1.12
  +++ TxInterceptorTest.java	17 Aug 2006 21:57:59 -0000	1.13
  @@ -47,13 +47,13 @@
           TreeCache cache = createCache();
   
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(createInterceptor);
           createInterceptor.setNext(nodeInterceptor);
  @@ -87,13 +87,13 @@
   
           TreeCache cache = createCache();
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(createInterceptor);
           createInterceptor.setNext(nodeInterceptor);
  @@ -135,13 +135,13 @@
   
           TreeCache cache = createCache();
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(createInterceptor);
           createInterceptor.setNext(nodeInterceptor);
  @@ -178,13 +178,13 @@
       {
           TreeCache cache = createCache();
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(createInterceptor);
           createInterceptor.setNext(nodeInterceptor);
  @@ -218,13 +218,13 @@
   
           TreeCache cache = createCache();
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(createInterceptor);
           createInterceptor.setNext(nodeInterceptor);
  @@ -258,13 +258,13 @@
   
           TreeCache cache = createCache();
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(createInterceptor);
           createInterceptor.setNext(nodeInterceptor);
  @@ -313,13 +313,13 @@
       {
           TreeCache cache = createCache();
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(createInterceptor);
           createInterceptor.setNext(nodeInterceptor);
  @@ -362,13 +362,13 @@
   
           TreeCache cache = createCache();
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(createInterceptor);
           createInterceptor.setNext(nodeInterceptor);
  @@ -478,13 +478,13 @@
   
           TreeCache cache = createCache();
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(createInterceptor);
           createInterceptor.setNext(nodeInterceptor);
  @@ -607,15 +607,15 @@
   
           TreeCache cache = createCache();
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(replicationInterceptor);
           replicationInterceptor.setNext(createInterceptor);
  @@ -746,15 +746,15 @@
   
           TreeCache cache = createCache();
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(replicationInterceptor);
           replicationInterceptor.setNext(createInterceptor);
  @@ -884,15 +884,15 @@
   
           TreeCache cache = createCache();
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(replicationInterceptor);
           replicationInterceptor.setNext(createInterceptor);
  @@ -1026,15 +1026,15 @@
   
           TreeCache cache = createCache();
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor replicationInterceptor = new OptimisticReplicationInterceptor();
  -        replicationInterceptor.setCache(cache.getSPI());
  +        replicationInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(replicationInterceptor);
           replicationInterceptor.setNext(createInterceptor);
  @@ -1163,13 +1163,13 @@
   
           TreeCache cache = createCache();
           Interceptor txInterceptor = new TxInterceptor();
  -        txInterceptor.setCache(cache.getSPI());
  +        txInterceptor.setCache(cache.getCacheSPI());
           Interceptor createInterceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        createInterceptor.setCache(cache.getSPI());
  +        createInterceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
   
           txInterceptor.setNext(createInterceptor);
           createInterceptor.setNext(nodeInterceptor);
  
  
  
  1.13      +20 -20    JBossCache/tests/functional/org/jboss/cache/optimistic/ValidatorInterceptorTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ValidatorInterceptorTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/optimistic/ValidatorInterceptorTest.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- ValidatorInterceptorTest.java	20 Jul 2006 10:31:45 -0000	1.12
  +++ ValidatorInterceptorTest.java	17 Aug 2006 21:57:59 -0000	1.13
  @@ -41,13 +41,13 @@
           TreeCache cache = createCacheWithListener();
   
           Interceptor validateInterceptor = new OptimisticValidatorInterceptor();
  -        validateInterceptor.setCache(cache.getSPI());
  +        validateInterceptor.setCache(cache.getCacheSPI());
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
           validateInterceptor.setNext(interceptor);
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -124,13 +124,13 @@
           TreeCache cache = createCacheWithListener();
   
           Interceptor validateInterceptor = new OptimisticValidatorInterceptor();
  -        validateInterceptor.setCache(cache.getSPI());
  +        validateInterceptor.setCache(cache.getCacheSPI());
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
           validateInterceptor.setNext(interceptor);
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -200,13 +200,13 @@
           TreeCache cache = createCacheWithListener();
   
           Interceptor validateInterceptor = new OptimisticValidatorInterceptor();
  -        validateInterceptor.setCache(cache.getSPI());
  +        validateInterceptor.setCache(cache.getCacheSPI());
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
           validateInterceptor.setNext(interceptor);
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -311,13 +311,13 @@
           TreeCache cache = createCacheWithListener();
   
           Interceptor validateInterceptor = new OptimisticValidatorInterceptor();
  -        validateInterceptor.setCache(cache.getSPI());
  +        validateInterceptor.setCache(cache.getCacheSPI());
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
           validateInterceptor.setNext(interceptor);
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  @@ -416,13 +416,13 @@
   
           TreeCache cache = createCacheWithListener();
           Interceptor validateInterceptor = new OptimisticValidatorInterceptor();
  -        validateInterceptor.setCache(cache.getSPI());
  +        validateInterceptor.setCache(cache.getCacheSPI());
           Interceptor interceptor = new OptimisticCreateIfNotExistsInterceptor();
  -        interceptor.setCache(cache.getSPI());
  +        interceptor.setCache(cache.getCacheSPI());
           Interceptor nodeInterceptor = new OptimisticNodeInterceptor();
  -        nodeInterceptor.setCache(cache.getSPI());
  +        nodeInterceptor.setCache(cache.getCacheSPI());
           MockInterceptor dummy = new MockInterceptor();
  -        dummy.setCache(cache.getSPI());
  +        dummy.setCache(cache.getCacheSPI());
           validateInterceptor.setNext(interceptor);
           interceptor.setNext(nodeInterceptor);
           nodeInterceptor.setNext(dummy);
  
  
  



More information about the jboss-cvs-commits mailing list