summaryrefslogtreecommitdiff
path: root/java/broker/src
Commit message (Collapse)AuthorAgeFilesLines
* FilterManagerFactory/JMSSelectorFilter.java - Added throw ↵Martin Ritchie2006-12-1818-573/+1447
| | | | | | | | | | AMQInvalidSelectorException to be passed back to BasicConsumeMethodHandler.java and then to the Client. Addition of ConcurrentSelectorDeliveryManager.java. This uses the additional methods on Subscription (hasFilters, hasInterest) to implement selectors. Trunk Merges git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/jmsselectors@488264 13f79535-47bb-0310-9956-ffa450edef68
* AMQMessage.java - added take/releaseMartin Ritchie2006-12-177-24/+106
| | | | | | | | | | | | | AMQQueue.java - enabled parameterisation of DeliveryManager Subscription.java - added PreDeliveryQueues SubscriptionImpl.java - Implementeted PDQs and added Selector/filter hooks SubscriptionManager.java - added ability to get all Subscriptions SubscriptionSet.java - updated getNextSub*Impl to take filters in to account. SynchronizedDeliveryManager.java - Fixed Logger Class AMQSession.java - Fieldtable Changes git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/jmsselectors@488002 13f79535-47bb-0310-9956-ffa450edef68
* QPID-21Martin Ritchie2006-12-0628-59/+3361
| | | | | | | | | | | | | | | | | | | | | | | | | | Broker Pom - Added geronimo jms jar - and javacc plugin for selectors. AMQMessage.java - Added decorator to extract JMS information. AMQQueue.java - Mainly whitespace - added filter argument to session registration Subscription.java - Added hasFilters and isInterested to enable the filtration process SubscriptionFactory.java - new constructor that takes the FieldTable of filters. {Test|Remote}Subscription{Impl}.java - Implementation of Subscription{Factory}.java features. SubscriptionSet.java - White space and added hasFilter/isInterested calls to determine nextSubscriber. AMQSession.java - Create FilterTable for basic.consume. AbstractJMSMessage.java - Updated println to provide further jms header details. URLHelper.java - whitespace URLSyntaxException.java - tidied up output amqp-8.0.xml - augmented consume to have argument field table Server/filter - Filtration classes from ActiveMQ and new FilterManager.java to drive them. message/jms - Decorator implementation MessageDecorator.java - Handles decoration of AMQMessages - currently hardwired but could be used to scan classpath. SelectorTest.java - Simple test to see that selectors work. Not exhaustive. FieldTableInTextMessageTest.java - Test that the Fieldtable (properties)in a TextMessage work as expected. (QPID-9) Reinvestigate wrt QPID-158 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/jmsselectors@483127 13f79535-47bb-0310-9956-ffa450edef68
* FieldTable change.Martin Ritchie2006-12-052-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | FieldTable is now an interface with a PropertyFieldTable.java implementation. This PropertyFieldTable has been updated to handle the wire level encoding and decoding of the underlying map. It also allows XML encoding of the data as used by JMSMapMessage. Currently the AMQP doesn't support all the Java primitives as a result all values are written out as XML using a prefix of 'X'. (See QPID-9 for further details) Changes where not specified are changes from new FieldTable() to FieldTableFactory.newFieldTable() AbstractJMSMessage.java - the type prefixing of properties is now not requried as all the functionality has been moved to PropertyFieldTable.java. In addition set/getObjectProperty is now implemented as PFT does this. basic Tests have been updated to send all property values. FieldTableKeyEnumeration.java has been removed as it is nolonger required. The PFT handles this internally. ToDo: The Tests need to be consolidated so that there is a clear view of the code coverage. QPID-158 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@482733 13f79535-47bb-0310-9956-ffa450edef68
* QPID-148Martin Ritchie2006-12-041-0/+5
| | | | | | | | | | | | | | | AMQMinaProtocolSession.java - updated comment AbstractJMSMessage.java - removed a lot of getHeaders() == null checks. Updated logic accordingly.. Now a request for a property that doesn't exist will be consistent with calls on an empty table rather than just creating a default value. BasicContentHeaderProperties.java - the culprit for QPID-148 changed new FieldTable() to setHeaders(new FieldTable()) to ensure propertyFlag is set to write headers to the wire. Added PropertyValueTest.java - that tests all the valid values on the Message. *NOTE*: A number of the tests are commented out as AMQP and therefore the FieldTable do not support these values. QPID-9 Added SVN ignores for the target directories. Updated AbstractJMSMessage.java _readableProperties to be set correctly in the constructor. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@482238 13f79535-47bb-0310-9956-ffa450edef68
* QPID-129 Bhupendra Bhusman Bhardwaj2006-11-2711-586/+403
| | | | | | MBeans updated with improved features, like AMQQueue mbean now has separate features for sending message header and message content. ( other details are in JIRA) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@479686 13f79535-47bb-0310-9956-ffa450edef68
* Changed logging from warn to infoMartin Ritchie2006-11-221-25/+30
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@478264 13f79535-47bb-0310-9956-ffa450edef68
* convert tests to junit3Stephen Vinoski2006-11-197-191/+35
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@476701 13f79535-47bb-0310-9956-ffa450edef68
* complete bringing initial maven work to trunkStephen Vinoski2006-11-182-49/+38
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@476431 13f79535-47bb-0310-9956-ffa450edef68
* directory moves required for maven mergeStephen Vinoski2006-11-18137-0/+492
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@476414 13f79535-47bb-0310-9956-ffa450edef68
* Removed local development code that made it into the repositoryMartin Ritchie2006-11-151-13/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@475297 13f79535-47bb-0310-9956-ffa450edef68
* QPID-92 Changes to bring MINA use up to MINA-Head (1.1.0) compatibility.Martin Ritchie2006-11-151-38/+61
| | | | | | Sorry forgot this file. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@475294 13f79535-47bb-0310-9956-ffa450edef68
* update Apache licenses to the current versionStephen Vinoski2006-11-10131-1690/+2098
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473568 13f79535-47bb-0310-9956-ffa450edef68
* QPID-69Martin Ritchie2006-11-074-268/+625
| | | | | | | Made an interface from the current DeliveryManager.java. The original DeliveryManager is now the SynchronizedDeliveryManager.java where the deliver() method now has synchronization to solve the race condition. An alternative DeliveryManager - ConcurrentDeliveryManager.java uses a modified ConcurrentLinkedQueue (Modified to maintain the current queue size) this uses a compare and swap methods to allow concurrent access to each end of the queue. Additional locking is required once the queue has been depleted to ensure that a thread is not in the process of appending to the queue. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@472060 13f79535-47bb-0310-9956-ffa450edef68
* Replaced by ManagedConnection.javaBhupendra Bhusman Bhardwaj2006-11-071-33/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@472037 13f79535-47bb-0310-9956-ffa450edef68
* AMQQueueMBean updated. The message content is sent with header attributes. ↵Bhupendra Bhusman Bhardwaj2006-11-012-85/+117
| | | | | | New management operation added to view message content for a particular messageId. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@470012 13f79535-47bb-0310-9956-ffa450edef68
* Channel is not an MBean. The getObjectName is removed. The SessionMBean is ↵Bhupendra Bhusman Bhardwaj2006-11-012-43/+4
| | | | | | updated accordingly. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@469954 13f79535-47bb-0310-9956-ffa450edef68
* QPID-56Martin Ritchie2006-10-311-28/+18
| | | | | | | Also resolves a race condition where an messages could be sent out of order. This change needs to be benchmarked against original DeliveryManager.java with the race condition fixed. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@469422 13f79535-47bb-0310-9956-ffa450edef68
* Applied patchCarl C. Trieloff2006-10-271-5/+0
| | | | | | | | (JIRA-35) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@468538 13f79535-47bb-0310-9956-ffa450edef68
* MBeans updated. Management operation implemented in HeadersExchangeBhupendra Bhusman Bhardwaj2006-10-255-22/+51
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@467700 13f79535-47bb-0310-9956-ffa450edef68
* MBean updated and corrected a code merging mistake.Bhupendra Bhusman Bhardwaj2006-10-251-4/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@467605 13f79535-47bb-0310-9956-ffa450edef68
* Code style fixes, white space removal.Martin Ritchie2006-10-241-61/+71
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@467314 13f79535-47bb-0310-9956-ffa450edef68
* QPID-48Martin Ritchie2006-10-242-40/+158
| | | | | | | | | | Enabled buffer compression on delivery queue as a configuration option from the xml.(advanced.compressBufferOnQueue) Changed DeliveryManager.java to use ConcurrentLinkedQueueNoSize.java this is the standard ConcurrentLinkedQueue but where the size() method returns 0(empty) or 1(has content) as it is an expensive operation. Previously there was a race condition with the use of the _queueing boolean. Under load the consumer would sometimes stop getting messages. This was due to the messages being enqueued without starting the Worker thread. There is still an issue (QPID-54) on high receiving load messages rate received by a client drops. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@467313 13f79535-47bb-0310-9956-ffa450edef68
* QPID-44Martin Ritchie2006-10-241-27/+63
| | | | | | | | | Added High and Low water marking to AMQChannel.java. Currently the low water mark defaults to half the High value. Test for high and low water marks. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@467310 13f79535-47bb-0310-9956-ffa450edef68
* Further fixes and some extra tests for transactions.Gordon Sim2006-10-199-224/+426
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@465549 13f79535-47bb-0310-9956-ffa450edef68
* AMQQueueMBean - management notifications will be sent to the listening ↵Bhupendra Bhusman Bhardwaj2006-10-172-22/+85
| | | | | | clients if the queue size increases the threshold value or a message with size higher than threshold value is received. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@464900 13f79535-47bb-0310-9956-ffa450edef68
* Fixes to transaction handling.Gordon Sim2006-10-1712-100/+599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This line, and those below, will be ignored-- M java/broker/test/src/org/apache/qpid/server/UnitTests.java M java/broker/test/src/org/apache/qpid/server/queue/DeliveryManagerTest.java A java/broker/test/src/org/apache/qpid/server/txn AM java/broker/test/src/org/apache/qpid/server/txn/UnitTests.java AM java/broker/test/src/org/apache/qpid/server/txn/TxnBufferTest.java M java/broker/test/src/org/apache/qpid/server/util/UnitTests.java AM java/broker/test/src/org/apache/qpid/server/util/OrderedMapHelperTest.java M java/broker/src/org/apache/qpid/server/queue/SubscriptionImpl.java M java/broker/src/org/apache/qpid/server/queue/DeliveryManager.java AM java/broker/src/org/apache/qpid/server/queue/FailedDequeueException.java M java/broker/src/org/apache/qpid/server/queue/AMQMessage.java M java/broker/src/org/apache/qpid/server/queue/AMQQueue.java M java/broker/src/org/apache/qpid/server/queue/Subscription.java M java/broker/src/org/apache/qpid/server/queue/NoConsumersException.java M java/broker/src/org/apache/qpid/server/AMQChannel.java M java/broker/src/org/apache/qpid/server/txn/TxnBuffer.java M java/broker/src/org/apache/qpid/server/txn/TxnOp.java AM java/broker/src/org/apache/qpid/server/util/OrderedMapHelper.java M java/broker/src/org/apache/qpid/server/handler/TxCommitHandler.java AM java/client/test/src/org/apache/qpid/transacted/UnitTests.java M java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@464867 13f79535-47bb-0310-9956-ffa450edef68
* QPID-18. Removed unused experimental code that had direct dependencies on ↵Robert Greig2006-10-121-13/+3
| | | | | | MINA-0.9.5 and upgraded to MINA-1.1.0 snapshot. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@463403 13f79535-47bb-0310-9956-ffa450edef68
* QPID-16 Removed unnecessary requeue operations.Steven Shaw2006-10-062-54/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@453539 13f79535-47bb-0310-9956-ffa450edef68
* Changed flow control information out put to be debug level as it is output a ↵Martin Ritchie2006-10-051-2/+2
| | | | | | lot when flow control starts. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@453196 13f79535-47bb-0310-9956-ffa450edef68
* Changed flow control information out put to be debug level as it is output a ↵Martin Ritchie2006-10-051-1/+1
| | | | | | lot when flow control starts. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@453193 13f79535-47bb-0310-9956-ffa450edef68
* Changed TxnBuffer log data to debug level.Martin Ritchie2006-10-031-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@452546 13f79535-47bb-0310-9956-ffa450edef68
* Optimised Transaction handling.Martin Ritchie2006-10-033-9/+39
| | | | | | When using a a transaction don't start a store transaction on a commit UNLESS a persistent message has been sent. As non-persistent messages are not stored. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@452323 13f79535-47bb-0310-9956-ffa450edef68
* Changes for JMX layer-Martin Ritchie2006-10-0222-265/+1081
| | | | | | MBeans are decorated with descriptions using annotations for attributes, operations and operation parameters. Introspection added for management interface. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@451932 13f79535-47bb-0310-9956-ffa450edef68
* Moved delivery tag retrieval and addition to Unack'd list back to ↵Martin Ritchie2006-09-272-20/+16
| | | | | | SubscriptionImpl as the synchronized block must include writing the frame to the wire. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@450401 13f79535-47bb-0310-9956-ffa450edef68
* AMQProtocolSession.java - white space changesMartin Ritchie2006-09-274-52/+90
| | | | | | | | | | | | BasicMessageProducer.java - white space changes BasicMessageConsumer.java - white space changes AMQSession.java - added a comment MemoryMessageStore.java - white space changes SubscriptionImpl.java AMQChannel.java - Removed race condition where two messages could get the same delivery tag and when using acks where messages can be added to the UnackMap out of sequence, Causing unknown message to ack exceptions. DestNameExchange.java - white space/style changes. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@450384 13f79535-47bb-0310-9956-ffa450edef68
* Changed default instance id to 1 to make getInstance simpler.Martin Ritchie2006-09-261-3/+9
| | | | | | Added ability to specify default ApplicationRegistry git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@449942 13f79535-47bb-0310-9956-ffa450edef68
* AMQPFastProtocolHandler.java - Added (Integer appRegId) constructor to allow ↵Martin Ritchie2006-09-255-12/+299
| | | | | | | | | | | | | the AMQPFastProtocolHandler to request the ApplicationRegistry instance. ApplicationRegistry.java - Modified to allow multiple ARs to exist each indexed by an integer id. Default AR of 0 always exists. NullApplicationRegistry.java - Copied from Test cases but modified to have a simple MemoryMessageStore. MemoryMessageStore.java - Added a configure() that uses the class defaults. NullAuthenticationManager.java - Moved from Test Renamed NullApplicationRegistry.java to TestApplicationRegistry.java for the Test cases. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@449643 13f79535-47bb-0310-9956-ffa450edef68
* Import of qpid from etp:Rafael H. Schloming2006-09-19115-0/+12385
URL: https://etp.108.redhat.com/svn/etp/trunk/blaze Repository Root: https://etp.108.redhat.com/svn/etp Repository UUID: 06e15bec-b515-0410-bef0-cc27a458cf48 Revision: 608 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@447994 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status