summaryrefslogtreecommitdiff
path: root/java/systests/src
Commit message (Collapse)AuthorAgeFilesLines
* made a copyRobert Godfrey2007-03-221-0/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/java.multi_version@521253 13f79535-47bb-0310-9956-ffa450edef68
* QPID-346 Message loss after rollbackMartin Ritchie2007-02-235-15/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPID-348 Problems of prefetching messages QPID-355 Closing a consumer does not ensure messages delivery will stop for that subscription BROKER AMQChannel - updated requeue to either resend via the Delivery Manager not directly via msg.writedeliver. BasicRejectMethodHandler - initial place holder. TxRollbackHandler - Added comment AMQMessage - added ability to record who has taken the message so that it can be resent to that subscriber on resend/requeue. AMQQueue - added the queue reference to the Subscription creation ConcurrentSelectorDeliveryManager - Added methods to correctly monitor the size of queue messages. Including messages on the resend queue of a Subscriber. Additional locking to ensure that messages are not sent to the subscriber after Closure. QPID-355 DeliveryManager - adjusted deliver call to allow delivery to the head of the queue. Subscription - changes to allow selction of queue(resend or predelivery) methods to add to resend and getSendLock to ensure that sending to the Subscription is allowed. SubscriptionFactory - changes to allow the AMQQueue to be passed to the Subscription. SubscriptionImpl - implementation of the interfaces. Local storage of messages to be resent and requeuing of the messages during closure. SubscriptionSet - changes to retrieve the actual stored Subscription when performing removeSubscriber. So we have access to the the resend queue. AMQStateManager - Added BasicRejectMethodHandler TransactionalContext - Added option to deliver the messages to the front of the queue. LocalTransactionalContext - cleared the _postComitDeliveryList on rollback. Added option to deliver the messages to the front of the queue. NonTransactionalContext - Added option to deliver the messages to the front of the queue. DeliverMessageOperation.java DELELTED AS NOT USED. CLIENT AMQSession - added ability to get the pervious state of the dispatcher when settting Stopped, fixed the channel suspension problems on broker so uncommented clean up code in rollback and recover. BasicMessageConsumer - updated the rollback so that it sends reject messages to server. AbstractJMSMessage - whitespace + added extra message properties to the toString() AMQProtocolHandler - whitespace + extra debug output TransactedTest - updated expect to prevent NPEs also added extra logging to help understand what is going on. CLUSTER ClusteredQueue - AMQQueue changes for message deliveryFirst. RemoteSubscriptionImpl - Implementation of Subscription SYSTESTS AbstractHeadersExchangeTestBase - AMQQueue changes for message deliveryFirst. AMQQueueMBeanTest - changes for message deliveryFirst. ConcurrencyTest - changes for message deliveryFirst. DeliveryManagerTest - changes for message deliveryFirst. SubscriptionTestHelper - Implementation of Subscription WhiteSpace only UnacknowledgedMessageMapImpl.java git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@510897 13f79535-47bb-0310-9956-ffa450edef68
* QPID-325 : Persist durable exchange information in the storeRobert Godfrey2007-02-209-89/+290
| | | | | | QPID-318 : Remove hardcoding of version numbers (as applies to store) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@509628 13f79535-47bb-0310-9956-ffa450edef68
* QPID-372 Broker doesn't wait for ChannelClose-Ok.Martin Ritchie2007-02-161-0/+10
| | | | | | Updated AMQProtocolSession to have new methods to query and release a channel from the awaiting close-ok state. Once a channel has been signalled to be closed any further methods on that channel are ignored until a close-ok is sent. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@508366 13f79535-47bb-0310-9956-ffa450edef68
* QPID-366 : Reference counting not being decremented correctly and other ↵Robert Godfrey2007-02-154-9/+12
| | | | | | persistence issues git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@508235 13f79535-47bb-0310-9956-ffa450edef68
* Applied patch from Jonathan Anstey <janstey@iona.com> to fix trivial compile ↵Gordon Sim2007-02-061-1/+1
| | | | | | error. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@504025 13f79535-47bb-0310-9956-ffa450edef68
* QPID-327 : Patch supplied by Rob Godfrey - [race condition] PoolingFilter : ↵Robert Greig2007-01-298-9/+30
| | | | | | Possible race condition when completing a Job git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@501096 13f79535-47bb-0310-9956-ffa450edef68
* QPID-320 : Patch supplied by Rob Godfrey - Improve performance by ↵Robert Greig2007-01-291-2/+1
| | | | | | remembering protocol version git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@501003 13f79535-47bb-0310-9956-ffa450edef68
* QPID-318 : Patch supplied by Rob Godfrey - Remove hard-coding of protocol ↵Robert Greig2007-01-251-0/+10
| | | | | | version number. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@499628 13f79535-47bb-0310-9956-ffa450edef68
* QPID-50 : Patch supplied by Rob Godfrey - Virtual Host implementationRobert Greig2007-01-2412-27/+100
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@499446 13f79535-47bb-0310-9956-ffa450edef68
* modified the mbean and mbean test for any failure in creating ↵Bhupendra Bhusman Bhardwaj2007-01-221-1/+7
| | | | | | TabularData(for channels) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@498670 13f79535-47bb-0310-9956-ffa450edef68
* QPID-275 : Patch supplied by Rob Godfrey - Add support for get / purge / qos ↵Robert Greig2007-01-197-110/+13
| | | | | | size / default exchanges and some other small fixes highlighted by the python tests git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@497770 13f79535-47bb-0310-9956-ffa450edef68
* QPID-146 QPID-112 QPID-278Martin Ritchie2007-01-1229-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* QPID-32: fixed compile problemRobert Greig2007-01-111-13/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495373 13f79535-47bb-0310-9956-ffa450edef68
* QPID-32: transaction fixesRobert Greig2007-01-111-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495304 13f79535-47bb-0310-9956-ffa450edef68
* Added empty signatures for recently added MessageStore interface methods, ↵Marnie McCormack2007-01-111-0/+16
| | | | | | for build success (empty implementations appropriate for this class) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495230 13f79535-47bb-0310-9956-ffa450edef68
* QPID-268 : (Patch supplied by Rob Godfrey) Improvements to performance of ↵Robert Greig2007-01-096-12/+43
| | | | | | generated code git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494650 13f79535-47bb-0310-9956-ffa450edef68
* QPID-255 : Patch Supplied by Rob Godfrey - Change to use bespoke ↵Robert Greig2007-01-0810-52/+65
| | | | | | 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
* git-svn-id: ↵Bhupendra Bhusman Bhardwaj2007-01-081-12/+13
| | | | https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494018 13f79535-47bb-0310-9956-ffa450edef68
* QPID-32: new model for holding and processing message in memory to support ↵Robert Greig2007-01-0715-194/+347
| | | | | | new persistent stores git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@493872 13f79535-47bb-0310-9956-ffa450edef68
* test queue and exchange names changed.Bhupendra Bhusman Bhardwaj2006-12-291-16/+20
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@490985 13f79535-47bb-0310-9956-ffa450edef68
* QPID-188 Bhupendra Bhusman Bhardwaj2006-12-282-12/+91
| | | | | | Unit tests added git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@490709 13f79535-47bb-0310-9956-ffa450edef68
* QPID-229 : Patch supplied by Rob Godfrey - Change implementation of FieldTableRobert Greig2006-12-223-19/+14
| | | | 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-224-4/+12
| | | | | | 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-188 Bhupendra Bhusman Bhardwaj2006-12-211-1/+2
| | | | | | test updated git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489331 13f79535-47bb-0310-9956-ffa450edef68
* QPID-188 Bhupendra Bhusman Bhardwaj2006-12-211-15/+7
| | | | | | 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
* QPID-101Martin Ritchie2006-12-201-0/+15
| | | | | | | | | | | | | | | | | | | | | 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
* Maven output clean up.Martin Ritchie2006-12-191-21/+26
| | | | | | Mainly removed exception stack traces from expected exceptions. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488715 13f79535-47bb-0310-9956-ffa450edef68
* QPID-216Martin Ritchie2006-12-191-0/+10
| | | | | | | | | | | | | | | | | | 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/+123
| | | | | | Unit test for Exchange MBeans git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488711 13f79535-47bb-0310-9956-ffa450edef68
* QPID-188 Bhupendra Bhusman Bhardwaj2006-12-191-0/+118
| | | | | | Adding unit tests for Java broker JMX functionality git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488705 13f79535-47bb-0310-9956-ffa450edef68
* QPID-188 Bhupendra Bhusman Bhardwaj2006-12-191-1/+2
| | | | | | 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-192-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Name correctedBhupendra Bhusman Bhardwaj2006-12-191-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488594 13f79535-47bb-0310-9956-ffa450edef68
* clean up warnings about unused variablesStephen Vinoski2006-12-182-12/+2
| | | | | | | | 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-188 Bhupendra Bhusman Bhardwaj2006-12-181-0/+179
| | | | | | Adding unit tests for Java broker JMX code git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488281 13f79535-47bb-0310-9956-ffa450edef68
* remove unused importsStephen Vinoski2006-12-181-1/+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
* add empty test to make junit under Eclipse happyStephen Vinoski2006-12-181-0/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488104 13f79535-47bb-0310-9956-ffa450edef68
* QPID-95 : Patch supplied by Rob Godfrey - throws correct exception when ↵Robert Greig2006-12-123-11/+210
| | | | | | 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
* systests test reorgStephen Vinoski2006-12-1214-30/+30
| | | | | | | | * move unused tests to src/old_test * modify pom.xml to remove surefire inclusions and exclusions git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486021 13f79535-47bb-0310-9956-ffa450edef68
* FieldTable change.Martin Ritchie2006-12-051-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* broker/pom.xml - removed test scope from junit to remove warning in build log.Martin Ritchie2006-11-201-0/+28
| | | | | | | | | | | | | | 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-1923-513/+252
| | | | 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-181-4/+9
| | | | 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-1837-0/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@476414 13f79535-47bb-0310-9956-ffa450edef68
* QPID-92 Changes to bring MINA use up to MINA-Head (1.1.0) compatibility Martin Ritchie2006-11-151-9/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@475286 13f79535-47bb-0310-9956-ffa450edef68
* * added top-level systests directory for non-unit testsStephen Vinoski2006-11-1237-0/+4460
* 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
View Lorry Controller Status