[jboss-cvs] jboss-jms/src/main/org/jboss/jms/server/endpoint/advised ...

[Timothy Fox]

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

  Modified:    src/main/org/jboss/jms/server/endpoint/advised  
                        ConsumerAdvised.java SessionAdvised.java
  Log:
  Many changes including implementation of prefetch, SEDAisation of server, changing of recovery
  
  Revision  Changes    Path
  1.8       +6 -27     jboss-jms/src/main/org/jboss/jms/server/endpoint/advised/ConsumerAdvised.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConsumerAdvised.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/server/endpoint/advised/ConsumerAdvised.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- ConsumerAdvised.java	28 Mar 2006 14:26:16 -0000	1.7
  +++ ConsumerAdvised.java	17 Jul 2006 17:14:46 -0000	1.8
  @@ -25,7 +25,6 @@
   
   import javax.jms.JMSException;
   
  -import org.jboss.jms.message.MessageProxy;
   import org.jboss.jms.server.endpoint.ConsumerEndpoint;
   
   /**
  @@ -34,9 +33,9 @@
    *
    * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
  - * @version <tt>$Revision: 1.7 $</tt>
  + * @version <tt>$Revision: 1.8 $</tt>
    *
  - * $Id: ConsumerAdvised.java,v 1.7 2006/03/28 14:26:16 timfox Exp $
  + * $Id: ConsumerAdvised.java,v 1.8 2006/07/17 17:14:46 timfox Exp $
    */
   public class ConsumerAdvised extends AdvisedSupport implements ConsumerEndpoint
   {
  @@ -57,21 +56,6 @@
   
      // ConsumerAdvised implementation --------------------------------
   
  -   public void activate() throws JMSException
  -   {
  -      endpoint.activate();
  -   }
  -
  -   public void cancelDelivery(long messageID) throws JMSException
  -   {
  -      endpoint.cancelDelivery(messageID);
  -   }
  -   
  -   public void cancelDeliveries(List messageIDs) throws JMSException
  -   {
  -      endpoint.cancelDeliveries(messageIDs);
  -   }
  -
      public void close() throws JMSException
      {
         endpoint.close();
  @@ -82,14 +66,9 @@
         endpoint.closing();
      }
   
  -   public long deactivate() throws JMSException
  -   {
  -      return endpoint.deactivate();
  -   }
  -
  -   public MessageProxy getMessageNow(boolean wait) throws JMSException
  +   public void more() throws JMSException
      {
  -      return endpoint.getMessageNow(wait);
  +      endpoint.more();
      }
   
      // AdvisedSupport overrides --------------------------------------
  
  
  
  1.5       +16 -7     jboss-jms/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SessionAdvised.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- SessionAdvised.java	11 Mar 2006 14:26:18 -0000	1.4
  +++ SessionAdvised.java	17 Jul 2006 17:14:46 -0000	1.5
  @@ -21,6 +21,8 @@
     */
   package org.jboss.jms.server.endpoint.advised;
   
  +import java.util.List;
  +
   import javax.jms.JMSException;
   
   import org.jboss.jms.delegate.BrowserDelegate;
  @@ -30,6 +32,7 @@
   import org.jboss.jms.destination.JBossTopic;
   import org.jboss.jms.message.JBossMessage;
   import org.jboss.jms.server.endpoint.SessionEndpoint;
  +import org.jboss.jms.tx.AckInfo;
   
   /**
    * The server-side advised instance corresponding to a Session. It is bound to the AOP
  @@ -37,9 +40,9 @@
    *
    * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
  - * @version <tt>$Revision: 1.4 $</tt>
  + * @version <tt>$Revision: 1.5 $</tt>
    *
  - * $Id: SessionAdvised.java,v 1.4 2006/03/11 14:26:18 timfox Exp $
  + * $Id: SessionAdvised.java,v 1.5 2006/07/17 17:14:46 timfox Exp $
    */
   public class SessionAdvised extends AdvisedSupport implements SessionEndpoint
   {
  @@ -98,14 +101,14 @@
         return endpoint.createTopic(topicName);
      }
   
  -   public void acknowledge() throws JMSException
  +   public void acknowledgeBatch(List ackInfos) throws JMSException
      {
  -      endpoint.acknowledge();
  +      endpoint.acknowledgeBatch(ackInfos);
      }
   
  -   public void cancelDeliveries() throws JMSException
  +   public void acknowledge(AckInfo ack) throws JMSException
      {
  -      endpoint.cancelDeliveries();
  +      endpoint.acknowledge(ack);
      }
   
      public void addTemporaryDestination(JBossDestination destination) throws JMSException
  @@ -123,6 +126,12 @@
         endpoint.unsubscribe(subscriptionName);
      }
   
  +   public void cancelDeliveries(List ackInfos) throws JMSException
  +   {
  +      endpoint.cancelDeliveries(ackInfos);
  +   }
  +
  +
      // AdvisedSupport overrides --------------------------------------
   
      public Object getEndpoint()