summaryrefslogtreecommitdiff
path: root/java/broker/pom.xml
Commit message (Collapse)AuthorAgeFilesLines
* QPID-156 : Add an Apache licensed store - created an experimental Derby ↵Robert Godfrey2008-04-161-0/+5
| | | | | | based store git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x@648834 13f79535-47bb-0310-9956-ffa450edef68
* QPID-804 : Fix Java Broker Python test failuresRobert Godfrey2008-02-211-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@629981 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions ↵Aidan Skinner2008-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 598285,598619,598721,598834-598835,599375,599531,599533,599572,599805,602134,604151,604928,605536,605542,606015-606016 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1 ........ r598285 | ritchiem | 2007-11-26 14:16:01 +0000 (Mon, 26 Nov 2007) | 3 lines QPID-92, QPID-564 : Upgraded Mina to 1.0.1 still not good enough but all future versions currently have a bug with the CumulativeProtocolDecoder. It compact()s the buffer which breaks slices. Added MultiThread Support which is some of the feature set of QPID-564 ........ r598619 | ritchiem | 2007-11-27 12:51:14 +0000 (Tue, 27 Nov 2007) | 1 line Renamed POMs to M2.1.1 Removed erroneous equals() in SpecificMethodFrameListenerTest ........ r598721 | ritchiem | 2007-11-27 18:09:33 +0000 (Tue, 27 Nov 2007) | 1 line QPID-621 : Patch Supplied by Aidan Skinner. Msg Ack after msg consumer is closed. ........ r598834 | ritchiem | 2007-11-28 00:45:32 +0000 (Wed, 28 Nov 2007) | 14 lines QPID-679 : Patch provided by Aidan Skinner and additional from odd problems during test runs. AMQChannel - Catch and log AMQException occuring when requeue()-ing. Previously exceptions wouldn't be caught at all. The requeue() is called during closure so there is nothing we can do protocol wise on error other than log the issue and continue with any other shutdown that is needed. AMQMinaProtocolSession & AMQPFastProtocolHandler . Additions to catch and log AMQExceptions. Changes to AMQMinaProtocolSession were done to ignore all input on a closing session other than the close-ok. Previously only Protocol frames were ignored this resulted in Content*Body-s still being processed. Additional checks were made for the MessageStoreClosedException to log and continue. As said else were we need to seperate protocol exceptoions(AMQException) from internal code exception handling. Further All AMQExceptions occuring in the frameReceived method are now caught and logged. Allowing them to propogate higher will only result in thread death. AMQPFastProtocolHandler Caught AMQExceptions occuring whilst closing the session. Again allowing these to continue will result in thread death. There is not a lot that can be done other than log the problem as the session is already closed by this point. Prevented the stacktrace associated with a session exception being printed in the exceptionCaught method when the problem was an IO Exception. This doesn't add anything useful and only adds to the log file sizes. ApplicationRegistry - Added removeAll option which ensures that all ARs are correctly purged so that we can attempt to clean up between Unit Tests. MemoryMessageStore - This was causing us real problems during the failover testing. Similar checks should probably be made to any other Message Store Impl. The issue was that when shutting down the broker the MS.close() method is called this sets all the storage to null. However, there may still be message processing going on as the close() does not attempt to stop connection processing. Hence we now check to see if the Store is close throwing a MSClosedException if required. This prevents NPEs that have been seen during Unit failover testing. In fact the close() is called as a request to shutdown the ApplicationRegistry, but this only occurs from tests and broker shutdown, no attempt to unbind or prevent further connections during this period is yet done. CLIENT CHANGES AMQConnection - Added method to check if failover is in progress. AMQClient - Upgraded acknowledge() exception to JMSException for errors due to failover. Also , added call to update consumers as a result of failover. BasicMessageConsumer - Changes to acquireReceiving to take in to consideration blocking for failover to occur. wrt receiveNoWait.. which previously blocked for failover to complete... not exactly noWait. acknowledge will now TransportConnection - Update to ensure all inVM brokers are correctly killed. FailoverTest - QPID-679 - Finder of all the above problems. ........ r598835 | ritchiem | 2007-11-28 01:01:05 +0000 (Wed, 28 Nov 2007) | 1 line CommitRollbackTest - this one just was never right.. now we have something better. ........ r599375 | ritchiem | 2007-11-29 10:58:08 +0000 (Thu, 29 Nov 2007) | 1 line Update to broker to address fanout python failure. ........ r599531 | ritchiem | 2007-11-29 17:56:12 +0000 (Thu, 29 Nov 2007) | 1 line QPID-92 QPID-564 Forgot to upgrade mina to 1.0.1 ........ r599533 | ritchiem | 2007-11-29 18:25:21 +0000 (Thu, 29 Nov 2007) | 1 line QPID-564 QPID-92 Tidied up a few points and fixed infinite loop in Read IO Thread ........ r599572 | ritchiem | 2007-11-29 20:56:22 +0000 (Thu, 29 Nov 2007) | 2 lines Mina Fix: Vm Pipe Starts Connection session before acceptor session. This results in protocol frames arriving before the protocol decoder has been configured on the InVM Broker. Verification of this could be done by adding a client side filter that delays the first message by a few seconds. ........ r599805 | ritchiem | 2007-11-30 12:47:08 +0000 (Fri, 30 Nov 2007) | 1 line Added new simple Request/Repsonse code as my last commit here seems to have missed the actual code. ........ r602134 | rupertlssmith | 2007-12-07 16:00:14 +0000 (Fri, 07 Dec 2007) | 1 line Added JDNI config for two broker, failover setup for failover tests. Also passed into FT tests config. ........ r604151 | ritchiem | 2007-12-14 10:40:37 +0000 (Fri, 14 Dec 2007) | 2 lines QPID-707 : Added new test to check message count on broker as messages are consumed to ensure that an ack is sent at 5000 mgs. Added acks on message consumer closure. Augmented VMTestCase to have helper methods for accessing broker statistics. ........ r604928 | rupertlssmith | 2007-12-17 17:00:10 +0000 (Mon, 17 Dec 2007) | 1 line DUPS_OK mode set to be same as AUTO_ACK, fixed broken dups ok test. ........ r605536 | rupertlssmith | 2007-12-19 13:40:05 +0000 (Wed, 19 Dec 2007) | 1 line Messages were being sent mandatory by default, set to false. ........ r605542 | rupertlssmith | 2007-12-19 13:53:44 +0000 (Wed, 19 Dec 2007) | 1 line Changed test configs to use colons instead of commas. ........ r606015 | rgodfrey | 2007-12-20 20:08:01 +0000 (Thu, 20 Dec 2007) | 2 lines QPID-714 : (Patch from Aidan Skinner) Issue with competing, transactional/client-ack consumers Ack each individual message on commit, not use multiple acks ........ r606016 | rgodfrey | 2007-12-20 20:12:25 +0000 (Thu, 20 Dec 2007) | 2 lines QPID-714 : (Patch from Aidan Skinner) Issue with competing, transactional/client-ack consumers Ack each individual message on commit, not use multiple acks ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@614906 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 594992-595694,595697-596350,596352-596362,596364-598327 via ↵Rupert Smith2007-11-301-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r594992 | ritchiem | 2007-11-14 18:00:28 +0000 (Wed, 14 Nov 2007) | 1 line QPID-685 : Update to address dependency issues and update the NOTICE file. ........ r595687 | rajith | 2007-11-16 14:54:01 +0000 (Fri, 16 Nov 2007) | 1 line moved the keys file to the parent folder ........ r595688 | rajith | 2007-11-16 15:00:22 +0000 (Fri, 16 Nov 2007) | 1 line removed the KEYS file, as now it is in the parent folder ........ r595740 | ritchiem | 2007-11-16 17:06:04 +0000 (Fri, 16 Nov 2007) | 1 line Fixed runtime dependency in the management console. ........ r596342 | rajith | 2007-11-19 15:56:29 +0000 (Mon, 19 Nov 2007) | 1 line added eclipse license details to the NOTICE file ........ r596650 | ritchiem | 2007-11-20 13:14:32 +0000 (Tue, 20 Nov 2007) | 1 line Added the full text of the additional licenses. ........ r596655 | ritchiem | 2007-11-20 13:22:53 +0000 (Tue, 20 Nov 2007) | 2 lines Added the full text of the additional licenses. Moved ICU licence text from NOTICE to LICENSE ........ r596657 | gsim | 2007-11-20 13:32:25 +0000 (Tue, 20 Nov 2007) | 3 lines Added boost license ........ r596665 | ritchiem | 2007-11-20 13:49:34 +0000 (Tue, 20 Nov 2007) | 1 line Added source links for EPL and MPL libraries ........ r598292 | rupertlssmith | 2007-11-26 14:45:15 +0000 (Mon, 26 Nov 2007) | 1 line Added incubator disclaimer. ........ r598311 | rupertlssmith | 2007-11-26 15:40:54 +0000 (Mon, 26 Nov 2007) | 1 line Added AMQP licence information. ........ r598327 | rajith | 2007-11-26 16:04:50 +0000 (Mon, 26 Nov 2007) | 1 line added disclaimers and AMP license to all languages ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@599806 13f79535-47bb-0310-9956-ffa450edef68
* Qpid-559 : OSGi Patch Provided by Aidan Skinner Martin Ritchie2007-11-261-0/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@598371 13f79535-47bb-0310-9956-ffa450edef68
* QPID-92, QPID-564 : Upgraded Mina to 1.0.1 still not good enough but all ↵Martin Ritchie2007-11-261-10/+10
| | | | | | future versions currently have a bug with the CumulativeProtocolDecoder. It compact()s the buffer which breaks slices. Added MultiThread Support which is some of the feature set of QPID-564 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@598324 13f79535-47bb-0310-9956-ffa450edef68
* Update to start M2.1 python test broker on port 2100 (management 2101) and ↵Martin Ritchie2007-09-251-1/+1
| | | | | | for the tests to use that broker. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@579198 13f79535-47bb-0310-9956-ffa450edef68
* Updated poms to refer to M2.1 rather than M2Robert Greig2007-09-201-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@577773 13f79535-47bb-0310-9956-ffa450edef68
* QPID-591 Fixed to use dirname and avoid working directory issues.Robert Greig2007-09-111-6/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@574585 13f79535-47bb-0310-9956-ffa450edef68
* Updates to pom files and Licensing/Notice files for M2 release.Martin Ritchie2007-07-181-0/+19
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@557276 13f79535-47bb-0310-9956-ffa450edef68
* Added minimal checkstyle to project reports. Fixed some problems with site ↵Rupert Smith2007-06-211-0/+1
| | | | | | generation. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@549530 13f79535-47bb-0310-9956-ffa450edef68
* Added SLF4J to Log4J binding.Rupert Smith2007-06-181-7/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@548312 13f79535-47bb-0310-9956-ffa450edef68
* Removed log4j dependency from client. Using slf4j instead, end-user to ↵Rupert Smith2007-06-111-5/+17
| | | | | | supply logging implementation as desired. Log4j used for tests. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@546190 13f79535-47bb-0310-9956-ffa450edef68
* Update to ensure fastinstall profile skips the broker python tests.Martin Ritchie2007-05-301-6/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@542789 13f79535-47bb-0310-9956-ffa450edef68
* Can now pass property to skip python tests, set in settings.xmlRupert Smith2007-05-291-0/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@542484 13f79535-47bb-0310-9956-ffa450edef68
* QPID-401 Update to allow -Dskip-python-tests to disable python checkingMartin Ritchie2007-05-181-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@539481 13f79535-47bb-0310-9956-ffa450edef68
* QPID-401 Update to pom to correctly set the broker.dirMartin Ritchie2007-05-181-4/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@539476 13f79535-47bb-0310-9956-ffa450edef68
* QPID-401 Integrated python tests with maven tested on windows CMD.exe and ↵Martin Ritchie2007-05-181-0/+47
| | | | | | linux FC5 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@539470 13f79535-47bb-0310-9956-ffa450edef68
* (Patch submitted by Rupert Smith) QPID-297Robert Greig2007-01-151-7/+3
| | | | | | There were junit exclusions in the POM files that were causing junit to not be found when compiling tests. This may be a maven bug, but a better solution is to exclude stuff in assembly descriptors instead. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@496414 13f79535-47bb-0310-9956-ffa450edef68
* QPID-278Martin Ritchie2007-01-121-7/+0
| | | | | | | | | 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-146 QPID-112 QPID-278Martin Ritchie2007-01-121-20/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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-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
* 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
* QPID-21Martin Ritchie2006-12-191-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* 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
* 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
* 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
* 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-191-43/+0
| | | | 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-0/+132
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@476431 13f79535-47bb-0310-9956-ffa450edef68