Commit Graph

5244 Commits

Author SHA1 Message Date
Timothy A. Bish cad663a1e9 Update the test so that its not dependent on port 61617.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084379 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 22:23:14 +00:00
Bosanac Dejan 41424a41b9 remove activemq-rar from the distro and add a notice
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084249 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 16:51:50 +00:00
Bosanac Dejan a065bb1fb3 https://issues.apache.org/jira/browse/AMQ-3105 - removing icu4j as we're now requiring JDK 6
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084237 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 16:20:51 +00:00
Bosanac Dejan 536755170c https://issues.apache.org/jira/browse/AMQ-3235 - use old web console
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084208 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 15:00:56 +00:00
Gary Tully 32d24fbbdd https://issues.apache.org/jira/browse/AMQ-3003 - pass new sub parameter from expired processing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084188 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 14:11:03 +00:00
Gary Tully e10f75c33d https://issues.apache.org/jira/browse/AMQ-3236 - In the case of DLQ processing due to an exception from onMessage, provide the exception string as a message property. New property, org.apache.activemq.command.ActiveMQMessage#DLQ_DELIVERY_FAILURE_CAUSE_PROPERTY will hold the string form of the exception that causes a posion ack for a dlq message. It may be null if the cause was regular calls to rollback or message expiry. Wireformat change to have exception included with messageAck. new version 7
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084175 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 13:46:16 +00:00
Bosanac Dejan 8ba02a395f https://issues.apache.org/jira/browse/AMQ-3235 - upgrade to camel 2.8-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084132 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 11:09:52 +00:00
Gary Tully 27c1719757 https://issues.apache.org/jira/browse/AMQ-3003 - Allow the option of a DLQ per durable subscription DeadLetterStrategy. Additional attribute destinationPerDurableSubscriber, when true causes default dlq individual prefex to be prepended with the durab sub key, connectionid:subscriberName pair. Modified DeadLetterStrategy interface to pass in message and subscription, to provide fine level controll of dlq name. Also modified Broker interface to provide subscription to message expiry and sendToDLQ methods.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084023 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 23:41:44 +00:00
Gary Tully d618ab37b0 https://issues.apache.org/jira/browse/AMQ-3231 - have stompconnection use format instead of toString for marshalling such that toString can be used for logging; mask password and truncate content like text message
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084020 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 23:34:32 +00:00
Timothy A. Bish 8314d8651f Clean up the test a bit and adds some additional time to account for slower machines.
Removes System.out and replaces with logging.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084009 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 22:50:02 +00:00
Timothy A. Bish 8fd00fac58 fix test breakages caused by the initial fix for: https://issues.apache.org/jira/browse/AMQ-3231
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1083988 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 22:11:19 +00:00
Gary Tully e44ccf7f08 https://issues.apache.org/jira/browse/AMQ-3222 - fix test regression, xbean url parsing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1083770 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 13:12:52 +00:00
Gary Tully 400990f98a https://issues.apache.org/jira/browse/AMQ-3231 - Stomp Frame should mask passcode header in toString output, so it does not pollute the log
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1083753 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 12:21:37 +00:00
Gary Tully 3973d8ff22 fix typo in accessor
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1083752 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 12:20:11 +00:00
Bosanac Dejan 0de4f88aa7 https://issues.apache.org/jira/browse/AMQ-3218 - exclusive consumer with highest priority should always get through
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1082939 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 14:53:44 +00:00
Bosanac Dejan cc810aa4da https://issues.apache.org/jira/browse/AMQ-3219 - adding missing MDCHelper class
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1082530 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 15:15:27 +00:00
Bosanac Dejan 2b456ddbd0 https://issues.apache.org/jira/browse/AMQ-3219 - more work on MDC logging
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1082489 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 13:53:38 +00:00
Gary Tully 986ed145a7 https://issues.apache.org/jira/browse/AMQ-3222 - Failover and SimpleDiscovery - query parameters getting dropped, resolve by leaving composite prams in place and seperating out params that need to be applied to discovered transports, new format 'discovered.x' for the mulitcast case. Revisit https://issues.apache.org/jira/browse/AMQ-2981,https://issues.apache.org/jira/browse/AMQ-2598,https://issues.apache.org/activemq/browse/AMQ-2939
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1082333 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 22:48:26 +00:00
Bosanac Dejan 2a558c80a6 https://issues.apache.org/jira/browse/AMQ-3220 - network connectors and wildcards
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1081810 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 15:08:50 +00:00
Timothy A. Bish 4ed4956306 Add .classpath to svn-ignore.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1081796 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 14:13:10 +00:00
Bosanac Dejan 2900806b9e https://issues.apache.org/jira/browse/AMQ-3204 - adding additional null check
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1081697 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 09:39:47 +00:00
Timothy A. Bish 3d61acf2b2 fix for: https://issues.apache.org/jira/browse/AMQ-3199
fix for: https://issues.apache.org/jira/browse/AMQ-3200

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1081540 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 19:44:59 +00:00
Bosanac Dejan f0429be6ee https://issues.apache.org/jira/browse/AMQ-3219 - add basic support for MDC and enable broker name to appear in log entries
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1081502 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 18:24:21 +00:00
Gary Tully 55b9954873 give debug logging insight to the inactivity monitor negotiation, output local and remote infos
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1080560 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 12:58:19 +00:00
Gary Tully 286c9d0020 https://issues.apache.org/jira/browse/AMQ-3183 - fix typo in useAuthenticatedPrincipalForJMSXUserID
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1080512 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 10:53:02 +00:00
Gary Tully 3df3302c65 https://issues.apache.org/jira/browse/AMQ-3211 - ensure that a JMSXUserID property set by a client is ignored if an alternative userId mechanism is in place. This ensures that a client cannot spoof this value when the broker is configured to supply if from credentials. The client supplied value is only used as a last resourt
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1080212 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 13:24:34 +00:00
Bosanac Dejan bc715ea63d AMQ2764 test - give brokers static ids and name NC so that duplicate duplex connection can work
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1080196 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 12:15:21 +00:00
Bosanac Dejan 358ace29f5 test improvements
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1080194 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 11:58:33 +00:00
Gary Tully b6672d12b2 wait for network bridge formation before starting producer to ensure load is distributed
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1080191 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 11:39:59 +00:00
Gary Tully f93d05acef https://issues.apache.org/jira/browse/AMQ-3198 - unregister failed add connection but have unregister respect the reference count such that it is only removed if the refcount is 1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079885 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 17:01:55 +00:00
Timothy A. Bish 4f9784dafc apply patch for: https://issues.apache.org/jira/browse/AMQ-3209
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079831 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 15:17:59 +00:00
Bosanac Dejan 8700ab7cde https://issues.apache.org/jira/browse/AMQ-3198 - don't unregister original connection
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079782 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 13:06:43 +00:00
Gary Tully fe0a764836 give test plenty of time before failing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079757 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 11:43:29 +00:00
Bruce Snyder da66c46847 AMQ-2968 - Add Apache commons daemon (jsvc/procrun) start/stop support.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079638 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 01:42:36 +00:00
Bosanac Dejan 6c09e846b1 https://issues.apache.org/jira/browse/AMQ-2632 - dispose the old transport listener before rebalancing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079384 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 15:01:59 +00:00
Gary Tully 8fba621a08 https://issues.apache.org/jira/browse/AMQ-3205 - Update ActivationSpec, patch applied with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079331 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 11:52:37 +00:00
Bosanac Dejan 373417c0df give FailoverClusterTest a bit more time to reconnect
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079324 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 11:16:11 +00:00
Timothy A. Bish 5b5d494e65 Fix and test for: https://issues.apache.org/jira/browse/AMQ-2213
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079004 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 22:49:17 +00:00
Timothy A. Bish 74a45502e2 Test for: https://issues.apache.org/jira/browse/AMQ-3199
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 15:55:08 +00:00
Gary Tully 1c1aa17311 https://issues.apache.org/jira/browse/AMQ-3206 - Unsubscribed durable sub can leave dangling message reference in kahaDB, visible after a restart
resolved by correctly updating the persitent index when a durable sub with an outstanding backlog is unsubscribed. Additional test that vaidates fix

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078799 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 14:58:26 +00:00
Bosanac Dejan 008b3e551c https://issues.apache.org/jira/browse/AMQ-3204 - support for non-standard destination path separator
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078766 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 13:02:58 +00:00
Timothy A. Bish 815b789eeb fix for: https://issues.apache.org/jira/browse/AMQ-3078
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078321 13f79535-47bb-0310-9956-ffa450edef68
2011-03-05 18:13:50 +00:00
Timothy A. Bish d75bb6d6d8 fix for: https://issues.apache.org/jira/browse/AMQ-3202
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078312 13f79535-47bb-0310-9956-ffa450edef68
2011-03-05 17:15:25 +00:00
Timothy A. Bish 34242e246e Test case for: https://issues.apache.org/jira/browse/AMQ-3202
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1078311 13f79535-47bb-0310-9956-ffa450edef68
2011-03-05 17:12:51 +00:00
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