User: chirino
Date: 01/08/22 20:57:09
Added: src/main/org/jboss/mq Tag: Branch_2_4
AcknowledgementRequest.java Connection.java
ConnectionToken.java DurableSubcriptionID.java
GenericConnectionFactory.java Mutex.java
ReceiveRequest.java SpyBytesMessage.java
SpyConnection.java SpyConnectionConsumer.java
SpyConnectionFactory.java
SpyConnectionMetaData.java SpyConsumer.java
SpyDestination.java SpyEncapsulatedMessage.java
SpyJMSException.java SpyMapMessage.java
SpyMessage.java SpyMessageConsumer.java
SpyMessageProducer.java SpyObjectMessage.java
SpyQueue.java SpyQueueBrowser.java
SpyQueueReceiver.java SpyQueueSender.java
SpyQueueSession.java SpySession.java
SpyStreamMessage.java SpyTemporaryQueue.java
SpyTemporaryTopic.java SpyTextMessage.java
SpyTopic.java SpyTopicPublisher.java
SpyTopicSession.java SpyTopicSubscriber.java
SpyXAConnection.java SpyXAConnectionFactory.java
SpyXAResource.java SpyXAResourceManager.java
Subscription.java TransactionRequest.java
Log:
Back porting JBossMQ 1.0.0 BETA 1 to 2_4 branch
Revision Changes Path
No revision
No revision
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/AcknowledgementRequest.java
Index: AcknowledgementRequest.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/AcknowledgementRequest.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- AcknowledgementRequest.java 2001/08/17 03:04:01 1.2
+++ AcknowledgementRequest.java 2001/08/23 03:57:08 1.2.2.1
@@ -16,7 +16,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author David Maplesden ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class AcknowledgementRequest
implements java.io.Serializable, java.io.Externalizable {
1.3.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/Connection.java
Index: Connection.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/Connection.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- Connection.java 2001/08/17 22:57:42 1.3
+++ Connection.java 2001/08/23 03:57:08 1.3.2.1
@@ -36,7 +36,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.3.2.1 $
*/
public class Connection implements java.io.Serializable, javax.jms.Connection {
//Maps a destination to a LinkedList of Subscriptions
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/ConnectionToken.java
Index: ConnectionToken.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/ConnectionToken.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- ConnectionToken.java 2001/08/17 03:04:01 1.2
+++ ConnectionToken.java 2001/08/23 03:57:08 1.2.2.1
@@ -18,7 +18,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class ConnectionToken
implements Serializable {
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/DurableSubcriptionID.java
Index: DurableSubcriptionID.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/DurableSubcriptionID.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- DurableSubcriptionID.java 2001/08/17 03:04:01 1.2
+++ DurableSubcriptionID.java 2001/08/23 03:57:08 1.2.2.1
@@ -12,7 +12,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class DurableSubcriptionID implements java.io.Serializable {
String clientID;
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/GenericConnectionFactory.java
Index: GenericConnectionFactory.java
===================================================================
RCS file:
/cvsroot/jboss/jbossmq/src/main/org/jboss/mq/GenericConnectionFactory.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- GenericConnectionFactory.java 2001/08/17 03:04:01 1.2
+++ GenericConnectionFactory.java 2001/08/23 03:57:08 1.2.2.1
@@ -19,7 +19,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class GenericConnectionFactory implements java.io.Serializable {
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/Mutex.java
Index: Mutex.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/Mutex.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- Mutex.java 2001/08/17 03:04:01 1.2
+++ Mutex.java 2001/08/23 03:57:08 1.2.2.1
@@ -57,7 +57,7 @@
/**
* @author Norbert Lataille ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class Mutex {
private boolean sleeping;
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/ReceiveRequest.java
Index: ReceiveRequest.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/ReceiveRequest.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- ReceiveRequest.java 2001/08/17 03:04:01 1.2
+++ ReceiveRequest.java 2001/08/23 03:57:08 1.2.2.1
@@ -18,7 +18,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author David Maplesden ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class ReceiveRequest
implements Serializable, Externalizable {
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyBytesMessage.java
Index: SpyBytesMessage.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyBytesMessage.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyBytesMessage.java 2001/08/17 03:04:01 1.2
+++ SpyBytesMessage.java 2001/08/23 03:57:08 1.2.2.1
@@ -18,7 +18,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyBytesMessage
extends SpyMessage
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyConnection.java
Index: SpyConnection.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyConnection.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyConnection.java 2001/08/17 03:04:01 1.2
+++ SpyConnection.java 2001/08/23 03:57:08 1.2.2.1
@@ -30,7 +30,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyConnection
extends Connection
1.5.2.1 +8 -25 jbossmq/src/main/org/jboss/mq/SpyConnectionConsumer.java
Index: SpyConnectionConsumer.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyConnectionConsumer.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- SpyConnectionConsumer.java 2001/08/22 00:07:18 1.5
+++ SpyConnectionConsumer.java 2001/08/23 03:57:08 1.5.2.1
@@ -19,7 +19,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.5.2.1 $
*/
public class SpyConnectionConsumer implements javax.jms.ConnectionConsumer,
SpyConsumer, Runnable {
@@ -60,8 +60,6 @@
this.destination = destination;
this.serverSessionPool = serverSessionPool;
this.maxMessages = maxMessages;
- if(this.maxMessages < 1)
- this.maxMessages = 1;
subscription.destination = ( SpyDestination )destination;
subscription.messageSelector = messageSelector;
@@ -144,24 +142,13 @@
//Used to facilitate delivery of messages to sessions from server session pool.
public void run() {
- java.util.ArrayList mesList = new java.util.ArrayList();
+ SpyMessage mes = null;
try {
outer :
while ( true ) {
- synchronized( queue ){
- if(closed)
- break outer;
- }
- //get Messages
- for(int i=0;i<maxMessages;i++){
- SpyMessage mes = connection.receive(subscription, -1); //receive no
wait
- if(mes == null)
- break;
- else
- mesList.add(mes);
- }
- if(mesList.isEmpty()){
- SpyMessage mes = connection.receive( subscription, 0 );
+ //get Message
+ while ( mes == null ) {
+ mes = connection.receive( subscription, 0 );
if ( mes == null ) {
synchronized ( queue ) {
waitingForMessage = true;
@@ -179,9 +166,7 @@
waitingForMessage = false;
}
}
- mesList.add(mes);
}
-
ServerSession serverSession = serverSessionPool.getServerSession();
SpySession spySession = ( SpySession )serverSession.getSession();
@@ -191,19 +176,17 @@
spySession.sessionConsumer.subscription = subscription;
}
- for(int i=0;i<mesList.size();i++){
- spySession.addMessage( (SpyMessage)mesList.get(i) );
- }
+ spySession.addMessage( mes );
cat.debug( "" + this + " Starting the ServerSession." );
serverSession.start();
- mesList.clear();
+ mes = null;
}
} catch ( JMSException e ) {
cat.warn( "Connection consumer closing due to error in listening thread.",
e );
try {
- for(int i=0;i<mesList.size();i++){
- connection.send(
((SpyMessage)mesList.get(i)).getAcknowledgementRequest( false ) );
+ if ( mes != null ) {
+ connection.send( mes.getAcknowledgementRequest( false ) );
}
close();
} catch ( Exception ignore ) {
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyConnectionFactory.java
Index: SpyConnectionFactory.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyConnectionFactory.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyConnectionFactory.java 2001/08/17 03:04:01 1.2
+++ SpyConnectionFactory.java 2001/08/23 03:57:08 1.2.2.1
@@ -25,7 +25,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyConnectionFactory implements java.io.Serializable,
javax.jms.QueueConnectionFactory, javax.jms.TopicConnectionFactory,
javax.naming.Referenceable {
// Attributes ----------------------------------------------------
1.3.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyConnectionMetaData.java
Index: SpyConnectionMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyConnectionMetaData.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- SpyConnectionMetaData.java 2001/08/18 00:07:48 1.3
+++ SpyConnectionMetaData.java 2001/08/23 03:57:08 1.3.2.1
@@ -17,7 +17,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.3.2.1 $
*/
public class SpyConnectionMetaData
implements ConnectionMetaData {
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyConsumer.java
Index: SpyConsumer.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyConsumer.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyConsumer.java 2001/08/17 03:04:01 1.2
+++ SpyConsumer.java 2001/08/23 03:57:08 1.2.2.1
@@ -14,7 +14,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public interface SpyConsumer {
// A ConnectionReceiver uses this method to load a Consumer with a message
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyDestination.java
Index: SpyDestination.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyDestination.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyDestination.java 2001/08/17 03:04:01 1.2
+++ SpyDestination.java 2001/08/23 03:57:08 1.2.2.1
@@ -18,7 +18,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author David Maplesden ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyDestination
implements Destination, Serializable {
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyEncapsulatedMessage.java
Index: SpyEncapsulatedMessage.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyEncapsulatedMessage.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyEncapsulatedMessage.java 2001/08/17 03:04:01 1.2
+++ SpyEncapsulatedMessage.java 2001/08/23 03:57:08 1.2.2.1
@@ -15,7 +15,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyEncapsulatedMessage
extends SpyObjectMessage {
1.2.2.1 +0 -0 jbossmq/src/main/org/jboss/mq/SpyJMSException.java
Index: SpyJMSException.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyJMSException.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyMapMessage.java
Index: SpyMapMessage.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyMapMessage.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyMapMessage.java 2001/08/17 03:04:01 1.2
+++ SpyMapMessage.java 2001/08/23 03:57:08 1.2.2.1
@@ -20,7 +20,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyMapMessage
extends SpyMessage
1.3.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyMessage.java
Index: SpyMessage.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyMessage.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- SpyMessage.java 2001/08/17 05:38:13 1.3
+++ SpyMessage.java 2001/08/23 03:57:08 1.3.2.1
@@ -24,7 +24,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author David Maplesden ([EMAIL PROTECTED])
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.3.2.1 $
*/
public class SpyMessage
implements Serializable, Message, Comparable, Externalizable
1.7.2.1 +5 -4 jbossmq/src/main/org/jboss/mq/SpyMessageConsumer.java
Index: SpyMessageConsumer.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyMessageConsumer.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- SpyMessageConsumer.java 2001/08/21 23:16:17 1.7
+++ SpyMessageConsumer.java 2001/08/23 03:57:08 1.7.2.1
@@ -16,18 +16,19 @@
import javax.jms.MessageListener;
import javax.jms.Session;
+import org.jboss.mq.selectors.Selector;
+
/**
- * This class implements <tt>javax.jms.MessageConsumer</tt>.
+ * This class implements javax.jms.MessageConsumer
*
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author David Maplesden ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.7.2.1 $
*/
-public class SpyMessageConsumer
- implements MessageConsumer, SpyConsumer, Runnable
-{
+public class SpyMessageConsumer implements MessageConsumer, SpyConsumer, Runnable {
+
//Link to my session
public SpySession session;
// The subscription structure should be fill out by the decendent
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyMessageProducer.java
Index: SpyMessageProducer.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyMessageProducer.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyMessageProducer.java 2001/08/17 03:04:01 1.2
+++ SpyMessageProducer.java 2001/08/23 03:57:08 1.2.2.1
@@ -16,7 +16,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyMessageProducer
implements MessageProducer {
1.4.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyObjectMessage.java
Index: SpyObjectMessage.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyObjectMessage.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- SpyObjectMessage.java 2001/08/17 23:32:26 1.4
+++ SpyObjectMessage.java 2001/08/23 03:57:08 1.4.2.1
@@ -17,7 +17,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.4.2.1 $
*/
public class SpyObjectMessage
extends SpyMessage
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyQueue.java
Index: SpyQueue.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyQueue.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyQueue.java 2001/08/17 03:04:01 1.2
+++ SpyQueue.java 2001/08/23 03:57:08 1.2.2.1
@@ -21,7 +21,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author David Maplesden ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyQueue extends SpyDestination implements java.io.Serializable,
javax.jms.Queue, javax.naming.Referenceable {
// Constructor ---------------------------------------------------
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyQueueBrowser.java
Index: SpyQueueBrowser.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyQueueBrowser.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyQueueBrowser.java 2001/08/17 03:04:01 1.2
+++ SpyQueueBrowser.java 2001/08/23 03:57:08 1.2.2.1
@@ -19,7 +19,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyQueueBrowser
implements QueueBrowser {
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyQueueReceiver.java
Index: SpyQueueReceiver.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyQueueReceiver.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyQueueReceiver.java 2001/08/17 03:04:01 1.2
+++ SpyQueueReceiver.java 2001/08/23 03:57:08 1.2.2.1
@@ -18,7 +18,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyQueueReceiver extends SpyMessageConsumer implements QueueReceiver {
// Attributes ----------------------------------------------------
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyQueueSender.java
Index: SpyQueueSender.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyQueueSender.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyQueueSender.java 2001/08/17 03:04:01 1.2
+++ SpyQueueSender.java 2001/08/23 03:57:08 1.2.2.1
@@ -20,7 +20,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyQueueSender
extends SpyMessageProducer
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyQueueSession.java
Index: SpyQueueSession.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyQueueSession.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyQueueSession.java 2001/08/17 03:04:01 1.2
+++ SpyQueueSession.java 2001/08/23 03:57:08 1.2.2.1
@@ -28,7 +28,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyQueueSession
extends SpySession
1.3.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpySession.java
Index: SpySession.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpySession.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- SpySession.java 2001/08/17 03:04:01 1.3
+++ SpySession.java 2001/08/23 03:57:08 1.3.2.1
@@ -33,7 +33,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.3.2.1 $
*/
public abstract class SpySession
implements Session, XASession {
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyStreamMessage.java
Index: SpyStreamMessage.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyStreamMessage.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyStreamMessage.java 2001/08/17 03:04:01 1.2
+++ SpyStreamMessage.java 2001/08/23 03:57:08 1.2.2.1
@@ -20,7 +20,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyStreamMessage
extends SpyMessage
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyTemporaryQueue.java
Index: SpyTemporaryQueue.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyTemporaryQueue.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyTemporaryQueue.java 2001/08/17 03:04:01 1.2
+++ SpyTemporaryQueue.java 2001/08/23 03:57:08 1.2.2.1
@@ -15,7 +15,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyTemporaryQueue
extends SpyQueue
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyTemporaryTopic.java
Index: SpyTemporaryTopic.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyTemporaryTopic.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyTemporaryTopic.java 2001/08/17 03:04:01 1.2
+++ SpyTemporaryTopic.java 2001/08/23 03:57:08 1.2.2.1
@@ -15,7 +15,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyTemporaryTopic
extends SpyTopic
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyTextMessage.java
Index: SpyTextMessage.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyTextMessage.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyTextMessage.java 2001/08/17 03:04:01 1.2
+++ SpyTextMessage.java 2001/08/23 03:57:08 1.2.2.1
@@ -17,7 +17,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyTextMessage
extends SpyMessage
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyTopic.java
Index: SpyTopic.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyTopic.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyTopic.java 2001/08/17 03:04:01 1.2
+++ SpyTopic.java 2001/08/23 03:57:08 1.2.2.1
@@ -21,7 +21,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author David Maplesden ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyTopic extends SpyDestination implements java.io.Serializable,
javax.jms.Topic, javax.naming.Referenceable {
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyTopicPublisher.java
Index: SpyTopicPublisher.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyTopicPublisher.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyTopicPublisher.java 2001/08/17 03:04:01 1.2
+++ SpyTopicPublisher.java 2001/08/23 03:57:08 1.2.2.1
@@ -20,7 +20,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyTopicPublisher
extends SpyMessageProducer
1.3.2.1 +5 -4 jbossmq/src/main/org/jboss/mq/SpyTopicSession.java
Index: SpyTopicSession.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyTopicSession.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- SpyTopicSession.java 2001/08/21 23:16:17 1.3
+++ SpyTopicSession.java 2001/08/23 03:57:08 1.3.2.1
@@ -24,19 +24,20 @@
import javax.jms.TopicSubscriber;
import javax.jms.XATopicSession;
+import org.jboss.mq.selectors.Selector;
+
/**
- * This class implements <tt>javax.jms.TopicSession</tt> and
- * <tt>javax.jms.XATopicSession</tt>.
+ * This class implements javax.jms.TopicSession and javax.jms.XATopicSession
*
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.3.2.1 $
*/
public class SpyTopicSession
extends SpySession
- implements TopicSession, XATopicSession
-{
+ implements TopicSession, javax.jms.XATopicSession {
+
SpyTopicSession( Connection myConnection, boolean transacted, int
acknowledgeMode ) {
this( myConnection, transacted, acknowledgeMode, false );
}
1.3.2.1 +5 -5 jbossmq/src/main/org/jboss/mq/SpyTopicSubscriber.java
Index: SpyTopicSubscriber.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyTopicSubscriber.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- SpyTopicSubscriber.java 2001/08/21 23:16:17 1.3
+++ SpyTopicSubscriber.java 2001/08/23 03:57:08 1.3.2.1
@@ -5,7 +5,6 @@
* See terms of license at gnu.org.
*/
package org.jboss.mq;
-
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
@@ -13,21 +12,22 @@
import javax.jms.TopicSubscriber;
+import org.jboss.mq.selectors.Selector;
+
/**
- * This class implements <tt>javax.jms.TopicSubscriber</tt>.
+ * This class implements javax.jms.TopicSubscriber
*
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.3.2.1 $
*/
public class SpyTopicSubscriber
extends SpyMessageConsumer
- implements TopicSubscriber
-{
+ implements TopicSubscriber {
// Attributes ----------------------------------------------------
- /** The registered topic. */
+ //The topic I registered
private SpyTopic topic;
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyXAConnection.java
Index: SpyXAConnection.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyXAConnection.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyXAConnection.java 2001/08/17 03:04:01 1.2
+++ SpyXAConnection.java 2001/08/23 03:57:08 1.2.2.1
@@ -25,7 +25,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyXAConnection
extends SpyConnection
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyXAConnectionFactory.java
Index: SpyXAConnectionFactory.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyXAConnectionFactory.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyXAConnectionFactory.java 2001/08/17 03:04:01 1.2
+++ SpyXAConnectionFactory.java 2001/08/23 03:57:08 1.2.2.1
@@ -27,7 +27,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyXAConnectionFactory implements java.io.Serializable,
javax.jms.XAQueueConnectionFactory, javax.jms.XATopicConnectionFactory,
javax.naming.Referenceable {
// Attributes ----------------------------------------------------
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyXAResource.java
Index: SpyXAResource.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyXAResource.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyXAResource.java 2001/08/17 03:04:01 1.2
+++ SpyXAResource.java 2001/08/23 03:57:08 1.2.2.1
@@ -16,7 +16,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyXAResource implements XAResource {
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/SpyXAResourceManager.java
Index: SpyXAResourceManager.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyXAResourceManager.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SpyXAResourceManager.java 2001/08/17 03:04:01 1.2
+++ SpyXAResourceManager.java 2001/08/23 03:57:08 1.2.2.1
@@ -20,7 +20,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class SpyXAResourceManager implements java.io.Serializable {
1.3.2.1 +23 -31 jbossmq/src/main/org/jboss/mq/Subscription.java
Index: Subscription.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/Subscription.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- Subscription.java 2001/08/21 23:21:51 1.3
+++ Subscription.java 2001/08/23 03:57:08 1.3.2.1
@@ -8,71 +8,63 @@
import java.io.Serializable;
-import javax.jms.JMSException;
-
import org.jboss.mq.selectors.Selector;
/**
- * This class contains all the data needed to for a the provider to to
- * determine if a message can be routed to a consumer.
+ * This class contians all the data needed to for a the provider to to
+ * determine if a message can be routed to a consumer.
*
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author David Maplesden ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.3.2.1 $
*/
public class Subscription
- implements Serializable
-{
- /** This gets set to a unique value at the SpyConnection. */
+ implements Serializable {
+ // This gets set to a unique value at the SpyConnection
public int subscriptionId;
-
- /** The queue we want to subscribe to. */
+ // the queue we want to subscribe to
public SpyDestination destination;
-
- /** The selector which will filter out messages. */
+ // the selector which will filter out messages
public String messageSelector;
-
- /** Should this message destroy the subscription? */
+ // Should this message destroy the subscription?
public boolean destroyDurableSubscription;
- /** Topics might not want locally produced messages. */
+ // Topics might not want locally produced messages
public boolean noLocal;
// Transient Values
public transient Selector selector;
public transient ConnectionToken dc;
- public transient Object clientConsumer; // = null;
+ public transient Object clientConsumer = null;
+
+ // Determines the consumer would accept the message.
+ public Selector getSelector()
+ throws javax.jms.JMSException {
- /**
- * Determines the consumer would accept the message.
- */
- public Selector getSelector() throws JMSException {
- if (messageSelector == null) {
+ if ( messageSelector == null ) {
return null;
}
- if (selector == null) {
- selector = new Selector(messageSelector);
+ if ( selector == null ) {
+ selector = new Selector( messageSelector );
}
return selector;
}
- /**
- * Determines the consumer would accept the message.
- */
- public boolean accepts(SpyMessage message) throws JMSException {
- if (message.getJMSDestination() instanceof SpyTopic) {
+ // Determines the consumer would accept the message.
+ public boolean accepts( SpyMessage message )
+ throws javax.jms.JMSException {
+ if ( message.getJMSDestination() instanceof SpyTopic ) {
// In the Topic case we allways deliver unless we have a noLocal
- if (noLocal && message.producerClientId.equals(dc.getClientID())) {
+ if ( noLocal && message.producerClientId.equals( dc.getClientID() ) ) {
return false;
}
}
-
Selector ms = getSelector();
- if (ms != null) {
- if (!ms.test(message)) {
+ if ( ms != null ) {
+ if ( !ms.test( message ) ) {
return false;
}
}
1.2.2.1 +1 -1 jbossmq/src/main/org/jboss/mq/TransactionRequest.java
Index: TransactionRequest.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/TransactionRequest.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- TransactionRequest.java 2001/08/17 03:04:01 1.2
+++ TransactionRequest.java 2001/08/23 03:57:08 1.2.2.1
@@ -12,7 +12,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author David Maplesden ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.2.2.1 $
*/
public class TransactionRequest
implements java.io.Serializable, java.io.Externalizable {
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
