[jboss-cvs] jboss-jms/tests/src/org/jboss/test/messaging/core ...

[Timothy Fox]

  User: timfox  
  Date: 06/07/17 13:14:50

  Modified:    tests/src/org/jboss/test/messaging/core     
                        SimpleChannel.java SimpleReceiver.java
  Removed:     tests/src/org/jboss/test/messaging/core     
                        NonRecoverableState1Test.java
                        NonRecoverableState2Test.java
                        RecoverableStateTest.java
  Log:
  Many changes including implementation of prefetch, SEDAisation of server, changing of recovery
  
  Revision  Changes    Path
  1.16      +24 -9     jboss-jms/tests/src/org/jboss/test/messaging/core/SimpleChannel.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SimpleChannel.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/tests/src/org/jboss/test/messaging/core/SimpleChannel.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- SimpleChannel.java	24 Jun 2006 09:05:39 -0000	1.15
  +++ SimpleChannel.java	17 Jul 2006 17:14:50 -0000	1.16
  @@ -27,9 +27,9 @@
    *
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  - * @version <tt>$Revision: 1.15 $</tt>
  + * @version <tt>$Revision: 1.16 $</tt>
    *
  - * $Id: SimpleChannel.java,v 1.15 2006/06/24 09:05:39 timfox Exp $
  + * $Id: SimpleChannel.java,v 1.16 2006/07/17 17:14:50 timfox Exp $
    */
   public class SimpleChannel implements Channel
   {
  @@ -85,17 +85,12 @@
         return ms;
      }
   
  -   public boolean deliver(Receiver receiver)
  +   public void deliver(boolean synch)
      {
  -      log.debug("redeliver(" + receiver + ")");
  +      log.debug("deliver()");
         deliveryNotification = true;
  -      return false;
      }
      
  -   public boolean deliver()
  -   {
  -      throw new NotYetImplementedException();
  -   }
   
      public void close()
      {
  @@ -172,6 +167,26 @@
         return "SimpleChannel[" + getChannelID() + "]";
      }
   
  +   public List delivering(Filter filter)
  +   {
  +      throw new NotYetImplementedException();
  +   }
  +
  +   public void load() throws Exception
  +   { 
  +      throw new NotYetImplementedException();
  +   }
  +
  +   public int messageCount()
  +   {
  +      throw new NotYetImplementedException();
  +   }
  +
  +   public List undelivered(Filter filter)
  +   {
  +      throw new NotYetImplementedException();
  +   }
  +
      // Package protected ---------------------------------------------
      
      // Protected -----------------------------------------------------
  
  
  
  1.18      +5 -3      jboss-jms/tests/src/org/jboss/test/messaging/core/SimpleReceiver.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SimpleReceiver.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/tests/src/org/jboss/test/messaging/core/SimpleReceiver.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- SimpleReceiver.java	23 Feb 2006 17:45:58 -0000	1.17
  +++ SimpleReceiver.java	17 Jul 2006 17:14:50 -0000	1.18
  @@ -46,9 +46,9 @@
    * an "active" delivery (NACKING) undelivered, or throw unchecked exceptions.
    *
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
  - * @version <tt>$Revision: 1.17 $</tt>
  + * @version <tt>$Revision: 1.18 $</tt>
    *
  - * $Id: SimpleReceiver.java,v 1.17 2006/02/23 17:45:58 timfox Exp $
  + * $Id: SimpleReceiver.java,v 1.18 2006/07/17 17:14:50 timfox Exp $
    */
   public class SimpleReceiver implements Receiver
   {
  @@ -119,6 +119,8 @@
   
      public Delivery handle(DeliveryObserver observer, Routable r, Transaction tx)
      {
  +      log.info(this + " got routable:" + r);
  +      
         try
         {
            if (r == null)
  @@ -201,7 +203,7 @@
            return;
         }
         log.info("receiver explicitely requesting message from the channel");
  -      channel.deliver(this);
  +      channel.deliver(true);
      }
   
      public void clear()