[jboss-cvs] JBossCache/tests/interop/org/jboss/cache/interop ...

[Brian Stansberry]

  User: bstansberry
  Date: 06/07/20 22:51:29

  Modified:    tests/interop/org/jboss/cache/interop    Tag:
                        Branch_JBossCache_1_4_0_MUX Shutdown.java Main.java
                        InteropTest.java
  Log:
  Sync to JBossCache_1_4_0_GA
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.6.1   +3 -4      JBossCache/tests/interop/org/jboss/cache/interop/Shutdown.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Shutdown.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/interop/org/jboss/cache/interop/Shutdown.java,v
  retrieving revision 1.2
  retrieving revision 1.2.6.1
  diff -u -b -r1.2 -r1.2.6.1
  --- Shutdown.java	21 Feb 2006 01:37:47 -0000	1.2
  +++ Shutdown.java	21 Jul 2006 02:51:29 -0000	1.2.6.1
  @@ -22,15 +22,15 @@
   
   package org.jboss.cache.interop;
   
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
  +
   import java.io.InputStream;
   import java.io.ObjectInputStream;
   import java.io.ObjectOutputStream;
   import java.io.OutputStream;
   import java.net.Socket;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
   /**
    * Opens a connection to the socket created by {@link Main} and
    * tells it to shut down.
  @@ -75,7 +75,6 @@
      }
      
      /**
  -    * FIXME Comment this
       * 
       * @param args
       */
  
  
  
  1.2.6.1   +6 -7      JBossCache/tests/interop/org/jboss/cache/interop/Main.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Main.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/interop/org/jboss/cache/interop/Main.java,v
  retrieving revision 1.2
  retrieving revision 1.2.6.1
  diff -u -b -r1.2 -r1.2.6.1
  --- Main.java	21 Feb 2006 01:37:47 -0000	1.2
  +++ Main.java	21 Jul 2006 02:51:29 -0000	1.2.6.1
  @@ -22,6 +22,12 @@
   
   package org.jboss.cache.interop;
   
  +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.TreeCacheMBean;
  +
   import java.io.BufferedInputStream;
   import java.io.ObjectInputStream;
   import java.io.ObjectOutputStream;
  @@ -29,12 +35,6 @@
   import java.net.ServerSocket;
   import java.net.Socket;
   
  -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.TreeCacheMBean;
  -
   /**
    * Starts a JBossCache instance and then listens on a socket for
    * a call from {@link Shutdown}.
  @@ -57,7 +57,6 @@
      private boolean stopped;
      
      /**
  -    * FIXME Comment this
       * 
       * @param args
       */
  
  
  
  1.3.6.1   +7 -12     JBossCache/tests/interop/org/jboss/cache/interop/InteropTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InteropTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/interop/org/jboss/cache/interop/InteropTest.java,v
  retrieving revision 1.3
  retrieving revision 1.3.6.1
  diff -u -b -r1.3 -r1.3.6.1
  --- InteropTest.java	23 Feb 2006 03:37:59 -0000	1.3
  +++ InteropTest.java	21 Jul 2006 02:51:29 -0000	1.3.6.1
  @@ -1,15 +1,7 @@
   package org.jboss.cache.interop;
   
  -import java.util.HashMap;
  -import java.util.Map;
  -import java.util.Set;
  -
  -import javax.transaction.Synchronization;
  -import javax.transaction.Transaction;
  -import javax.transaction.TransactionManager;
  -
  +import EDU.oswego.cs.dl.util.concurrent.Latch;
   import junit.framework.TestCase;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.ConfigureException;
  @@ -19,7 +11,12 @@
   import org.jboss.cache.lock.TimeoutException;
   import org.jboss.cache.misc.TestingUtil;
   
  -import EDU.oswego.cs.dl.util.concurrent.Latch;
  +import javax.transaction.Synchronization;
  +import javax.transaction.Transaction;
  +import javax.transaction.TransactionManager;
  +import java.util.HashMap;
  +import java.util.Map;
  +import java.util.Set;
   
   public class InteropTest extends TestCase
   {
  @@ -209,7 +206,6 @@
            }
            catch (Exception e)
            {
  -            // TODO Auto-generated catch block
               e.printStackTrace();
            }    
            
  @@ -240,7 +236,6 @@
            }
            catch (Exception e)
            {
  -            // TODO Auto-generated catch block
               e.printStackTrace();
            }