Commit Graph

5250 Commits

Author SHA1 Message Date
Timothy A. Bish f29c8011d0 Fix for: https://issues.apache.org/jira/browse/AMQ-3045
Adds an optional maximumRedeliveryDelay that defaults to -1 to indicate no max so behavior is unchanged from previous versions.  When the backoff multiplier is enabled and the maximumReliveryDelay is set > -1 then the delay returned by getNextReliveryDealy is capped by the max of either maximumReliveryDelay or redeliveryDelay preventing delays smaller than the configured redelivery delay.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078189 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 22:39:11 +00:00
Gary Tully 69f56058f2 https://issues.apache.org/jira/browse/AMQ-3198 - Allow JAAS GuestLoginModule to fail if users specify a password
new option to GuestLoginModule, credentialsInvalidate, when true, presence of a password will cause module to fail login
allowing the next module to validate the credential. Will only guest users who don't specify a password

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078048 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 16:48:01 +00:00
Gary Tully 78f85ed277 further reduction in stack traces at warn level in log for STOMP, suppress to stack trace to debug level, better for authorized broker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1077889 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 11:46:39 +00:00
Gary Tully 1b45e3be04 https://issues.apache.org/jira/browse/AMQ-3193 - fix regression with spring listener test. IndirectMessageRef cannot do equals bc it will break composite destination delivery to a single consumer, possible to break inflight count as ack of one message removes others from dispatched when message ref matches in error.
Fix is to ensure message ref is passed about such that there is a single ref per message. rework some internals to pass ref rather than message.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1077886 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 11:31:01 +00:00
Bosanac Dejan 2f47288da2 https://issues.apache.org/jira/browse/AMQ-3142 - upgrade to karaf 2.2.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1077868 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 11:00:24 +00:00
Bosanac Dejan d17ecebec4 https://issues.apache.org/jira/browse/AMQ-3197 - virtual destinations and wildcards
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1076651 13f79535-47bb-0310-9956-ffa450edef68
2011-03-03 15:24:32 +00:00
Gary Tully b98047ed8c remove hard coded wait time, use condition, resolve failure
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1076283 13f79535-47bb-0310-9956-ffa450edef68
2011-03-02 16:40:22 +00:00
Gary Tully 93e2bd355b https://issues.apache.org/jira/browse/AMQ-3196 - Speed up initial message delivery for offline durable sub with keepDurableSubsActive=true and JDBC store
avoid stop/start of cursor when keepdurablesubsactive=true such that a valid message count is retained by the cursor, independent of the store. This avoids unnecessary calls to the underlyin gtore on activation and reactivation

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1076278 13f79535-47bb-0310-9956-ffa450edef68
2011-03-02 16:23:40 +00:00
Bosanac Dejan 330c9a896d https://issues.apache.org/jira/browse/AMQ-2981 - Connecting to broker using discovery protocol fails
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1076192 13f79535-47bb-0310-9956-ffa450edef68
2011-03-02 12:32:26 +00:00
Gary Tully 6ebedcc1ed make test more deterministic to avert hudson failure
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075887 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 16:29:24 +00:00
Gary Tully d8fd5330a4 https://issues.apache.org/jira/browse/AMQ-3193 - implement equals for indirect message ref, so remove from pendingdispatch will work on moveMessages
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075864 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 15:59:59 +00:00
Gary Tully 462efdb9de https://issues.apache.org/jira/browse/AMQ-3193 - rework of fix to always populate pagedInPending
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075846 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 15:26:00 +00:00
Bosanac Dejan 645037e539 fix for FailoverTransportBrokerTest failure
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 13:44:31 +00:00
Bosanac Dejan 1d885d393e https://issues.apache.org/jira/browse/AMQ-2981 - modified test with workaround
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075820 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 13:43:55 +00:00
Gary Tully f38908eb52 https://issues.apache.org/jira/browse/AMQ-3195 - NetworkConnector initialization should be backed by an executor
added new broker attribute networkConnectorStartAsync (default false) that will cause network connectors
to be started in seperate threads such that a block of one does not effect the rest

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075801 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 12:59:09 +00:00
Bosanac Dejan 5ad72d650c https://issues.apache.org/jira/browse/AMQ-2981 - test case for discory uri with params
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075407 13f79535-47bb-0310-9956-ffa450edef68
2011-02-28 16:19:26 +00:00
Bosanac Dejan 99653c6c8c https://issues.apache.org/jira/browse/AMQ-3193 - consumers don't get messages after JMX remove
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075346 13f79535-47bb-0310-9956-ffa450edef68
2011-02-28 14:23:30 +00:00
Timothy A. Bish 9308db8b75 resolve the dependency on fixed ports 61616 and 61613.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1075051 13f79535-47bb-0310-9956-ffa450edef68
2011-02-27 13:21:15 +00:00
Timothy A. Bish 72a0fd1a43 fix for: https://issues.apache.org/jira/browse/AMQ-2256
suppress the stack trace output for the error and just log a warning that the URI path is not valid for binding to a local port.  Output the full exception stack trace if debug logging is turned on.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074948 13f79535-47bb-0310-9956-ffa450edef68
2011-02-26 22:52:39 +00:00
Timothy A. Bish 56f8e368d5 fix for: https://issues.apache.org/jira/browse/AMQ-2929
Added test showing how a Text Message that was compressed can be received in a state where the text is not compressed but the Message compressed flag indicates it is resulting in an exception from getText() indicating an unknown compression type.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074725 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 22:33:19 +00:00
Gary Tully 57f5e7efa5 https://issues.apache.org/jira/browse/AMQ-3192 - Add setTrustStore() and setKeyStore() methods to ActiveMQSslConnectionFactory class
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074577 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 15:25:21 +00:00
Gary Tully 7739a3cc4a suppress stack trace from failed add connecton to debug level trace, such that the warn just has the exception toString, with an authenticated broker, the stack trace is too much information and is the predominant reason for a failure to add
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074550 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 14:54:48 +00:00
Gary Tully 2d121f4092 https://issues.apache.org/jira/browse/AMQ-3190 - Durable Subscription - missing messages when selector matching sub resumes after broker restart
the next message id needs to be tracked such that unmatched messages are not ignored from the indexi after a restart. Tracking it as part of message add
in the ackPositions.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074511 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 13:17:14 +00:00
Timothy A. Bish 576230be65 Apply patch for: https://issues.apache.org/jira/browse/AMQ-3186
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074325 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 22:28:15 +00:00
Timothy A. Bish 3e895c6e95 fix for: https://issues.apache.org/jira/browse/AMQ-3139
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074300 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 21:25:08 +00:00
Timothy A. Bish a5fc6dd999 Add fix for https://issues.apache.org/jira/browse/AMQ-3153 and add user supplied unit test.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074289 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 21:00:26 +00:00
Timothy A. Bish d245457ccd apply fix for: https://issues.apache.org/jira/browse/AMQ-3187
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074285 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 20:12:13 +00:00
Timothy A. Bish 6595dc4a62 Apply patch for https://issues.apache.org/jira/browse/AMQ-3185
Confirmed the current code allows for two calls to stop before the disposed flag is triggered.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074209 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 16:51:59 +00:00
Bosanac Dejan 0c98cb0818 fixing broker configurations
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074094 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 10:13:33 +00:00
Bosanac Dejan d884ba2964 test topic replication in full mesh network scenario
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1074060 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 07:58:22 +00:00
Gary Tully 0298440d4f JDBC relative test too slow for hudson, disable this variant
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1073680 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 10:33:41 +00:00
Gary Tully 3419bb7ca5 ensure test uses clean slate as previous priority tests can leave additional rows in the db
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1073671 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 10:08:44 +00:00
Gary Tully cb967831d6 https://issues.apache.org/jira/browse/AMQ-3188 - Full table scan for durable subs in jdbc store when priority enabled; very slow with large message backlog
added more state to the topic message store such that it can ask the db for a single priority at a time which is indexed. This avoids a full table scan.
send rate with active durable subs vs inactive durable subs is now in the region of 6x from 40x. validation test included.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1073453 13f79535-47bb-0310-9956-ffa450edef68
2011-02-22 18:51:54 +00:00
Alex Dean c6ede162c3 https://issues.apache.org/jira/browse/AMQ-3123 - messages for web clients need to be associated with the correct consumer.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1072620 13f79535-47bb-0310-9956-ffa450edef68
2011-02-20 16:09:28 +00:00
Gary Tully 8649f65c54 see what goes on with the listener when org.apache.activemq.transport.failover.FailoverTransportBrokerTest#testNoBrokersInBrokerInfo fails
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071939 13f79535-47bb-0310-9956-ffa450edef68
2011-02-18 10:26:15 +00:00
Hiram R. Chirino c1f4dc94bb Fixes AMQ-3184 : Upgrade to Camel 2.6.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071848 13f79535-47bb-0310-9956-ffa450edef68
2011-02-18 00:50:35 +00:00
Gary Tully 6d444d5132 don't use MEM store for transaction recovery tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071737 13f79535-47bb-0310-9956-ffa450edef68
2011-02-17 18:27:54 +00:00
Gary Tully a6c51a4532 https://issues.apache.org/jira/browse/AMQ-2736 - KahaDB doesn't clean up old files (abortive shutdown)
After kill -9 with outstanding local transaction the transaction is recovered in error. fix and test

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071732 13f79535-47bb-0310-9956-ffa450edef68
2011-02-17 18:04:54 +00:00
Timothy A. Bish 14722f8627 fix for: https://issues.apache.org/jira/browse/AMQ-3006
assign default JMS priority when none is set on a Message.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071432 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 22:54:23 +00:00
Timothy A. Bish e0c678e9a0 Apply patch for: https://issues.apache.org/jira/browse/AMQ-3036
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071411 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 21:38:41 +00:00
Gary Tully e8d9b709e0 remove duplicate test and add auto fail, see if we can find why it hangs in hudson
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071323 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 17:42:19 +00:00
Gary Tully 6f68a94319 https://issues.apache.org/jira/browse/AMQ-3182 - JAAS PropertiesLoginModule does not maintain internal validity state, so will commit in error after an invalid login attempt
https://issues.apache.org/jira/browse/AMQ-3183 - Set JMSXUserID value based on authenticated principal
Fixed up PropertiesLoginModule such that it maintains login state and only commits on success. Added attribute brokerService useAuthenticatedPrincipalForJMXUserID to indicate
that the first authenticated user principal should be used for the userName and hense by the userId broker when populateJMSXUserID is set. In the absense of a principal the
userName is unchanged.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071301 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 16:12:18 +00:00
Hiram R. Chirino b0c2a40fb9 Removing svn keywords, they don't have much value and just add additional noise when diffing source trees.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071259 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 14:08:48 +00:00
Hiram R. Chirino 0bbc0acb84 Removing svn keywords, they don't have much value and just add additional noise when diffing source trees.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071256 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 13:58:54 +00:00
Timothy A. Bish 8280417876 fix for: https://issues.apache.org/jira/browse/AMQ-3000
Scheduler wasn't taking into account that there might be a job that was scheduled earlier than the last wait time for jobs when they are fired.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071109 13f79535-47bb-0310-9956-ffa450edef68
2011-02-15 23:46:43 +00:00
Hiram R. Chirino 65f2428342 Fixes AMQ-3181
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1070876 13f79535-47bb-0310-9956-ffa450edef68
2011-02-15 13:02:59 +00:00
Gary Tully 6b643dc2c3 https://issues.apache.org/jira/browse/AMQ-3120 - KahaDB error: "Could not locate data file"
Test failure, issue with over eager cleanup. journal write as part of cleanup was incrementing the last update location
leaving the current journal file as a candidate for cleanup prematurely. This could ocurr between a destination store journal
write and index update so that the file was not present in the inexe. Capturing the last update exclusive of the checkpoint
write resolves this

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1070484 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14 13:17:38 +00:00
Gary Tully a1d3245182 https://issues.apache.org/jira/browse/AMQ-3180 - ensure correct type us used in error case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1070443 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14 11:15:42 +00:00
Gary Tully 9edeb21bec https://issues.apache.org/jira/browse/AMQ-3180 - JMX Browse of BytesMessage fails with javax.management.openmbean.OpenDataException: Argument's element itemValues[8]=[B@de15a0 is not a valid value for this item. readonly flag needs to be flipped by browser such that content can be read.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1070442 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14 11:11:01 +00:00
Gary Tully bf4dd7330d http://issues.apache.org/jira/browse/AMQ-3178 - 5.3.x clients to 5.4 brokers always get updated cluster information in the broker info, this should be configurable
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069846 13f79535-47bb-0310-9956-ffa450edef68
2011-02-11 15:42:38 +00:00