[jboss-cvs] JBossAS SVN: r72322 - trunk/cluster/src/main/org/jboss/ha/framework/server.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2008-04-16 18:57:33 -0400 (Wed, 16 Apr 2008)
New Revision: 72322

Modified:
   trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
   trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionConfig.java
   trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionMBean.java
Log:
[JBAS-5455] Get rid of use of term Multiplexer in ClusterPartition API

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java	2008-04-16 22:42:40 UTC (rev 72321)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java	2008-04-16 22:57:33 UTC (rev 72322)
@@ -204,10 +204,10 @@
    
    private static Channel createMuxChannel(ClusterPartitionConfig config)
    {
-      ChannelFactory factory = config.getMultiplexer();
+      ChannelFactory factory = config.getChannelFactory();
       if (factory == null)
          throw new IllegalStateException("HAPartitionConfig has no JChannelFactory");
-      String stack = config.getMultiplexerStack();
+      String stack = config.getChannelStackName();
       if (stack == null)
          throw new IllegalStateException("HAPartitionConfig has no multiplexer stack");
       try
@@ -270,7 +270,7 @@
       if (channel == null || !channel.isOpen())
       {
          log.debug("Creating Multiplexer Channel for partition " + getPartitionName() +
-               " using stack " + getMultiplexerStack());
+               " using stack " + getChannelStackName());
    
          channel = createMuxChannel(config);
          
@@ -1432,14 +1432,14 @@
       return Version.description + "( " + Version.cvs + ")";
    }
 
-   public ChannelFactory getMultiplexer()
+   public ChannelFactory getChannelFactory()
    {
-      return config.getMultiplexer();
+      return config.getChannelFactory();
    }
 
-   public String getMultiplexerStack()
+   public String getChannelStackName()
    {
-      return config.getMultiplexerStack();
+      return config.getChannelStackName();
    }
 
    public InetAddress getNodeAddress()

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionConfig.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionConfig.java	2008-04-16 22:42:40 UTC (rev 72321)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionConfig.java	2008-04-16 22:57:33 UTC (rev 72322)
@@ -43,7 +43,7 @@
    // Attributes ----------------------------------------------------
 
    private   Cache cache;
-   private   ChannelFactory multiplexer;
+   private   ChannelFactory channelFactory;
    private   DistributedState distributedState;
    private   String stackName;
    private   String partitionName = ServerConfigUtil.getDefaultPartitionName();
@@ -139,12 +139,12 @@
       this.allow_sync_events = allowSync;
    }
 
-   public ChannelFactory getMultiplexer()
+   public ChannelFactory getChannelFactory()
    {
-      return multiplexer;
+      return channelFactory;
    }
 
-   public String getMultiplexerStack()
+   public String getChannelStackName()
    {
       return stackName;
    }
@@ -168,9 +168,9 @@
    {
       this.cache = cache;
       Configuration config = cache.getConfiguration();
-      multiplexer = config.getRuntimeConfig().getMuxChannelFactory();
+      channelFactory = config.getRuntimeConfig().getMuxChannelFactory();
       
-      if (multiplexer == null)
+      if (channelFactory == null)
          throw new IllegalArgumentException("Cache not configured for a multiplexer");
       
       this.stackName = config.getMultiplexerStack();

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionMBean.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionMBean.java	2008-04-16 22:42:40 UTC (rev 72321)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartitionMBean.java	2008-04-16 22:57:33 UTC (rev 72322)
@@ -133,6 +133,8 @@
    
    /**
     * Access to the DistributedState implementation
+    * 
+    * @deprecated Use JBoss Cache for distributed caching
     */
    DistributedState getDistributedStateService();
    
@@ -142,15 +144,15 @@
    Cache getClusteredCache();
    
    /**
-    * Gets the JGroups multiplexer channel factory used by ClusterPartition.
+    * Gets the JGroups channel factory used by ClusterPartition.
     */
-   ChannelFactory getMultiplexer();
+   ChannelFactory getChannelFactory();
    
    /**
-    * Used with multiplexer injection, specifies stack to be used (e.g., fc-fast-minimalthreads) 
-    * This attribute is optional; if not provided, a default multiplexer stack will be used.
+    * Gets the name of the JGroups channel protocol stack configuration
+    * provided to the {@link #getChannelFactory() channel factory}. 
     */
-   String getMultiplexerStack();
+   String getChannelStackName();
 
    /** Return the list of member nodes that built from the current view
     * @return A Vector Strings representing the host:port values of the nodes