[jboss-cvs] jboss-jms/src/main/org/jboss/jms/client/delegate ...
Timothy Fox
tim.fox at jboss.com
Mon Jul 17 13:14:44 EDT 2006
User: timfox
Date: 06/07/17 13:14:44
Modified: src/main/org/jboss/jms/client/delegate
ClientConsumerDelegate.java
ClientSessionDelegate.java
Log:
Many changes including implementation of prefetch, SEDAisation of server, changing of recovery
Revision Changes Path
1.12 +11 -44 jboss-jms/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ClientConsumerDelegate.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ClientConsumerDelegate.java 28 Mar 2006 14:26:15 -0000 1.11
+++ ClientConsumerDelegate.java 17 Jul 2006 17:14:44 -0000 1.12
@@ -21,8 +21,6 @@
*/
package org.jboss.jms.client.delegate;
-import java.util.List;
-
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
@@ -31,7 +29,6 @@
import org.jboss.jms.client.state.ConnectionState;
import org.jboss.jms.delegate.ConsumerDelegate;
import org.jboss.jms.destination.JBossDestination;
-import org.jboss.jms.message.MessageProxy;
import org.jboss.jms.server.remoting.MetaDataConstants;
import org.jboss.remoting.Client;
@@ -41,9 +38,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.11 $</tt>
+ * @version <tt>$Revision: 1.12 $</tt>
*
- * $Id: ClientConsumerDelegate.java,v 1.11 2006/03/28 14:26:15 timfox Exp $
+ * $Id: ClientConsumerDelegate.java,v 1.12 2006/07/17 17:14:44 timfox Exp $
*/
public class ClientConsumerDelegate extends DelegateSupport implements ConsumerDelegate
{
@@ -53,13 +50,17 @@
// Attributes ----------------------------------------------------
+ protected int bufferSize;
+
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
- public ClientConsumerDelegate(int objectID)
+ public ClientConsumerDelegate(int objectID, int bufferSize)
{
super(objectID);
+
+ this.bufferSize = bufferSize;
}
public ClientConsumerDelegate()
@@ -72,25 +73,7 @@
* This invocation should either be handled by the client-side interceptor chain or by the
* server-side endpoint.
*/
- public void activate() throws JMSException
- {
- throw new IllegalStateException("This invocation should not be handled here!");
- }
-
- /**
- * This invocation should either be handled by the client-side interceptor chain or by the
- * server-side endpoint.
- */
- public void cancelDelivery(long messageID) throws JMSException
- {
- throw new IllegalStateException("This invocation should not be handled here!");
- }
-
- /**
- * This invocation should either be handled by the client-side interceptor chain or by the
- * server-side endpoint.
- */
- public void cancelDeliveries(List ids) throws JMSException
+ public void more()
{
throw new IllegalStateException("This invocation should not be handled here!");
}
@@ -117,15 +100,6 @@
* This invocation should either be handled by the client-side interceptor chain or by the
* server-side endpoint.
*/
- public long deactivate() throws JMSException
- {
- throw new IllegalStateException("This invocation should not be handled here!");
- }
-
- /**
- * This invocation should either be handled by the client-side interceptor chain or by the
- * server-side endpoint.
- */
public MessageListener getMessageListener()
{
throw new IllegalStateException("This invocation should not be handled here!");
@@ -135,15 +109,6 @@
* This invocation should either be handled by the client-side interceptor chain or by the
* server-side endpoint.
*/
- public MessageProxy getMessageNow(boolean wait) throws JMSException
- {
- throw new IllegalStateException("This invocation should not be handled here!");
- }
-
- /**
- * This invocation should either be handled by the client-side interceptor chain or by the
- * server-side endpoint.
- */
public Message receive(long timeout) throws JMSException
{
throw new IllegalStateException("This invocation should not be handled here!");
@@ -192,6 +157,8 @@
super.init();
getMetaData().addMetaData(MetaDataConstants.JMS, MetaDataConstants.CONSUMER_ID,
new Integer(id), PayloadKey.TRANSIENT);
+ getMetaData().addMetaData(MetaDataConstants.JMS, MetaDataConstants.PREFETCH_SIZE,
+ new Integer(bufferSize), PayloadKey.TRANSIENT);
}
public String toString()
1.10 +39 -9 jboss-jms/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ClientSessionDelegate.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ClientSessionDelegate.java 11 Mar 2006 14:26:18 -0000 1.9
+++ ClientSessionDelegate.java 17 Jul 2006 17:14:44 -0000 1.10
@@ -22,6 +22,7 @@
package org.jboss.jms.client.delegate;
import java.io.Serializable;
+import java.util.List;
import javax.jms.JMSException;
import javax.jms.MessageListener;
@@ -42,6 +43,7 @@
import org.jboss.jms.message.ObjectMessageProxy;
import org.jboss.jms.message.StreamMessageProxy;
import org.jboss.jms.message.TextMessageProxy;
+import org.jboss.jms.tx.AckInfo;
import org.jboss.remoting.Client;
/**
@@ -50,9 +52,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.9 $</tt>
+ * @version <tt>$Revision: 1.10 $</tt>
*
- * $Id: ClientSessionDelegate.java,v 1.9 2006/03/11 14:26:18 timfox Exp $
+ * $Id: ClientSessionDelegate.java,v 1.10 2006/07/17 17:14:44 timfox Exp $
*/
public class ClientSessionDelegate extends DelegateSupport implements SessionDelegate
{
@@ -81,7 +83,7 @@
* This invocation should either be handled by the client-side interceptor chain or by the
* server-side endpoint.
*/
- public void acknowledge(String messageID, String receiverID) throws JMSException
+ public void acknowledge(AckInfo ackInfo) throws JMSException
{
throw new IllegalStateException("This invocation should not be handled here!");
}
@@ -90,7 +92,16 @@
* This invocation should either be handled by the client-side interceptor chain or by the
* server-side endpoint.
*/
- public void acknowledge() throws JMSException
+ public void acknowledgeBatch(List ackInfos) throws JMSException
+ {
+ throw new IllegalStateException("This invocation should not be handled here!");
+ }
+
+ /**
+ * This invocation should either be handled by the client-side interceptor chain or by the
+ * server-side endpoint.
+ */
+ public void acknowledgeAll() throws JMSException
{
throw new IllegalStateException("This invocation should not be handled here!");
}
@@ -108,7 +119,7 @@
* This invocation should either be handled by the client-side interceptor chain or by the
* server-side endpoint.
*/
- public void cancelDeliveries() throws JMSException
+ public void redeliver() throws JMSException
{
throw new IllegalStateException("This invocation should not be handled here!");
}
@@ -282,7 +293,7 @@
* This invocation should either be handled by the client-side interceptor chain or by the
* server-side endpoint.
*/
- public void postDeliver(long messageID, int receiverID) throws JMSException
+ public void postDeliver(MessageProxy proxy, int consumerID) throws JMSException
{
throw new IllegalStateException("This invocation should not be handled here!");
}
@@ -291,7 +302,7 @@
* This invocation should either be handled by the client-side interceptor chain or by the
* server-side endpoint.
*/
- public void preDeliver(long messageID, int receiverID) throws JMSException
+ public void preDeliver(MessageProxy proxy, int consumerID) throws JMSException
{
throw new IllegalStateException("This invocation should not be handled here!");
}
@@ -309,6 +320,15 @@
* This invocation should either be handled by the client-side interceptor chain or by the
* server-side endpoint.
*/
+ public void redeliver(List ackInfos) throws JMSException
+ {
+ throw new IllegalStateException("This invocation should not be handled here!");
+ }
+
+ /**
+ * This invocation should either be handled by the client-side interceptor chain or by the
+ * server-side endpoint.
+ */
public void rollback() throws JMSException
{
throw new IllegalStateException("This invocation should not be handled here!");
@@ -386,6 +406,16 @@
throw new IllegalStateException("This invocation should not be handled here!");
}
+ /**
+ * This invocation should either be handled by the client-side interceptor chain or by the
+ * server-side endpoint.
+ */
+ public void cancelDeliveries(List ackInfos)
+ {
+ throw new IllegalStateException("This invocation should not be handled here!");
+ }
+
+
// Public --------------------------------------------------------
public String toString()
More information about the jboss-cvs-commits
mailing list