summaryrefslogtreecommitdiff
path: root/java/broker
Commit message (Collapse)AuthorAgeFilesLines
* AMQP version using new generator - Part 1. In these changes, all places ↵Kim van der Riet2006-12-2226-73/+274
| | | | | | where version-specific info is required, it has been hard-wired to major=8, minor=0. The next phase of changes will connect the version info to that obtained from ProtocolInitiation for the current session. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489691 13f79535-47bb-0310-9956-ffa450edef68
* QPID-227Bhupendra Bhusman Bhardwaj2006-12-211-0/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489403 13f79535-47bb-0310-9956-ffa450edef68
* QPID-188 Bhupendra Bhusman Bhardwaj2006-12-214-32/+15
| | | | | | Unit test for AMQProtocolSession mbean updated and closeChannel() method removed from mbean because it didn't seem to be a required feature for management console. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489330 13f79535-47bb-0310-9956-ffa450edef68
* add clover support, fix logging level variablesStephen Vinoski2006-12-201-3/+1
| | | | | | | | Added support for the clover plugin to the top-level pom, and eliminated redundant amqj.logging.level variables from module poms. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489215 13f79535-47bb-0310-9956-ffa450edef68
* conf file for jpackageRafael H. Schloming2006-12-201-0/+49
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489204 13f79535-47bb-0310-9956-ffa450edef68
* QPID-101Martin Ritchie2006-12-206-49/+243
| | | | | | | | | | | | | | | | | | | | | Initial Implementation of Queue Browsing by Robert Godfrey and Martin Ritchie AMQChannel.java - record messages browsed so not to discard them on ack. FilterManagerFactory.java - Added a NoConsumerFilter ConcurrentSelectorDeliveryManager.java - Update to send browsers messages without taking the message from other consumers Subscription.java - Added autoClose and isBrowser methods SubscriptionTestHelper.java / RemoteSubscriptionImpl.java / SubscriptionImpl.java - implemented new interface methods Added NoConsumerFilter.java Patches from Rob Godfrey for client implmentation AMQSession.java - Added AUTO_CLOSE and NO_CONSUME properties to arguments FieldTable for consume method. BasicMessageConsumer.java - updates to correctly close consumer when an BasicCancel is received from the broker. AMQProtocolSession.java - method to allow cancellation of the client AMQStateManager.java - added handler for BasicCancelOkMethodHandler.java Added new AMQQueueBrowser.java BasicCancelOkMethodHandler.java git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489106 13f79535-47bb-0310-9956-ffa450edef68
* QPID-21 outstanding issues:Martin Ritchie2006-12-206-40/+126
| | | | | | | | | | | | | Fixed an issue where a consumer with no_local set would not have its filters applied to messages. Fixed problem where new consumers would start with an empty PDQ rather than checking the existing queue of messages for messages of interest. AMQQueue.java - Added code check exisiting queue data for messages for the new subscriber with a filter. DeliveryManager.java - added populatePreDeliveryQueue SynchronizedDeliveryManager.java/ConcurrentDeliveryManager.java - implemented new DeliveryManager.java interface SubscriptionImpl.java - fixed issue with no_local subscribers had their filters ignored. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489070 13f79535-47bb-0310-9956-ffa450edef68
* QPID-222Martin Ritchie2006-12-191-1/+3
| | | | | | ensured that the TXBuffer of a message is set to null when re queuing. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488726 13f79535-47bb-0310-9956-ffa450edef68
* Maven output clean up.Martin Ritchie2006-12-191-2/+7
| | | | | | Mainly removed exception stack traces from expected exceptions. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488713 13f79535-47bb-0310-9956-ffa450edef68
* QPID-216Martin Ritchie2006-12-1910-68/+112
| | | | | | | | | | | | | | | | | | BasicConsumeMethodHandler.java - Pulled the nolocal param from the method body and passed down channel to subscription. SubscriptionFactory.java / AMQQueue.java/AMQChannel.java - passed the nolocal parameter through to the Subscription ConnectionStartOkMethodHandler.java - Saved the client properties so the client identifier can be used in comparison with the publisher id to implement no_local AMQMinaProtocolSession.java - added _clientProperties to store the sent client properties. AMQProtocolSession.java - interface changes to get/set ClientProperties ConcurrentSelectorDeliveryManager.java - only need to do hasInterset as this will take care of the hasFilters optimisation check. SubscriptionImpl.java - Added code to do comparison of client ids to determin insterest in a given message. SubscriptionSet.java - tidied up code to use hasInterest as this is where the nolocal is implemented. ConnectionStartMethodHandler.java - Moved literal values to a ClientProperties.java enumeration and a QpidProperties.java values. QpidConnectionMetaData.java - updated to get values from QpidProperties.java MockProtocolSession.java - null implementation of new get/set methods git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488712 13f79535-47bb-0310-9956-ffa450edef68
* QPID-188 Bhupendra Bhusman Bhardwaj2006-12-191-0/+1
| | | | | | Adding unit tests for Java broker JMX functionality git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488701 13f79535-47bb-0310-9956-ffa450edef68
* QPID-21Martin Ritchie2006-12-1932-44/+3854
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added: SelectorParser.jj - ActiveMQ selector javacc grammar used to generate SelectorParser.java server/filter - Selector Filtering code from ActiveMQ project adjusted to suite our class and package structure. server/message - Decorator classes to allow access to the JMSMessage inside the AMQMessage ConcurrentSelectorDeliveryManager.java - A new DeliveryManager that utilises PreDeliveryQueues to implement selectors AMQInvalidSelectorException.java - thrown on client and broker when the Selector text is invalid. Common: log4j.properties to remove error log4j warnings on Common tests. Modified: broker/pom.xml - to generate SelectorParser.java AMQChannel.java - Addition of argument fieldtable for filter setup. BasicConsumeMethodHandler.java - writing of InvalidSelector channel close exception. AMQMessage.java - Added decorator to get access to the enclosed JMSMessage AMQQueue.java - Enhanced 'deliverymanager' property to allow the selection of the ConcurrentSelectorDeliveryManager. Subscription.java - Enhanced interface to allow a subscription to state an 'interest' in a given message. SubscriptionFactory.java - Added method to allow passing of filter arguments. SubscriptionImpl.java - Implemented new Subscription.java methods. SubscriptionManager.java - Added ability to get a list of current subscribers. SubscriptionSet.java - augmented nextSubscriber to allow the subscriber to exert the new hasInterest feature. SynchronizedDeliveryManager.java - fixed Logging class AMQSession - Added filter extraction from consume call and pass it on to the registration. ChannelCloseMethodHandler.java - Handle the reception and correct raising of the InvalidSelector Exception AbstractJMSMessage.java - Expanded imports BlockingMethodFrameListener.java - added extra info to a debug output line. SocketTransportConnection.java - made output an info not a warn. PropertiesFileInitialContextFactory.java - updated to allow the PROVIDER_URL to specify a property file to read in for the initial values. ClusteredSubscriptionManager.java - Implementation of SubscriptionSet.java NestedSubscriptionManager.java - Implementation of SubscriptionManager.java RemoteSubscriptionImpl.java - Implementation Subscription.java AMQConstant.java - Added '322' "Invalid Selector" SubscriptionTestHelper.java - Implementation of Subscription.java Edited specs/amqp-8.0.xml to add field table to consume method. Thanks to the ActiveMQ project for writing the initial SelectorParser.jj and associated filter Expressions. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488624 13f79535-47bb-0310-9956-ffa450edef68
* clean up warnings about unused variablesStephen Vinoski2006-12-183-4/+3
| | | | | | | | Remove all warnings in common, broker, client, and systests regarding unused variables, as indicated by Eclipse builds. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488450 13f79535-47bb-0310-9956-ffa450edef68
* QPID-212 QPID-214 Patch supplied by Rob GodfreyRobert Greig2006-12-182-9/+15
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488377 13f79535-47bb-0310-9956-ffa450edef68
* null check added for null header propertiesBhupendra Bhusman Bhardwaj2006-12-181-7/+14
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488279 13f79535-47bb-0310-9956-ffa450edef68
* QPID-211 : Patch supplied by Rob Godfrey - Perform null check against ↵Robert Greig2006-12-181-1/+1
| | | | | | routing key before looking in the map git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488188 13f79535-47bb-0310-9956-ffa450edef68
* remove unused importsStephen Vinoski2006-12-186-10/+0
| | | | | | | | | Remove unused imports for common, broker, client, and systests as reported by Eclipse. Note that this includes imports in the Java XSL template used to generate the framing code in common. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488134 13f79535-47bb-0310-9956-ffa450edef68
* QPID-183 Patch supplied by Rob Godfrey. Major changes to durable topic ↵Robert Greig2006-12-157-17/+302
| | | | | | subscription handling. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@487562 13f79535-47bb-0310-9956-ffa450edef68
* git-svn-id: ↵Bhupendra Bhusman Bhardwaj2006-12-142-6/+7
| | | | https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@487299 13f79535-47bb-0310-9956-ffa450edef68
* QPID-190 Bhupendra Bhusman Bhardwaj2006-12-144-539/+734
| | | | | | Refactored the broker MBean classes git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@487268 13f79535-47bb-0310-9956-ffa450edef68
* Added comments about possible RejectedExecutionException that may occur when ↵Martin Ritchie2006-12-132-2/+12
| | | | | | starting to process aSync deliveries as the broker closes its execution pools. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486642 13f79535-47bb-0310-9956-ffa450edef68
* set logging level with propertyStephen Vinoski2006-12-121-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486206 13f79535-47bb-0310-9956-ffa450edef68
* QPID-95 : Patch supplied by Rob Godfrey - throws correct exception when ↵Robert Greig2006-12-121-1/+12
| | | | | | encountering a non-routable mandatory message git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486132 13f79535-47bb-0310-9956-ffa450edef68
* fix misplaced double quoteStephen Vinoski2006-12-111-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@485490 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
* properly limit scope for test-only dependenciesStephen Vinoski2006-11-241-7/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@479050 13f79535-47bb-0310-9956-ffa450edef68
* use the right names for the qpid-incubating jarsStephen Vinoski2006-11-242-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@478964 13f79535-47bb-0310-9956-ffa450edef68
* change name for launcher jarsStephen Vinoski2006-11-242-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@478963 13f79535-47bb-0310-9956-ffa450edef68
* Removed the includes as it wasn't picking up the test cases. The includes ↵Martin Ritchie2006-11-221-3/+0
| | | | | | from mvn should be ok. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@478270 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
* QPID-108: remove obsolete ant build filesStephen Vinoski2006-11-223-344/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@478023 13f79535-47bb-0310-9956-ffa450edef68
* QPID-118. Now passes arguments through to the java process.Robert Greig2006-11-201-1/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@477341 13f79535-47bb-0310-9956-ffa450edef68
* broker/pom.xml - removed test scope from junit to remove warning in build log.Martin Ritchie2006-11-201-63/+91
| | | | | | | | | | | | | | TransportConnection.java/AMQQueue.java - change log level on a print statement from warn to info log4j.properties - updated threashold to be 'all' so we can set the logging level with amqj.logging.level client/pom.xml - fixed mvn test run output. It wasn't using our log4.properties file. systests/pom.xml - added log4j.properties configuration broker/pom.xml - added log4j.properties configuration common/pom.xml - skipped tests as there are none, and it caused the build to fail Also adjusted spaceing to be 4 space per tab (and no tabs) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@477214 13f79535-47bb-0310-9956-ffa450edef68
* convert tests to junit3Stephen Vinoski2006-11-198-234/+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-183-49/+170
| | | | 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/+0
| | | | 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
* * added top-level systests directory for non-unit testsStephen Vinoski2006-11-1235-4116/+1
| | | | | | | | * moved some tests into systests to eliminate dependencies between test subdirectories (required for maven) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473889 13f79535-47bb-0310-9956-ffa450edef68
* update Apache licenses to the current versionStephen Vinoski2006-11-10183-2353/+2933
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473568 13f79535-47bb-0310-9956-ffa450edef68
* Removed bdbstore referenceMartin Ritchie2006-11-101-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473338 13f79535-47bb-0310-9956-ffa450edef68
* Created module.vm.version to set X-Compile-Source-JDK in jars default is 1.4 ↵Martin Ritchie2006-11-101-0/+1
| | | | | | Broker overrides to 1.5 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473283 13f79535-47bb-0310-9956-ffa450edef68
* Updated propertiesStephen Vinoski2006-11-091-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473072 13f79535-47bb-0310-9956-ffa450edef68
* QPID-69Martin Ritchie2006-11-078-296/+748
| | | | | | | 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
* Additions to build system to cause junit to produce a reportMartin Ritchie2006-10-312-17/+25
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@469504 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status