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

[Manik Surtani]

  User: msurtani
  Date: 06/07/20 07:48:26

  Modified:    tests/functional/org/jboss/cache/transaction  
                        ConcurrentTransactionalTest.java
                        ReplicatedTransactionDeadlockTest.java
  Log:
  migrated to new configurators
  
  Revision  Changes    Path
  1.4       +9 -5      JBossCache/tests/functional/org/jboss/cache/transaction/ConcurrentTransactionalTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConcurrentTransactionalTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/transaction/ConcurrentTransactionalTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ConcurrentTransactionalTest.java	20 Jul 2006 10:32:09 -0000	1.3
  +++ ConcurrentTransactionalTest.java	20 Jul 2006 11:48:26 -0000	1.4
  @@ -12,22 +12,27 @@
   import junit.framework.TestSuite;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.jboss.cache.PropertyConfigurator;
   import org.jboss.cache.TreeCache;
   import org.jboss.cache.config.Configuration;
  +import org.jboss.cache.factories.XmlConfigurationParser;
   import org.jboss.cache.lock.IsolationLevel;
   
   import javax.naming.Context;
   import javax.naming.InitialContext;
   import javax.naming.NamingException;
   import javax.transaction.UserTransaction;
  -import java.util.*;
  +import java.util.Collections;
  +import java.util.Iterator;
  +import java.util.LinkedList;
  +import java.util.List;
  +import java.util.Properties;
  +import java.util.Set;
   
   /**
    * Unit test for local TreeCache. Use locking and multiple threads to test
    * concurrent access to the tree.
    *
  - * @version $Id: ConcurrentTransactionalTest.java,v 1.3 2006/07/20 10:32:09 msurtani Exp $
  + * @version $Id: ConcurrentTransactionalTest.java,v 1.4 2006/07/20 11:48:26 msurtani Exp $
    */
   public class ConcurrentTransactionalTest extends TestCase
   {
  @@ -59,8 +64,7 @@
      private void createCache(IsolationLevel level) throws Exception
      {
         cache = new TreeCache();
  -      PropertyConfigurator config = new PropertyConfigurator();
  -      config.configure(cache, "META-INF/local-service.xml");
  +      cache.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/local-service.xml"));
   
         cache.getConfiguration().setCacheMode(Configuration.CacheMode.LOCAL);
         cache.getConfiguration().setIsolationLevel(level);
  
  
  
  1.3       +7 -8      JBossCache/tests/functional/org/jboss/cache/transaction/ReplicatedTransactionDeadlockTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ReplicatedTransactionDeadlockTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/transaction/ReplicatedTransactionDeadlockTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ReplicatedTransactionDeadlockTest.java	20 Jul 2006 10:54:01 -0000	1.2
  +++ ReplicatedTransactionDeadlockTest.java	20 Jul 2006 11:48:26 -0000	1.3
  @@ -4,9 +4,9 @@
   import junit.framework.TestCase;
   import junit.framework.TestSuite;
   import org.jboss.cache.Fqn;
  -import org.jboss.cache.PropertyConfigurator;
   import org.jboss.cache.TreeCache;
   import org.jboss.cache.config.Configuration;
  +import org.jboss.cache.factories.XmlConfigurationParser;
   
   import javax.naming.Context;
   import javax.naming.InitialContext;
  @@ -56,8 +56,8 @@
    * @author Marian Nikolov
    * @author $Author: msurtani $
    * @version $RCSfile: ReplicatedTransactionDeadlockTest.java,v $
  - * @version $Revision: 1.2 $
  - * @version $Date: 2006/07/20 10:54:01 $
  + * @version $Revision: 1.3 $
  + * @version $Date: 2006/07/20 11:48:26 $
    */
   public class ReplicatedTransactionDeadlockTest extends TestCase {
       /** The number of worker threads to start concurrently. */
  @@ -105,10 +105,9 @@
           m_contextFactory = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
           System.setProperty(Context.INITIAL_CONTEXT_FACTORY, CONTEXT_FACTORY);
           DummyTransactionManager.getInstance();
  -        PropertyConfigurator config = new PropertyConfigurator();
           // setup and start the source cache
           m_srcCache = new TreeCache();
  -        config.configure(m_srcCache, "META-INF/replSync-service.xml");
  +        m_srcCache.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/replSync-service.xml"));
           m_srcCache.getConfiguration().setTransactionManagerLookupClass(
                   "org.jboss.cache.DummyTransactionManagerLookup");
           m_srcCache.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_SYNC);
  @@ -118,7 +117,7 @@
           m_srcCache.startService();
           // setup and start the destination cache
           m_dstCache = new TreeCache();
  -        config.configure(m_dstCache, "META-INF/replSync-service.xml");
  +        m_dstCache.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/replSync-service.xml"));
           m_dstCache.getConfiguration().setTransactionManagerLookupClass(
                   "org.jboss.cache.DummyTransactionManagerLookup");
           m_dstCache.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_SYNC);
  @@ -209,8 +208,8 @@
        * @author Marian Nikolov
        * @author $Author: msurtani $
        * @version $RCSfile: ReplicatedTransactionDeadlockTest.java,v $
  -     * @version $Revision: 1.2 $
  -     * @version $Date: 2006/07/20 10:54:01 $
  +     * @version $Revision: 1.3 $
  +     * @version $Date: 2006/07/20 11:48:26 $
        */
       private class Worker extends Thread {
           /**