[jboss-cvs] JBossCache/src/org/jboss/cache ...

[Manik Surtani]

  User: msurtani
  Date: 06/09/11 13:02:43

  Modified:    src/org/jboss/cache    CacheSPI.java TreeCache.java
                        TreeCacheProxyImpl.java
  Log:
  - fixed Data Gravitation interceptor breakages
  - correctly implemented cache.gravidateData()
  - set DummyTM in buddy-replication-service.xml
  
  Revision  Changes    Path
  1.14      +1 -3      JBossCache/src/org/jboss/cache/CacheSPI.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheSPI.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheSPI.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- CacheSPI.java	6 Sep 2006 15:30:55 -0000	1.13
  +++ CacheSPI.java	11 Sep 2006 17:02:43 -0000	1.14
  @@ -111,9 +111,7 @@
   
      org.jboss.cache.marshall.RegionManager getRegionManager();
   
  -   List _gravitateData(Fqn fqn, boolean b, boolean b1);
  -
  -   /**
  +   /*
       * Retrieves the notifier attached with this instance of the cache.  See {@link Notifier}, a class
       * that is responsible for emitting notifications to registered {@link CacheListener}s.
       */
  
  
  
  1.243     +16 -16    JBossCache/src/org/jboss/cache/TreeCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
  retrieving revision 1.242
  retrieving revision 1.243
  diff -u -b -r1.242 -r1.243
  --- TreeCache.java	7 Sep 2006 16:59:05 -0000	1.242
  +++ TreeCache.java	11 Sep 2006 17:02:43 -0000	1.243
  @@ -92,7 +92,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: TreeCache.java,v 1.242 2006/09/07 16:59:05 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.243 2006/09/11 17:02:43 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -622,21 +622,6 @@
   
         createEvictionPolicy();
   
  -      // build interceptor chain
  -      interceptor_chain = new InterceptorChainFactory().buildInterceptorChain(this);
  -
  -      isStandalone = getConfiguration().getServiceName() == null || getConfiguration().getServiceName().equals("");
  -
  -      // register interceptor mbeans
  -      if (configuration.isUseInterceptorMbeans())
  -      {
  -         MBeanServer mbserver = JmxUtil.getMBeanServer();
  -         if (mbserver != null)
  -         {
  -            JmxUtil.registerInterceptors(mbserver, this, isStandalone);
  -         }
  -      }
  -
         switch (configuration.getCacheMode())
         {
            case LOCAL:
  @@ -698,6 +683,21 @@
               throw new IllegalArgumentException("cache mode " + configuration.getCacheMode() + " is invalid");
         }
   
  +      // build interceptor chain
  +      interceptor_chain = new InterceptorChainFactory().buildInterceptorChain(this);
  +
  +      isStandalone = getConfiguration().getServiceName() == null || getConfiguration().getServiceName().equals("");
  +
  +      // register interceptor mbeans
  +      if (configuration.isUseInterceptorMbeans())
  +      {
  +         MBeanServer mbserver = JmxUtil.getMBeanServer();
  +         if (mbserver != null)
  +         {
  +            JmxUtil.registerInterceptors(mbserver, this, isStandalone);
  +         }
  +      }
  +
         useCreateService = true;
      }
   
  
  
  
  1.29      +2 -7      JBossCache/src/org/jboss/cache/TreeCacheProxyImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCacheProxyImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCacheProxyImpl.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -b -r1.28 -r1.29
  --- TreeCacheProxyImpl.java	7 Sep 2006 13:52:28 -0000	1.28
  +++ TreeCacheProxyImpl.java	11 Sep 2006 17:02:43 -0000	1.29
  @@ -501,19 +501,14 @@
         return node == null ? null : new TreeCacheProxyImpl(treeCache, node);
      }
   
  -   public void _evict(Fqn fqn)
  -   {
  -      throw new RuntimeException("TODO: Need to figure out how to deal with these.");
  -   }
  -
      public org.jboss.cache.marshall.RegionManager getRegionManager()
      {
         return treeCache.getRegionManager();
      }
   
  -   public List _gravitateData(Fqn fqn, boolean b, boolean b1)
  +   public List gravitateData(Fqn fqn, boolean searchSubtrees, boolean marshal)
      {
  -      throw new RuntimeException("TODO: Need to figure out how to deal with these.");
  +      return treeCache._gravitateData(fqn, searchSubtrees, marshal);
      }
   
      public Notifier getNotifier()