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

Brian Stansberry brian.stansberry at jboss.com
Fri Nov 3 23:49:46 EST 2006


  User: bstansberry
  Date: 06/11/03 23:49:46

  Modified:    tests/functional/org/jboss/cache/multiplexer           Tag:
                        Branch_JBossCache_1_4_0 AsyncReplTest.java
                        StateTransferTest.java MuxChannelFactory.java
                        BuddyAssignmentStateTransferTest.java
                        SyncReplTxTest.java MuxChannelFactoryMBean.java
                        BuddyReplicationFailoverTest.java
                        BuddyGroupAssignmentTest.java
                        MultiplexerTestHelper.java
                        BuddyBackupActivationInactivationTest.java
  Log:
  Javadoc
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +27 -0     JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/AsyncReplTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AsyncReplTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/AsyncReplTest.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- AsyncReplTest.java	4 Nov 2006 04:18:30 -0000	1.1.2.1
  +++ AsyncReplTest.java	4 Nov 2006 04:49:46 -0000	1.1.2.2
  @@ -1,7 +1,34 @@
  +/*
  + * JBoss, Home of Professional Open Source.
  + * Copyright 2006, Red Hat Middleware LLC, and individual contributors
  + * as indicated by the @author tags. See the copyright.txt file in the
  + * distribution for a full listing of individual contributors.
  + *
  + * This is free software; you can redistribute it and/or modify it
  + * under the terms of the GNU Lesser General Public License as
  + * published by the Free Software Foundation; either version 2.1 of
  + * the License, or (at your option) any later version.
  + *
  + * This software is distributed in the hope that it will be useful,
  + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  + * Lesser General Public License for more details.
  + *
  + * You should have received a copy of the GNU Lesser General Public
  + * License along with this software; if not, write to the Free
  + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  + * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  + */
   package org.jboss.cache.multiplexer;
   
   import org.jboss.cache.TreeCacheMBean;
   
  +/**
  + * Repeats the superclass tests, but with the multiplexer enabled.
  + * 
  + * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  + * @version $Revision: 1.1.2.2 $
  + */
   public class AsyncReplTest extends org.jboss.cache.replicated.AsyncReplTest
   {
      private MultiplexerTestHelper muxHelper;
  
  
  
  1.1.2.4   +27 -0     JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/StateTransferTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StateTransferTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/StateTransferTest.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -b -r1.1.2.3 -r1.1.2.4
  --- StateTransferTest.java	4 Nov 2006 04:17:37 -0000	1.1.2.3
  +++ StateTransferTest.java	4 Nov 2006 04:49:46 -0000	1.1.2.4
  @@ -1,8 +1,35 @@
  +/*
  + * JBoss, Home of Professional Open Source.
  + * Copyright 2006, Red Hat Middleware LLC, and individual contributors
  + * as indicated by the @author tags. See the copyright.txt file in the
  + * distribution for a full listing of individual contributors.
  + *
  + * This is free software; you can redistribute it and/or modify it
  + * under the terms of the GNU Lesser General Public License as
  + * published by the Free Software Foundation; either version 2.1 of
  + * the License, or (at your option) any later version.
  + *
  + * This software is distributed in the hope that it will be useful,
  + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  + * Lesser General Public License for more details.
  + *
  + * You should have received a copy of the GNU Lesser General Public
  + * License along with this software; if not, write to the Free
  + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  + * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  + */
   package org.jboss.cache.multiplexer;
   
   import org.jboss.cache.TreeCacheMBean;
   import org.jboss.cache.statetransfer.StateTransfer140Test;
   
  +/**
  + * Repeats the superclass tests, but with the multiplexer enabled.
  + * 
  + * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  + * @version $Revision: 1.1.2.4 $
  + */
   public class StateTransferTest extends StateTransfer140Test
   {
      private MultiplexerTestHelper muxHelper;
  
  
  
  1.1.2.2   +25 -1     JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/MuxChannelFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MuxChannelFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/MuxChannelFactory.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- MuxChannelFactory.java	3 Nov 2006 18:55:21 -0000	1.1.2.1
  +++ MuxChannelFactory.java	4 Nov 2006 04:49:46 -0000	1.1.2.2
  @@ -1,3 +1,24 @@
  +/*
  + * JBoss, Home of Professional Open Source.
  + * Copyright 2006, Red Hat Middleware LLC, and individual contributors
  + * as indicated by the @author tags. See the copyright.txt file in the
  + * distribution for a full listing of individual contributors.
  + *
  + * This is free software; you can redistribute it and/or modify it
  + * under the terms of the GNU Lesser General Public License as
  + * published by the Free Software Foundation; either version 2.1 of
  + * the License, or (at your option) any later version.
  + *
  + * This software is distributed in the hope that it will be useful,
  + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  + * Lesser General Public License for more details.
  + *
  + * You should have received a copy of the GNU Lesser General Public
  + * License along with this software; if not, write to the Free
  + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  + * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  + */
   package org.jboss.cache.multiplexer;
   
   import org.jgroups.Channel;
  @@ -6,9 +27,12 @@
   
   /**
    * Delegates to a JChannelFactory but exposes a StandardMBean interface.
  + * JChannelFactory does not expose a StandardMBean interface, making it
  + * fairly heavy to work with.  This class just exposes the subset of
  + * JChannelFactory methods needed by JBC or by the test suite.
    * 
    * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  - * @version $Revision: 1.1.2.1 $
  + * @version $Revision: 1.1.2.2 $
    */
   public class MuxChannelFactory implements MuxChannelFactoryMBean
   {
  
  
  
  1.1.2.3   +27 -0     JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/BuddyAssignmentStateTransferTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BuddyAssignmentStateTransferTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/BuddyAssignmentStateTransferTest.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -b -r1.1.2.2 -r1.1.2.3
  --- BuddyAssignmentStateTransferTest.java	4 Nov 2006 04:18:05 -0000	1.1.2.2
  +++ BuddyAssignmentStateTransferTest.java	4 Nov 2006 04:49:46 -0000	1.1.2.3
  @@ -1,7 +1,34 @@
  +/*
  + * JBoss, Home of Professional Open Source.
  + * Copyright 2006, Red Hat Middleware LLC, and individual contributors
  + * as indicated by the @author tags. See the copyright.txt file in the
  + * distribution for a full listing of individual contributors.
  + *
  + * This is free software; you can redistribute it and/or modify it
  + * under the terms of the GNU Lesser General Public License as
  + * published by the Free Software Foundation; either version 2.1 of
  + * the License, or (at your option) any later version.
  + *
  + * This software is distributed in the hope that it will be useful,
  + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  + * Lesser General Public License for more details.
  + *
  + * You should have received a copy of the GNU Lesser General Public
  + * License along with this software; if not, write to the Free
  + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  + * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  + */
   package org.jboss.cache.multiplexer;
   
   import org.jboss.cache.TreeCacheMBean;
   
  +/**
  + * Repeats the superclass tests, but with the multiplexer enabled.
  + * 
  + * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  + * @version $Revision: 1.1.2.3 $
  + */
   public class BuddyAssignmentStateTransferTest 
      extends org.jboss.cache.buddyreplication.BuddyAssignmentStateTransferTest
   {
  
  
  
  1.1.2.2   +27 -0     JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/SyncReplTxTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SyncReplTxTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/SyncReplTxTest.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- SyncReplTxTest.java	4 Nov 2006 04:18:30 -0000	1.1.2.1
  +++ SyncReplTxTest.java	4 Nov 2006 04:49:46 -0000	1.1.2.2
  @@ -1,7 +1,34 @@
  +/*
  + * JBoss, Home of Professional Open Source.
  + * Copyright 2006, Red Hat Middleware LLC, and individual contributors
  + * as indicated by the @author tags. See the copyright.txt file in the
  + * distribution for a full listing of individual contributors.
  + *
  + * This is free software; you can redistribute it and/or modify it
  + * under the terms of the GNU Lesser General Public License as
  + * published by the Free Software Foundation; either version 2.1 of
  + * the License, or (at your option) any later version.
  + *
  + * This software is distributed in the hope that it will be useful,
  + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  + * Lesser General Public License for more details.
  + *
  + * You should have received a copy of the GNU Lesser General Public
  + * License along with this software; if not, write to the Free
  + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  + * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  + */
   package org.jboss.cache.multiplexer;
   
   import org.jboss.cache.TreeCacheMBean;
   
  +/**
  + * Repeats the superclass tests, but with the multiplexer enabled.
  + * 
  + * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  + * @version $Revision: 1.1.2.2 $
  + */
   public class SyncReplTxTest extends org.jboss.cache.replicated.SyncReplTxTest
   {
      private MultiplexerTestHelper muxHelper;
  
  
  
  1.1.2.2   +27 -0     JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/MuxChannelFactoryMBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MuxChannelFactoryMBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/MuxChannelFactoryMBean.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- MuxChannelFactoryMBean.java	3 Nov 2006 18:55:21 -0000	1.1.2.1
  +++ MuxChannelFactoryMBean.java	4 Nov 2006 04:49:46 -0000	1.1.2.2
  @@ -1,9 +1,36 @@
  +/*
  + * JBoss, Home of Professional Open Source.
  + * Copyright 2006, Red Hat Middleware LLC, and individual contributors
  + * as indicated by the @author tags. See the copyright.txt file in the
  + * distribution for a full listing of individual contributors.
  + *
  + * This is free software; you can redistribute it and/or modify it
  + * under the terms of the GNU Lesser General Public License as
  + * published by the Free Software Foundation; either version 2.1 of
  + * the License, or (at your option) any later version.
  + *
  + * This software is distributed in the hope that it will be useful,
  + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  + * Lesser General Public License for more details.
  + *
  + * You should have received a copy of the GNU Lesser General Public
  + * License along with this software; if not, write to the Free
  + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  + * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  + */
   package org.jboss.cache.multiplexer;
   
   import org.jgroups.Channel;
   import org.jgroups.JChannelFactory;
   import org.w3c.dom.Element;
   
  +/**
  + * StandardMBean interface for MuxChannelFactory.
  + * 
  + * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  + * @version $Revision: 1.1.2.2 $
  + */
   public interface MuxChannelFactoryMBean
   {
      public Channel createMultiplexerChannel(String stack_name, String id) throws Exception;
  
  
  
  1.1.2.2   +27 -0     JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/BuddyReplicationFailoverTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BuddyReplicationFailoverTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/BuddyReplicationFailoverTest.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- BuddyReplicationFailoverTest.java	4 Nov 2006 04:31:02 -0000	1.1.2.1
  +++ BuddyReplicationFailoverTest.java	4 Nov 2006 04:49:46 -0000	1.1.2.2
  @@ -1,7 +1,34 @@
  +/*
  + * JBoss, Home of Professional Open Source.
  + * Copyright 2006, Red Hat Middleware LLC, and individual contributors
  + * as indicated by the @author tags. See the copyright.txt file in the
  + * distribution for a full listing of individual contributors.
  + *
  + * This is free software; you can redistribute it and/or modify it
  + * under the terms of the GNU Lesser General Public License as
  + * published by the Free Software Foundation; either version 2.1 of
  + * the License, or (at your option) any later version.
  + *
  + * This software is distributed in the hope that it will be useful,
  + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  + * Lesser General Public License for more details.
  + *
  + * You should have received a copy of the GNU Lesser General Public
  + * License along with this software; if not, write to the Free
  + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  + * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  + */
   package org.jboss.cache.multiplexer;
   
   import org.jboss.cache.TreeCacheMBean;
   
  +/**
  + * Repeats the superclass tests, but with the multiplexer enabled.
  + * 
  + * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  + * @version $Revision: 1.1.2.2 $
  + */
   public class BuddyReplicationFailoverTest 
      extends org.jboss.cache.buddyreplication.BuddyReplicationFailoverTest
   {
  
  
  
  1.1.2.2   +27 -0     JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/BuddyGroupAssignmentTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BuddyGroupAssignmentTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/BuddyGroupAssignmentTest.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- BuddyGroupAssignmentTest.java	4 Nov 2006 04:31:02 -0000	1.1.2.1
  +++ BuddyGroupAssignmentTest.java	4 Nov 2006 04:49:46 -0000	1.1.2.2
  @@ -1,7 +1,34 @@
  +/*
  + * JBoss, Home of Professional Open Source.
  + * Copyright 2006, Red Hat Middleware LLC, and individual contributors
  + * as indicated by the @author tags. See the copyright.txt file in the
  + * distribution for a full listing of individual contributors.
  + *
  + * This is free software; you can redistribute it and/or modify it
  + * under the terms of the GNU Lesser General Public License as
  + * published by the Free Software Foundation; either version 2.1 of
  + * the License, or (at your option) any later version.
  + *
  + * This software is distributed in the hope that it will be useful,
  + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  + * Lesser General Public License for more details.
  + *
  + * You should have received a copy of the GNU Lesser General Public
  + * License along with this software; if not, write to the Free
  + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  + * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  + */
   package org.jboss.cache.multiplexer;
   
   import org.jboss.cache.TreeCacheMBean;
   
  +/**
  + * Repeats the superclass tests, but with the multiplexer enabled.
  + * 
  + * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  + * @version $Revision: 1.1.2.2 $
  + */
   public class BuddyGroupAssignmentTest 
      extends org.jboss.cache.buddyreplication.BuddyGroupAssignmentTest
   {
  
  
  
  1.1.2.4   +71 -16    JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/MultiplexerTestHelper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MultiplexerTestHelper.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/MultiplexerTestHelper.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -b -r1.1.2.3 -r1.1.2.4
  --- MultiplexerTestHelper.java	3 Nov 2006 21:20:29 -0000	1.1.2.3
  +++ MultiplexerTestHelper.java	4 Nov 2006 04:49:46 -0000	1.1.2.4
  @@ -1,3 +1,24 @@
  +/*
  + * JBoss, Home of Professional Open Source.
  + * Copyright 2006, Red Hat Middleware LLC, and individual contributors
  + * as indicated by the @author tags. See the copyright.txt file in the
  + * distribution for a full listing of individual contributors.
  + *
  + * This is free software; you can redistribute it and/or modify it
  + * under the terms of the GNU Lesser General Public License as
  + * published by the Free Software Foundation; either version 2.1 of
  + * the License, or (at your option) any later version.
  + *
  + * This software is distributed in the hope that it will be useful,
  + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  + * Lesser General Public License for more details.
  + *
  + * You should have received a copy of the GNU Lesser General Public
  + * License along with this software; if not, write to the Free
  + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  + * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  + */
   package org.jboss.cache.multiplexer;
   
   import java.util.Collections;
  @@ -20,6 +41,13 @@
   import org.w3c.dom.Document;
   import org.w3c.dom.Element;
   
  +/**
  + * Utility class that can associate a cache with a JMX server and a
  + * a JGroups JChannelFactory.
  + * 
  + * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  + * @version $Revision: 1.1.2.4 $
  + */
   public class MultiplexerTestHelper
   {
      private static final Log log = LogFactory.getLog(MultiplexerTestHelper.class);
  @@ -28,7 +56,6 @@
      private static final String FACTORY_OBJECT_NAME_BASE = "jboss.cache:service=MuxChannelFactory,count=";
      
      private MBeanServer mbeanServer;
  -//   private MuxChannelFactory muxFactory;
      private final Set factories = Collections.synchronizedSet(new HashSet());
      private final Set caches = Collections.synchronizedSet(new HashSet());
   
  @@ -39,29 +66,45 @@
            MBeanServerFactory.createMBeanServer();
      }
      
  +   /**
  +    * Configures the given cache to get its JChannel from a
  +    * multiplexer-enabled JChannelFactory.  The JChannelFactory will
  +    * produce MuxChannels configured with the same protocol stack as
  +    * whatever the provided cache is configured with.
  +    * 
  +    * @param cache
  +    * @throws Exception
  +    */
      public void configureCacheForMux(TreeCacheMBean cache) throws Exception
      {
         synchronized (caches)
         {
  -         ObjectName on = new ObjectName("jboss.cache:service=TestCache,count=" + caches.size());
  -         configureCacheForMux(cache, on);
  -      }
  -   }
  -   
  -   public void configureCacheForMux(TreeCacheMBean cache, ObjectName cacheObjectName) throws Exception
  -   {
         ObjectName on = createMuxChannelFactory(cache);
         cache.setMultiplexerService(on.getCanonicalName());
         cache.setMultiplexerStack(MUX_STACK);
         
  -      mbeanServer.registerMBean(cache, cacheObjectName);
  -      caches.add(cacheObjectName);
  +         ObjectName cacheON = new ObjectName("jboss.cache:service=TestCache,count=" + caches.size());
  +         mbeanServer.registerMBean(cache, cacheON);
  +         caches.add(cacheON);
  +      }
      }
      
  +   /**
  +    * Creates a JChannelFactory and binds it to this object's
  +    * internal MBeanServer.  The JChannelFactory will
  +    * produce MuxChannels configured with the same protocol stack as
  +    * whatever the provided cache is configured with.
  +    * 
  +    * @param cache  the cache from which the protocol stack config should
  +    *               be obtained
  +    *               
  +    * @return the ObjectName of the channel factory.
  +    * @throws Exception
  +    */
      public ObjectName createMuxChannelFactory(TreeCacheMBean cache) throws Exception
      {
         String props = cache.getClusterProperties();
  -      props = props == null ? JChannel.DEFAULT_PROTOCOL_STACK : props;
  +      props = (props == null ? JChannel.DEFAULT_PROTOCOL_STACK : props);
         return createMuxChannelFactory(getClusterConfigElement(props));
      }
      
  @@ -74,6 +117,7 @@
            factory.setExposeChannels(false);
               
            MuxChannelFactory muxFactory = new MuxChannelFactory(factory, muxConfig);
  +         // Give the factory a unique ObjectName
            ObjectName on = new ObjectName(FACTORY_OBJECT_NAME_BASE + factories.size());
            mbeanServer.registerMBean(muxFactory, on);
            
  @@ -138,6 +182,11 @@
         return top;
      }
   
  +   /**
  +    * Performs cleanup work, most importantly unregistering the
  +    * internal MBeanServer.  Once this method is invoked, this
  +    * object should no longer be used.
  +    */
      public void tearDown()
      {
         try
  @@ -185,8 +234,9 @@
         }
      }
      
  -   
  -   
  +   /**
  +    * Makes sure the internal MBeanServer is unregistered.
  +    */
      protected void finalize() throws Throwable
      {
         if (mbeanServer != null)
  @@ -196,6 +246,11 @@
         super.finalize();
      }
   
  +   /**
  +    * Tests creation of a channel factory.
  +    * 
  +    * @param args
  +    */
      public static void main(String[] args)
      {
         MultiplexerTestHelper helper = new MultiplexerTestHelper();
  
  
  
  1.1.2.2   +27 -0     JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/BuddyBackupActivationInactivationTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BuddyBackupActivationInactivationTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/multiplexer/Attic/BuddyBackupActivationInactivationTest.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- BuddyBackupActivationInactivationTest.java	4 Nov 2006 04:19:37 -0000	1.1.2.1
  +++ BuddyBackupActivationInactivationTest.java	4 Nov 2006 04:49:46 -0000	1.1.2.2
  @@ -1,7 +1,34 @@
  +/*
  + * JBoss, Home of Professional Open Source.
  + * Copyright 2006, Red Hat Middleware LLC, and individual contributors
  + * as indicated by the @author tags. See the copyright.txt file in the
  + * distribution for a full listing of individual contributors.
  + *
  + * This is free software; you can redistribute it and/or modify it
  + * under the terms of the GNU Lesser General Public License as
  + * published by the Free Software Foundation; either version 2.1 of
  + * the License, or (at your option) any later version.
  + *
  + * This software is distributed in the hope that it will be useful,
  + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  + * Lesser General Public License for more details.
  + *
  + * You should have received a copy of the GNU Lesser General Public
  + * License along with this software; if not, write to the Free
  + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  + * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  + */
   package org.jboss.cache.multiplexer;
   
   import org.jboss.cache.TreeCacheMBean;
   
  +/**
  + * Repeats the superclass tests, but with the multiplexer enabled.
  + * 
  + * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  + * @version $Revision: 1.1.2.2 $
  + */
   public class BuddyBackupActivationInactivationTest 
      extends org.jboss.cache.buddyreplication.BuddyBackupActivationInactivationTest
   {
  
  
  



More information about the jboss-cvs-commits mailing list