Commit Graph

4501 Commits

Author SHA1 Message Date
Timothy A. Bish 78265ea211 fix and test for: https://issues.apache.org/jira/browse/AMQ-4106
NIO based transports weren't updating the receive counter in the TcpTransport which can lead to the inactivity monitor mistakenly shutting down the connection.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1401394 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 19:13:19 +00:00
Timothy A. Bish 79127ae440 Add a method for manually send a keep alive value to the broker.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1401300 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 14:14:39 +00:00
Bosanac Dejan 7cb7d188f9 https://issues.apache.org/jira/browse/AMQ-3485 - make sure prefetch size of zero is a workaround
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1401261 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 12:16:47 +00:00
Christian Posta 8a5f160fd2 Tests for https://issues.apache.org/jira/browse/AMQ-4123
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1401102 13f79535-47bb-0310-9956-ffa450edef68
2012-10-22 22:01:08 +00:00
Gary Tully f6970c76ae polish test shutdown, jdk7 ci builds show regular failure here with jmx reuse
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1400839 13f79535-47bb-0310-9956-ffa450edef68
2012-10-22 11:24:23 +00:00
Gary Tully f129a0be89 https://issues.apache.org/jira/browse/AMQ-4118 - polish test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1400319 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 22:30:27 +00:00
Gary Tully 4cf6151a8c https://issues.apache.org/jira/browse/AMQ-4118 - resolve with test. keep cache uptodate when overflow chain is released so new end page is visible as terminus
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1400317 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 22:19:38 +00:00
Timothy A. Bish 2ad13d682a fix for: https://issues.apache.org/jira/browse/AMQ-4117
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1400304 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 21:41:39 +00:00
Timothy A. Bish 0fffe21720 fix for: https://issues.apache.org/jira/browse/AMQ-3996
Updates TransportServer API so that JaasDualAuthenticationBroker can tell when its dealing with a TransportServer that will provide SSL connections and it can validate client certificate chains from ConnectionInfo.  Also updated the properties files to reflect the newly generated certificates. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1400155 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 16:21:53 +00:00
Timothy A. Bish 65af81e09e fix for: https://issues.apache.org/jira/browse/AMQ-3996
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1399438 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 21:17:45 +00:00
Bosanac Dejan b5e46ef9c5 https://issues.apache.org/jira/browse/AMQ-4108 - master broker advisory topic needs to be retroactive
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1399302 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 15:16:01 +00:00
Gary Tully be8e58be14 https://issues.apache.org/jira/browse/AMQ-4094 - ensure list is split down to single entry before page over flow for a value, ensures the smallest marshall size for a page
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1399300 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 15:11:30 +00:00
Timothy A. Bish a49e75ada0 Update the test keystore files as all the certificates are expired.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1399294 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 15:04:17 +00:00
Claus Ibsen 5b63698924 AMQ-4112: Upgraded to MQTT 1.4 and polished tests.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1399151 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 08:35:00 +00:00
Timothy A. Bish 021e35ad3c Update the test keystore files as all the certificates are expired.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1398966 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 20:05:01 +00:00
Timothy A. Bish e9bf83fc92 Fix for: https://issues.apache.org/jira/browse/AMQ-4104
Add the unit test for this

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1398838 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 15:11:25 +00:00
Timothy A. Bish 46824cedc7 Fix for: https://issues.apache.org/jira/browse/AMQ-4104
Let the protocol converter handle setting the version after it forwards the CONNECTED frame. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1398833 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 14:59:37 +00:00
Claus Ibsen 9e94ee40a2 AMQ-3723: Upgraded to xbean 3.12
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1398643 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 04:53:46 +00:00
Timothy A. Bish f1c4a32017 Remove the System.out lines from the test, use LOG instead.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1398419 13f79535-47bb-0310-9956-ffa450edef68
2012-10-15 17:46:54 +00:00
Gary Tully 0a5ce71f6f https://issues.apache.org/jira/browse/AMQ-4103 - LeaseDatabaseLocker can not be changed from 5 sec poll - fix with test, default value now 10s to be consistent with other lockers and is also configurable. regression from https://issues.apache.org/jira/browse/AMQ-4005
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1398238 13f79535-47bb-0310-9956-ffa450edef68
2012-10-15 10:38:59 +00:00
Timothy A. Bish 8af1df7aea fix for: https://issues.apache.org/jira/browse/AMQ-4095
Add check null on engine. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1396975 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 10:22:46 +00:00
Timothy A. Bish 72eb191b74 fix for: https://issues.apache.org/jira/browse/AMQ-4095
Need to wrap the next batch of data once the initial wrapped packet buffer is exhausted. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1396846 13f79535-47bb-0310-9956-ffa450edef68
2012-10-10 22:55:21 +00:00
Gary Tully 56a61c7c15 fix dry exclusion config, override default merge with append for the excludes so the are additive for the two profiles in use
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1396518 13f79535-47bb-0310-9956-ffa450edef68
2012-10-10 09:25:17 +00:00
Gary Tully 84ba54b24f move fast, all and broken test exclusions to profiles so that exclusions are merged correctly. revert to surefire 2.10 pending fix for http://jira.codehaus.org/browse/SUREFIRE-913. To run all tests use: -Dactivemq.tests=all
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1395978 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 11:49:17 +00:00
Gary Tully 486e6374f2 remove unnecessary cast that limits locker impls
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1395977 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 11:48:46 +00:00
Bosanac Dejan cc95295139 https://issues.apache.org/jira/browse/AMQ-4100 - clean on websocket close
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1395976 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 11:40:39 +00:00
Claus Ibsen ddda4004b4 AMQ-1492: Allow to configure whether changing auto commit is allowed on JDBC persistence adapter. Some JDBC drivers dont allow changing that.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1395278 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 11:56:07 +00:00
Claus Ibsen 229c634a83 AMQ-1719: Avoid potential NPE in connection state tracker.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1395272 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 10:51:52 +00:00
Gary Tully 7db7ed130b revert the change to defalut included for surefire, there are a bunch of non tests in there. *Test.* is needed
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1394734 13f79535-47bb-0310-9956-ffa450edef68
2012-10-05 19:05:28 +00:00
Gary Tully b24dfb908b https://issues.apache.org/jira/browse/AMQ-4094 - offline durable subs with selectors can lead to page leaks in the index and bloat of db.data in kahadb - fix up page caching on overflow and btree free on remove. test that validates the inuse page count for specific intervals
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1394733 13f79535-47bb-0310-9956-ffa450edef68
2012-10-05 19:04:59 +00:00
Gary Tully a5eb7c6fa2 polish: some typos
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1394732 13f79535-47bb-0310-9956-ffa450edef68
2012-10-05 19:04:18 +00:00
Bosanac Dejan 205699e11e https://issues.apache.org/jira/browse/AMQ-3851 - refactor AuthorizationBroker so that addDestinationInfo is properly handled
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1393988 13f79535-47bb-0310-9956-ffa450edef68
2012-10-04 11:09:21 +00:00
Gary Tully 62bcbaa5d0 ensure slow-tests profile overrides excludes and runs all tests - duplicate the config in that profile, so order is the same etc; don't see another way atm
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1393443 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 11:53:33 +00:00
Gary Tully c5421f9095 remove dud import
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1393178 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 20:58:49 +00:00
Gary Tully 1005fc5062 https://issues.apache.org/jira/browse/AMQ-4091 - apply destination policy to temp topics, allows a memory limit to be specified to partition temp dest usage and enable producer flow control
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1393174 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 20:51:00 +00:00
Bosanac Dejan 0b0ed9f84d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392979 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 15:37:31 +00:00
Bosanac Dejan e396468d9b [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392977 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 15:37:00 +00:00
Bosanac Dejan 16dc729163 [maven-release-plugin] rollback the release of activemq-parent-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392968 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 15:24:44 +00:00
Bosanac Dejan c479df0679 [maven-release-plugin] prepare release activemq-parent-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392966 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 15:20:57 +00:00
Gary Tully a625f7ab94 add verification of blocking via full advisory - odd that advisory arrives late, hmm
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392945 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:55:03 +00:00
Bosanac Dejan c83b70c3cd [maven-release-plugin] rollback the release of activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392935 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:44:05 +00:00
Bosanac Dejan f2af2c9187 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392933 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:40:11 +00:00
Bosanac Dejan 07bed31f7b [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392929 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:34:36 +00:00
Bosanac Dejan 798437773a rolling back version because of failed release:perform
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392924 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:22:49 +00:00
Bosanac Dejan 5094609ec5 [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392921 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:16:05 +00:00
Bosanac Dejan 3576fbe97a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392876 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 12:09:24 +00:00
Bosanac Dejan 02b2ba294e [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392874 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 12:08:45 +00:00
Bosanac Dejan a8d364d030 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392269 13f79535-47bb-0310-9956-ffa450edef68
2012-10-01 10:39:07 +00:00
Bosanac Dejan a97f821869 [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392267 13f79535-47bb-0310-9956-ffa450edef68
2012-10-01 10:38:35 +00:00
Timothy A. Bish a80acbb1ad Polish the code, remove warnings fix spelling errors in the docs, add some new javadocs, etc.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1391682 13f79535-47bb-0310-9956-ffa450edef68
2012-09-28 22:19:20 +00:00
Gary Tully 0a7c5dc93a https://issues.apache.org/jira/browse/AMQ-2106 - Allow broker to evenly distribute message groups among consumers - have consumer order take number of assigned groups into account, such that priority is given to the least loaded consumers. When groups change frequently or are suspended this allows better distribution. When new consumer arrive they now have a good chance of getting the next available groups
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1391661 13f79535-47bb-0310-9956-ffa450edef68
2012-09-28 21:13:59 +00:00
Gary Tully 591c1a549c ensure async dispatches temp advisory is present before verfication of temp usage
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1391392 13f79535-47bb-0310-9956-ffa450edef68
2012-09-28 10:48:22 +00:00
Gary Tully 746585e8d7 add validation of request/reply over network with temp topic replyto, fine with duplex network connectors
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1391204 13f79535-47bb-0310-9956-ffa450edef68
2012-09-27 20:43:03 +00:00
Gary Tully f37fc74822 move http network test to options module so it can be run
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1391203 13f79535-47bb-0310-9956-ffa450edef68
2012-09-27 20:42:28 +00:00
Timothy A. Bish 8a75d960d5 fix and tests for: https://issues.apache.org/jira/browse/AMQ-4083
Revert previous fix.  We need to ack each expired message when we detect and not overload the usage of delivered acks for extending the prefetch window.  The problem was an edge case where the broker detected a message as expired after the client had delivered it but before it ack'd it as consumed.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1391152 13f79535-47bb-0310-9956-ffa450edef68
2012-09-27 18:17:47 +00:00
Gary Tully 3f49df7d70 fix typo
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1390931 13f79535-47bb-0310-9956-ffa450edef68
2012-09-27 10:28:20 +00:00
Timothy A. Bish c02acbd3d4 fix and tests for: https://issues.apache.org/jira/browse/AMQ-4083
Ensure that client ack mode sends acks for expired messages.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1390710 13f79535-47bb-0310-9956-ffa450edef68
2012-09-26 19:59:36 +00:00
Bosanac Dejan f49675bfa2 https://issues.apache.org/jira/browse/AMQ-3887 - do safeWaitUntilStarted outside of the synchronized block as deadlocks are possible
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1390473 13f79535-47bb-0310-9956-ffa450edef68
2012-09-26 13:29:16 +00:00
Gary Tully b469638171 fix up assembly xml configuration validtion tests - have them run by default. Pull out osgi isms to separate hook and add shutdown hook when jetty.xml is included so that it is shutdown on broker stop. Fix problems with the xml eposed by the tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1390204 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 22:52:28 +00:00
Timothy A. Bish 8dc1c1240b fix for: https://issues.apache.org/jira/browse/AMQ-4062
Durable consumer should be configured with the policyEntry configuration on activate. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1390193 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 22:21:44 +00:00
Hiram R. Chirino 4051799a6d More work for AMQ-4080: Include the activemq-leveldb module in the assembly, don't use the fusesource leveldb module anymore.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1389892 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 14:50:15 +00:00
Hiram R. Chirino b20d5411d1 Fixes AMQ-4080: Integrate the Fusesource LevelDB module into the ActiveMQ build.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1389882 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 14:32:28 +00:00
Gary Tully c50c1f5dad https://issues.apache.org/jira/browse/AMQ-4076 https://issues.apache.org/jira/browse/AMQ-498 - default to unlimited maxFrameSize - explicit limits in the xml config with DOS comment
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1389817 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 11:37:59 +00:00
Bosanac Dejan 5aed30d5df removing activemq-version pom variable and using project.version directly
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1389803 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 11:12:45 +00:00
Bosanac Dejan fa29678c54 https://issues.apache.org/jira/browse/AMQ-3918 - don't bind http based transports to local host name and do better url registering
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1389776 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 09:44:20 +00:00
Claus Ibsen 08185743c1 AMQ-4069: Upgraded maven plugin versions to latest releases.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1388390 13f79535-47bb-0310-9956-ffa450edef68
2012-09-21 09:35:01 +00:00
Claus Ibsen 0147739360 Added missing license header. More exclude to rat plugin.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1388354 13f79535-47bb-0310-9956-ffa450edef68
2012-09-21 07:36:48 +00:00
Timothy A. Bish c176fa8f33 fix for: https://issues.apache.org/jira/browse/AMQ-3298
Add property preferJndiDestinationLookup so that users can override the default order as needed and have the connector first go to JNDI before trying the JMS create method.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1388326 13f79535-47bb-0310-9956-ffa450edef68
2012-09-21 05:11:57 +00:00
Timothy A. Bish de7617e9c7 fix for: https://issues.apache.org/jira/browse/AMQ-730
Update some JavaDocs

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1388313 13f79535-47bb-0310-9956-ffa450edef68
2012-09-21 03:31:13 +00:00
Claus Ibsen c6595066e9 AMQ-4067: Prefix thread names with ActiveMQ
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387989 13f79535-47bb-0310-9956-ffa450edef68
2012-09-20 12:02:04 +00:00
Timothy A. Bish 6f2ac637cd fix for: https://issues.apache.org/jira/browse/AMQ-4066
Remove old deprecated code.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387960 13f79535-47bb-0310-9956-ffa450edef68
2012-09-20 10:48:56 +00:00
Timothy A. Bish 620d26d494 fix for: https://issues.apache.org/jira/browse/AMQ-4065
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387851 13f79535-47bb-0310-9956-ffa450edef68
2012-09-20 04:05:26 +00:00
Claus Ibsen 67b0c1861f Sorry was experimenting with the test on windows, and changed a parameter.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387648 13f79535-47bb-0310-9956-ffa450edef68
2012-09-19 15:45:16 +00:00
Claus Ibsen bdc676bbbc Disabled test failing on Windows. Will have to revisit
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387643 13f79535-47bb-0310-9956-ffa450edef68
2012-09-19 15:34:07 +00:00
Claus Ibsen 4810be5c6e Fixed test which may fail
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387600 13f79535-47bb-0310-9956-ffa450edef68
2012-09-19 14:08:01 +00:00
Claus Ibsen 4d48a5b59b AMQ-3914: Added support for MS SQL driver 4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387531 13f79535-47bb-0310-9956-ffa450edef68
2012-09-19 11:46:47 +00:00
Claus Ibsen 4a0bc68b01 Fixed test on slow servers
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387171 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 14:05:06 +00:00
Claus Ibsen 577952be49 AMQ-2488: Unable to access Serializable class when receiving ObjectMessage in OSGi environment
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387166 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 13:55:52 +00:00
Claus Ibsen 26806e7798 Polished
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387165 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 13:55:24 +00:00
Timothy A. Bish 3d5a758666 fix for: https://issues.apache.org/jira/browse/AMQ-3664
Added now option to connection and consumer to allow for configuration of a time interval upon which all the outstanding acks are delivered when optimized acknowledge is used so that a long running consumer that doesn't receive any more messages will eventually ack the last few unacked messages.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387079 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 10:12:30 +00:00
Claus Ibsen 9a32e38627 AMQ-4056: Upgraded jmDNS to 3.4.1, and removed old obsolte activemq-jmdns module that is no longer needed.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387052 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 08:44:42 +00:00
Claus Ibsen 1802116df8 AMQ-4011: IntrospectionSupport does not use java bean propery editors which are not thread safe, cause leaks, and are jvm global causing issues for other apps.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387025 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 07:50:35 +00:00
Claus Ibsen b749228112 AMQ-4011: Do not use java bean property editors for type conversion. Marked stuff as @deprecated.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1386596 13f79535-47bb-0310-9956-ffa450edef68
2012-09-17 13:10:50 +00:00
Claus Ibsen c9cc85bde1 AMQ-4049: Polished the AMQ start and stop logging.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1384714 13f79535-47bb-0310-9956-ffa450edef68
2012-09-14 10:34:54 +00:00
Claus Ibsen 4260034561 AMQ-4044: Fixed issue with double stopping BrokerService.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1384691 13f79535-47bb-0310-9956-ffa450edef68
2012-09-14 09:13:51 +00:00
Claus Ibsen f830d96b8b Fixing test on CI server
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383860 13f79535-47bb-0310-9956-ffa450edef68
2012-09-12 09:12:02 +00:00
Claus Ibsen 5453b26eb8 AMQ-4045: Fixed NPE in BrokerService.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383856 13f79535-47bb-0310-9956-ffa450edef68
2012-09-12 08:58:18 +00:00
Claus Ibsen 6da942706e AMQ-4038: Favor using JARs from maven central, to avoid 3rd part repos. AMQ-4039: Upgraded JAR dependencies.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383801 13f79535-47bb-0310-9956-ffa450edef68
2012-09-12 06:30:31 +00:00
Gary Tully 215dd18196 https://issues.apache.org/jira/browse/AMQ-3985 - fix up timeing issue in test post change to asyncDispatch for temp dest advisories
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383426 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 14:14:36 +00:00
Bosanac Dejan 170b86a861 https://issues.apache.org/jira/browse/AMQ-4005 - introducing Lockable interface and LockableServiceSupport for easier dealing with locks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383400 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 13:17:39 +00:00
Gary Tully aaf03576ee https://issues.apache.org/jira/browse/AMQ-3989 - ActiveMQSslConnectionFactory.setKeyAndTrustManagers does not work with failover enabled - fix and test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383370 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 12:07:35 +00:00
Claus Ibsen f2225c2f12 AMQ-4015: Added uptime to broker service, and shown in JMX, as well in logs when stopping broker.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383327 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 09:51:24 +00:00
Claus Ibsen 49bb4bf494 Fixing test on CI servers.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383308 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 09:21:36 +00:00
Claus Ibsen b968c0c9b2 Fixing test on CI servers.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383304 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 09:13:00 +00:00
Claus Ibsen ece2e17b19 AMQ-4029: Check for null when unregister mbean.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383270 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 07:38:10 +00:00
Claus Ibsen 8a0dd39fb0 Fixed test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383265 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 07:16:27 +00:00
Timothy A. Bish d97951ed69 fix for: https://issues.apache.org/jira/browse/AMQ-4035 check for null.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383234 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 03:27:20 +00:00
Claus Ibsen 6e0aa4fb80 AMQ-3994: Fixed JDBC connection leak if link failure. Thanks to Philip Bridger for the patch.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1382983 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 17:00:25 +00:00
Claus Ibsen 688c4f7946 AMQ-4033: JMX/RMI management do not use custom RMIServerSocketFactory as it cannot be unregistered, and then the JVM has strong reference and classloader cannot unload class. This causes problems for embedding brokers in container and if you redeploy.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1382852 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 13:58:17 +00:00
Claus Ibsen f272fc1df5 Polished
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1382761 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 11:28:18 +00:00
Claus Ibsen c70d97fddb AMQ-4002: Fixed issue with blob transfer policy should be copied when used to avoid sharing with multiple consumers. Thanks to Antoine for the patch.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1382283 13f79535-47bb-0310-9956-ffa450edef68
2012-09-08 11:38:15 +00:00
Claus Ibsen eea45cc978 AMQ-3807: Support WebSphere JMX which regsiter mbeans using custom name. Thansk to Christian Ohr for the patch.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1382277 13f79535-47bb-0310-9956-ffa450edef68
2012-09-08 10:56:14 +00:00
Claus Ibsen aec27626d5 AMQ-3976: Use equals instead of == in checking destination names. Thanks to Lior for the patch.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1382275 13f79535-47bb-0310-9956-ffa450edef68
2012-09-08 10:27:19 +00:00
Claus Ibsen 5b4fe6e05f AMQ-4031: Do not check for temporary journal store limit for non persistent broker. Thanks to Johno Crawford for the patch.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1382255 13f79535-47bb-0310-9956-ffa450edef68
2012-09-08 09:08:24 +00:00
Claus Ibsen 35f15ac8a1 AMQ-3451: Fixed memory leak when using embedded ActiveMQ broker from Spring XML file. Need to clear a spring cache when stopping.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1382055 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 14:46:45 +00:00
Claus Ibsen aa6a6d73e5 AMQ-3451: Ensure thread pools is shutdown properly to avoid any leaks. Do not use the old @deprecated thread pool.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1381991 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 12:14:35 +00:00
Claus Ibsen 4e1989247e AMQ-3451: Ensure thread pools is shutdown properly to avoid any leaks. Do not use the old @deprecated thread pool.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1381987 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 12:05:53 +00:00
Claus Ibsen 8a01c5d16a AMQ-3451: Ensure thread pools is shutdown properly to avoid any leaks. Do not use the old @deprecated thread pool.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1381985 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 11:58:21 +00:00
Bosanac Dejan 8530111cad https://issues.apache.org/jira/browse/AMQ-4005 - remove deprecated API warning from tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1381981 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 11:34:50 +00:00
Bosanac Dejan 97f03d43dd https://issues.apache.org/jira/browse/AMQ-4005 - remove deprecated API warning
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1381980 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 11:23:05 +00:00
Claus Ibsen 6c1676b59f AMQ-4026: Using ThreadPoolUtils to shutdown thread pool. Use thread pool from broker service where applicable.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1381695 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 17:50:43 +00:00
Claus Ibsen 5bf13b064e Polished
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1381566 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 11:56:02 +00:00
Claus Ibsen 287f69db4d AMQ-4026: Introduced ThreadPoolUtils to shutdown thread pools in a more graceful manner. Improved logging for lifecycle of thread pools and tasks being executed.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1381557 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 11:08:11 +00:00
Timothy A. Bish 2251ba0796 fix for: https://issues.apache.org/jira/browse/AMQ-3991
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1381422 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 22:22:01 +00:00
Claus Ibsen 0b01996efb AMQ-3451: Statis default thread pools is @deprecated. Refactored some code to avoid using that. Otherwise it causes leaks in Tomcat when redeploying apps.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1381237 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 16:28:58 +00:00
Claus Ibsen c30dd0c0ba AMQ-4016: Removed not used static thread pool from ActiveMQConnectionFactory.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1381191 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 14:08:48 +00:00
Gary Tully 446cb26e38 https://issues.apache.org/jira/browse/AMQ-4020 https://issues.apache.org/jira/browse/AMQ-4021 - disable this test till we deal with propagating store exceptions in place of ioexceptions which result in the transport abort and deal with more exact exception reporting from jdbc transaction context, ie from close/commit processing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1381161 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 12:43:16 +00:00
Gary Tully 5c61d97b20 https://issues.apache.org/jira/browse/AMQ-4017 - always use async dispatch for the advisory consumer so that we will not block remote dispatch
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1381095 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 09:22:43 +00:00
Gary Tully 640424727d https://issues.apache.org/jira/browse/AMQ-3998 https://issues.apache.org/jira/browse/AMQ-3999 - retroactive durables not supported by older stores, kaha and amq
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1380847 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 20:12:18 +00:00
Gary Tully eaac0d2eee https://issues.apache.org/jira/browse/AMQ-3998 https://issues.apache.org/jira/browse/AMQ-3999 - resolve emergent problems with retroactive durables and use of cache when active durable disconnects. resolves unit test failures and add some more
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1380547 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 11:02:17 +00:00
Claus Ibsen 8f207568aa Fixing test that may fail
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1380477 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 07:55:05 +00:00
Bosanac Dejan f344696a4a give tests a little bit more time, to check if it will help with occasional failures on slow machines
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1380264 13f79535-47bb-0310-9956-ffa450edef68
2012-09-03 15:10:23 +00:00
Claus Ibsen e85a8bd11c AMQ-3797: Avoid using StringArrayEditor as property editor as it causes memory leak when undeploying app in a container such as Tomcat.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1380168 13f79535-47bb-0310-9956-ffa450edef68
2012-09-03 08:35:42 +00:00
Claus Ibsen bed42a27c6 AMQ-3797: Added unit test for StringArrayEditor
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1380147 13f79535-47bb-0310-9956-ffa450edef68
2012-09-03 07:24:27 +00:00
Claus Ibsen b186513b05 AMQ-3797: Avoid adding the same paths to property editor serach path, if for example ActiveMQ is redeployed.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1379967 13f79535-47bb-0310-9956-ffa450edef68
2012-09-02 13:48:04 +00:00
Claus Ibsen 83eb01188a AMQ-4008: Fixed MDC leak during shutting down AMQ broker, such as reported by Apache Tomcat.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1379923 13f79535-47bb-0310-9956-ffa450edef68
2012-09-02 07:32:41 +00:00
Claus Ibsen 15b27399e8 AMQ-4007: Fixed default values of system usage for GB values to use 1024 multiplier instead of 1000.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1379922 13f79535-47bb-0310-9956-ffa450edef68
2012-09-02 07:12:33 +00:00
Claus Ibsen ca728c0958 AMQ-4007: Fixed default values of system usage for GB values to use 1024 multiplier instead of 1000.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1379767 13f79535-47bb-0310-9956-ffa450edef68
2012-09-01 14:59:17 +00:00
Claus Ibsen 4b44d3129c AMQ-4012: Use english locale when doing lower/upper case introspection to avoid issues when running on certain locales such as turkish.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1379765 13f79535-47bb-0310-9956-ffa450edef68
2012-09-01 14:50:33 +00:00
Claus Ibsen 0e724cd53f AMQ-4010: Use pre compiled pattern when doing string replaceAll as its faster.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1379761 13f79535-47bb-0310-9956-ffa450edef68
2012-09-01 13:04:53 +00:00
Claus Ibsen 3092051699 AMQ-4008: Fixed issue with re-deploying AMQ broker in same JVM such as Apache Tomcat, with the jmx connector not working on re-deployment. Now it does. Improved logging and better message to end user about the JMX issue.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1379454 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 14:01:39 +00:00
Claus Ibsen eea9fca04d AMQ-4008: Fixed MDC leak during shutting down AMQ broker, such as reported by Apache Tomcat.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1379376 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 09:10:23 +00:00
Bosanac Dejan f5178cc73f https://issues.apache.org/jira/browse/AMQ-4005 - pluggable lockers; move shared file locker from kahadb package and improve javadocs
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378917 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 13:00:04 +00:00
Claus Ibsen b080d5fe21 AMQ-3988: Setting a message listener to null on AcitveMQSession should be allowed even if the session has been closed, to avoid throwning invalid state exception, that causes exceptions to be logged during shutting down apps. This allows a more clean shutdown of AMQ.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378887 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 11:15:32 +00:00
Bosanac Dejan 6ce702d4cf https://issues.apache.org/jira/browse/AMQ-4005 - plugable lockers; introduce new API and refactor current KahaDB and JDBC solutions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378881 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 10:47:49 +00:00
Timothy A. Bish 324ab99afa additional change for: https://issues.apache.org/jira/browse/AMQ-3996
The sslEngine instance in the NIOSSLTransport needs to be updated when the handshake process completes.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378686 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 19:11:22 +00:00
Gary Tully 99be769f96 https://issues.apache.org/jira/browse/AMQ-3998 https://issues.apache.org/jira/browse/AMQ-3999 - fix regression in org.apache.activemq.bugs.AMQ3934Test - resetting batch too eagerly in old behaviour results in picking up deleted message
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378542 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 13:30:04 +00:00
Gary Tully 935265529f make test more deterministic, ensure bridge starts first time b/c remote broker is started first, may need to use a queue if there are further inconsistency problems
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378540 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 13:29:20 +00:00
Timothy A. Bish 6175dc4639 fix for: https://issues.apache.org/jira/browse/AMQ-3996
Set the transportContext property if the certificates are available.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378372 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 22:41:02 +00:00
Torsten Mielke d3ce3d8e4a Enabling support for JMX (off by default) to NetworkTestSupport
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378102 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 12:21:35 +00:00
Gary Tully d41f40a051 https://issues.apache.org/jira/browse/AMQ-3998 https://issues.apache.org/jira/browse/AMQ-3999 - fix issue with redispatch of committed prepared transactions, unnecessary call to determin store size for durable subs and duplicate recording of message pending dispatch on an unsubscribe
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378085 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 11:42:27 +00:00
Timothy A. Bish 53f07b0a75 fix for: https://issues.apache.org/jira/browse/AMQ-3995
Remove the long and not so useful serial add test.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1377779 13f79535-47bb-0310-9956-ffa450edef68
2012-08-27 18:26:22 +00:00
Timothy A. Bish 6ce59ed1b0 fix and test for: https://issues.apache.org/jira/browse/AMQ-3992
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1377095 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 20:39:23 +00:00
Gary Tully c55f6a84d7 https://issues.apache.org/jira/browse/AMQ-3557 - Performance of consumption with JDBC persistance and Microsoft SQL Server. Fix up default value for maxRows to allign with default page size. Use a large maxPageSize via destination policy for durable subs that have sparse selectors. Same as queues with sparse selectors
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1376934 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 14:21:22 +00:00
Gary Tully 705a877981 trace temp dest recreation by state tracker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1376513 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 14:45:17 +00:00
Gary Tully 5ed1ce50da https://issues.apache.org/jira/browse/AMQ-3872 - fix up typo in blob adapter
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1376100 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 15:29:28 +00:00
Gary Tully 6c73104152 include local port in transport to string to allow correlation between client and server side transport threads based on their ports.
Appending @local-port so client side: "ActiveMQ Transport: tcp://localhost/127.0.0.1:61616@56811" thread can be correlated with broker
side: "ActiveMQ Transport: tcp:///127.0.0.1:56811@61616" which listens on local 61616

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1376038 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 13:31:20 +00:00
Timothy A. Bish 4bace216b9 updated fix: https://issues.apache.org/jira/browse/AMQ-3982
Instead of locking on the PList iterator which forces a lock on every access to hasNext we should lock down at the PageFile level in readPage making the seek and read an atomic operation.  Since many reads on a single already loaded page don't need to be synchronized we pay a higher price for locking in the specific PList case than we do buy creating this atomic read operation in PageFile. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375852 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 23:28:50 +00:00
Gary Tully ba9037ca65 https://issues.apache.org/jira/browse/AMQ-3985 - ActiveMQConnection temp advisory consumer should use asyncDispatch - can cause deadlock with slow consumers. Fix with test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375595 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 14:59:41 +00:00
Bosanac Dejan dfbdbf6a50 https://issues.apache.org/jira/browse/AMQ-3983 - osgi dependency
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375543 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 13:44:49 +00:00