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

[Brian Stansberry]

  User: bstansberry
  Date: 06/11/03 16:21:26

  Modified:    src/org/jboss/cache   Tag: Branch_JBossCache_1_4_0
                        TreeCacheMBean.java TreeCache.java
  Log:
  [JBCACHE-812] Enable multiplexer integration
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.35.2.1  +8 -1      JBossCache/src/org/jboss/cache/Attic/TreeCacheMBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCacheMBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/Attic/TreeCacheMBean.java,v
  retrieving revision 1.35
  retrieving revision 1.35.2.1
  diff -u -b -r1.35 -r1.35.2.1
  --- TreeCacheMBean.java	8 Jun 2006 01:28:51 -0000	1.35
  +++ TreeCacheMBean.java	3 Nov 2006 21:21:26 -0000	1.35.2.1
  @@ -26,7 +26,7 @@
    *
    * @author Bela Ban
    * @author Ben Wang
  - * @version $Id: TreeCacheMBean.java,v 1.35 2006/06/08 01:28:51 bstansberry Exp $
  + * @version $Id: TreeCacheMBean.java,v 1.35.2.1 2006/11/03 21:21:26 bstansberry Exp $
    */
   public interface TreeCacheMBean extends ServiceMBean
   {
  @@ -958,6 +958,13 @@
       void setMultiplexerStack(String stackName);
   
       /**
  +     * Gets whether this cache using a channel from the JGroups multiplexer.
  +     * Will not provide a meaningful result until after {@link #startService()}
  +     * is invoked. 
  +     */
  +    boolean isUsingMultiplexer();
  +
  +    /**
        * Purges the contents of all configured {@link CacheLoader}s
        */
       void purgeCacheLoaders() throws Exception;
  
  
  
  1.195.2.16 +20 -5     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.195.2.15
  retrieving revision 1.195.2.16
  diff -u -b -r1.195.2.15 -r1.195.2.16
  --- TreeCache.java	3 Nov 2006 09:48:13 -0000	1.195.2.15
  +++ TreeCache.java	3 Nov 2006 21:21:26 -0000	1.195.2.16
  @@ -99,7 +99,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.195.2.15 2006/11/03 09:48:13 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.195.2.16 2006/11/03 21:21:26 bstansberry Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -161,6 +161,11 @@
      protected String mux_stackName = "fc-fast-minimalthreads";
   
      /**
  +    * Is this cache using a channel from the JGroups multiplexer 
  +    */
  +   protected boolean using_mux = false;
  +   
  +   /**
       * True if this TreeCache is the coordinator.
       */
      protected boolean coordinator = false;
  @@ -531,9 +536,7 @@
   
      public void setMultiplexerService(String serviceName)
      {
  -      log.warn("Cache multiplexer support not enabled yet.  " +
  -              "MultiplexerService attribute will be ignored.");
  -      //mux_serviceName = serviceName;
  +      mux_serviceName = serviceName;
      }
   
      public String getMultiplexerStack()
  @@ -547,6 +550,16 @@
      }
   
      /**
  +    * Gets whether this cache using a channel from the JGroups multiplexer.
  +    * Will not provide a meaningful result until after {@link #startService()}
  +    * is invoked. 
  +    */
  +   public boolean isUsingMultiplexer()
  +   {
  +      return using_mux;
  +   }
  +
  +   /**
       * Returns the transaction table.
       */
      public TransactionTable getTransactionTable()
  @@ -1379,7 +1392,9 @@
                  channel = getMultiplexerChannel(mux_serviceName, mux_stackName);
               }
               if (channel != null)
  -            { // mux channel
  +            { 
  +               // we have a mux channel
  +               using_mux = true;
                  log.info("Created Multiplexer Channel for cache cluster " + cluster_name +
                          " using stack " + getMultiplexerStack());
               }