summaryrefslogtreecommitdiff
path: root/java/broker
Commit message (Collapse)AuthorAgeFilesLines
...
* QPID-278Martin Ritchie2007-01-122-7/+3
| | | | | | | | | broker distribution - modified to allow assembly:directory builds broker/pom.xml - moved slf4j to common/pom.xml git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495549 13f79535-47bb-0310-9956-ffa450edef68
* QPID-276Martin Ritchie2007-01-124-12/+29
| | | | | | Update to AMQChannel to remove race condition over UnacknowledgedMessageMap git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495460 13f79535-47bb-0310-9956-ffa450edef68
* QPID-146 QPID-112 QPID-278Martin Ritchie2007-01-129-24/+551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary Reworked a lot of the distribution work done by the build system. This ended up with me creating a reduced client distribution (hope that is ok Steve) Each module now has has a distribution directory (except common it may need a tests build later) This will build the individual components in to a distribution binary only, binary with tests and source. To build the binary with tests in the distribution directory use profile tests so $mvn -Ptests In all cases the dependencies have been reduced and correctly assigned to the correct scope. There were a couple of cases where a runtime dependency of one of our dependencies didn't make it in to the distributions so they were added explicitly. This should be looked at again. Specifics Broker: Three new assembly files are located in the distribution/src directory (broker-bin taking heavily from distribution - bin) these generate the three distributions. SimpleFilterManager.java removed slf4j reference broker/test directory removed as it was left over from the ant system Client: Added intelij files to ignore list. client/dist deleted as it was left over from the ant system client/distribution as for the broker three assemblies matching the three distributions Renamed log4j.properties to client.log4j to prevent issues when it is packaged into the jar. Removed old_test ping and requestreply1 as they have been moved to perftests Moved broker back to a test dependency. This required modifying AMQSession.java to remove reference to ExchangeBoundHandler.java Common: Added more common dependencies from broker and client here. Distribution: Reduced the assemblies to only build the full project binary, binary with tests and source. Perftests: Added building of perftests distribution so this can be bundled separately. Resources: Moved Resources from distribution project to root level this allows them to be easily incorporated in all projects. Systests: as with perftests now builds a separate distribution that can be used on an existing installation. renamed log4j.properties to systests.log4j to prevent logging problems. As systests is a module having the code under the test folder isn't accurate as it is the main code. Test code here should be testing the tests :D !! git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495455 13f79535-47bb-0310-9956-ffa450edef68
* Refactor to create a common AMQMethodEvent object. Also created a common ↵Kim van der Riet2007-01-1131-99/+31
| | | | | | AMQProtocolWriter interface for writing frames. These are required for common request and response handlers to be introduced in 0-9. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495380 13f79535-47bb-0310-9956-ffa450edef68
* QPID-32 Fix for non-persistent message sendingRobert Greig2007-01-111-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495314 13f79535-47bb-0310-9956-ffa450edef68
* QPID-32: transaction fixesRobert Greig2007-01-119-29/+154
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495304 13f79535-47bb-0310-9956-ffa450edef68
* Added QPID_OPTS var to command line to allow passing of useful -D props ↵Marnie McCormack2007-01-111-2/+4
| | | | | | including mgt console required values. QPID-168 applies. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495255 13f79535-47bb-0310-9956-ffa450edef68
* QPID-32 : Add persistence to work with ShortStringsRobert Greig2007-01-116-11/+20
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495169 13f79535-47bb-0310-9956-ffa450edef68
* QPID-277 Bhupendra Bhusman Bhardwaj2007-01-101-0/+13
| | | | | | adding tests in distribution git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494797 13f79535-47bb-0310-9956-ffa450edef68
* QPID-275 : (Patch supplied by Rob Godfrey) Fixes to allow broker to pass ↵Robert Greig2007-01-108-68/+180
| | | | | | more of the Python tests git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494769 13f79535-47bb-0310-9956-ffa450edef68
* QPID-273 : (Patch supplied by Rob Godfrey) Remove unnecessary Map creationRobert Greig2007-01-102-186/+174
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494765 13f79535-47bb-0310-9956-ffa450edef68
* QPID-271 : (Patch supplied by Rob Godfrey) Implement fanout exchangeRobert Greig2007-01-103-1/+214
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494658 13f79535-47bb-0310-9956-ffa450edef68
* QPID-269 : (Patch supplied by Rob Godfrey) Add getType() to ExchangeRobert Greig2007-01-094-0/+19
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494652 13f79535-47bb-0310-9956-ffa450edef68
* QPID-255 : Patch Supplied by Rob Godfrey - Change to use bespoke ↵Robert Greig2007-01-0849-293/+306
| | | | | | AMQShortString rather than converting to String git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494121 13f79535-47bb-0310-9956-ffa450edef68
* QPID-32: new model for holding and processing message in memory to support ↵Robert Greig2007-01-0759-1182/+2565
| | | | | | new persistent stores git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@493872 13f79535-47bb-0310-9956-ffa450edef68
* Fixed C++ client sending protocol version 0-0 over the wire. Minor fixes and ↵Kim van der Riet2007-01-041-7/+4
| | | | | | tidy-up in related code. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@492756 13f79535-47bb-0310-9956-ffa450edef68
* QPID-248 Modified field table types to not conflict with the officially ↵Rafael H. Schloming2007-01-041-1/+1
| | | | | | specified definitions. Also reorganized type definitions to clearly distinguish between official and extended types and reenabled the AmqPlain authentication mechanism. This change allows the python interop test suite to run. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@492718 13f79535-47bb-0310-9956-ffa450edef68
* QPID-233 : Patch from Rob Godfrey - fix to lock.unlock() bugRobert Greig2007-01-011-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@491673 13f79535-47bb-0310-9956-ffa450edef68
* Reduced logging level to debug to avoid performance sapping outputRobert Greig2006-12-291-10/+38
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@491120 13f79535-47bb-0310-9956-ffa450edef68
* MBean created as a separate classBhupendra Bhusman Bhardwaj2006-12-282-167/+201
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@490708 13f79535-47bb-0310-9956-ffa450edef68
* QPID-229 : Patch supplied by Rob Godfrey - Change implementation of FieldTableRobert Greig2006-12-223-56/+136
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489748 13f79535-47bb-0310-9956-ffa450edef68
* 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
View Lorry Controller Status