Commit Graph

8914 Commits

Author SHA1 Message Date
Daniel Kulp 32906100c5 [maven-release-plugin] prepare for next development iteration 2016-02-03 13:33:36 -05:00
Daniel Kulp 7b5150fbe3 [maven-release-plugin] prepare release activemq-5.12.3 2016-02-03 13:33:25 -05:00
Daniel Kulp 0023613278 Update spring.schemas 2016-02-03 13:21:39 -05:00
Daniel Kulp 258faf934e Update spring version to latest on the branch 2016-02-03 13:02:08 -05:00
Christopher L. Shannon (cshannon) 30ad629473 https://issues.apache.org/jira/browse/AMQ-6146
Fixing JSTL tags in the Webconsole

(cherry picked from commit d0f5c27785)
2016-02-03 14:39:17 +00:00
Christopher L. Shannon (cshannon) 6bff094f5a https://issues.apache.org/jira/browse/AMQ-6113
Properly set the X-FRAME-OPTIONS header on web responses.

(cherry picked from commit 186b5d0f30)
2016-01-29 21:11:21 +00:00
Claus Ibsen 09e748d959 AMQ-6149: Lets pre-configure jolokia in the broker 2016-01-28 19:51:09 +01:00
Altaflux 5c8939741a Network of brokers on duplex mode reports InstanceAlreadyExistsException on already existing destinations
(cherry picked from commit 6b1e87410d)
(cherry picked from commit aa8b64420b)
2016-01-15 15:19:37 +00:00
Claus Ibsen b21ad1a0f9 Polished 2016-01-11 13:36:04 +01:00
Christopher L. Shannon (cshannon) 5f0064622e [maven-release-plugin] prepare for next development iteration 2016-01-05 15:44:57 +00:00
Christopher L. Shannon (cshannon) 6ccbbce23d [maven-release-plugin] prepare release activemq-5.12.2 2016-01-05 15:44:06 +00:00
gtully 6f8942387e https://issues.apache.org/jira/browse/AMQ-6094 - regression via https://issues.apache.org/jira/browse/AMQ-6014 - incorrect ref count on message expiry event during cursor move for dispatch. Fix and test - thanks for the test
(cherry picked from commit e3df09b9db)
2016-01-05 15:08:33 +00:00
Christopher L. Shannon (cshannon) bf35f42bb6 https://issues.apache.org/jira/browse/AMQ-6109
The chooseValue method in DestinationMap will now always return the
exact match, if there is one, else it will then sort as before.

(cherry picked from commit 8e2176d93c)
2015-12-29 12:48:08 +00:00
Christopher L. Shannon (cshannon) 7eb1425733 https://issues.apache.org/jira/browse/AMQ-6097
Fixing JournalCorruptionEofIndexRecoveryTest class

Because of the size being stored in the message order index, the test
testRecoveryAftercorruptionCheckSumExistingIndex was no longer passing
as that test was corrupting the size value in the journal, but not the
size value in the index.  The test now corrupts both values so that the
expect exception occurs again.

(cherry picked from commit 507d40a79f)
2015-12-22 13:26:14 +00:00
Christopher L. Shannon (cshannon) 0411916793 https://issues.apache.org/jira/browse/AMQ-6097
remove un-needed import statements

(cherry picked from commit 370b181099)
2015-12-22 13:26:14 +00:00
Christopher L. Shannon (cshannon) 28f711e50e https://issues.apache.org/jira/browse/AMQ-6097
Fixing KahaDB so that the correct marshaller is used for the message
keys inside of the message order index.  This will ensure that message
size metrics are accurate.

(cherry picked from commit 246ccb8e04)
2015-12-22 13:26:14 +00:00
Timothy Bish 819e2371d6 https://issues.apache.org/jira/browse/AMQ-6102
Call to the statistics instance of the subscription to reset the
counters.
(cherry picked from commit 564d55023e)

Conflicts:
	activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
2015-12-21 17:23:29 -05:00
Timothy Bish a7d7f4c74a https://issues.apache.org/jira/browse/AMQ-6101
Update to v0.7.0 of Qpid JMS client libraries.
(cherry picked from commit ddd2812279)

Conflicts:
	pom.xml
2015-12-21 13:03:42 -05:00
Timothy Bish 7dfb2aef41 https://issues.apache.org/jira/browse/AMQ-6096
Update proton to latest.
(cherry picked from commit 9ee92a1e16)
2015-12-18 17:50:50 -05:00
Robert Gemmell df5c7cd661 AMQ-6045: update to proton-j 0.11.0
(cherry picked from commit 11ac3d9d85)
2015-12-18 17:50:32 -05:00
Robert Gemmell 61890098dd AMQ-5891: update to the proton 0.10 release
(cherry picked from commit 049f8da236)

Conflicts:
	pom.xml
2015-12-18 17:50:02 -05:00
Christopher L. Shannon (cshannon) ec50d23caa Revert "[maven-release-plugin] prepare release activemq-5.12.2"
This reverts commit f4a05c4573.
2015-12-18 17:43:08 +00:00
Christopher L. Shannon (cshannon) 340d095588 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 33d8bde31a.
2015-12-18 17:43:04 +00:00
Christopher L. Shannon (cshannon) 33d8bde31a [maven-release-plugin] prepare for next development iteration 2015-12-16 15:02:41 +00:00
Christopher L. Shannon (cshannon) f4a05c4573 [maven-release-plugin] prepare release activemq-5.12.2 2015-12-16 15:00:53 +00:00
Christopher L. Shannon (cshannon) 2ae189e700 https://issues.apache.org/jira/browse/AMQ-6077
Making new values in ActiveMQObjectMessage transient which fixes HTTP
serialization

(cherry picked from commit b9dcb010f7)
2015-12-16 14:41:45 +00:00
gtully c3339bc0fb https://issues.apache.org/jira/browse/AMQ-6016 - ensure xstream inits transients to default values when it bypasses the default creation method through object deserialization. Can make it more general if there are ever more instances of this. It avoids the need to check for null and sync
(cherry picked from commit 8136e67b40)
2015-12-16 14:41:37 +00:00
gtully b84785d5d0 https://issues.apache.org/jira/browse/AMQ-6016 - rework fix for https://issues.apache.org/jira/browse/AMQ-2106 - account group assignment on a per destination basis to prevent modification during consumer ordering
(cherry picked from commit 5d697cff3b)
2015-12-16 14:41:14 +00:00
Christopher L. Shannon (cshannon) 4ceda81e07 Revert "[maven-release-plugin] prepare release activemq-5.12.2"
This reverts commit 9d789cd28e.
2015-12-15 18:16:44 +00:00
Christopher L. Shannon (cshannon) ab43a15c99 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 21aa3ff35b.
2015-12-15 18:16:05 +00:00
Christopher L. Shannon (cshannon) 21aa3ff35b [maven-release-plugin] prepare for next development iteration 2015-12-15 16:19:29 +00:00
Christopher L. Shannon (cshannon) 9d789cd28e [maven-release-plugin] prepare release activemq-5.12.2 2015-12-15 16:18:53 +00:00
Christopher L. Shannon (cshannon) b0858b213b Adding activemq-5.12.2 to spring.schemas
(cherry picked from commit 09cbfa9477)
2015-12-15 15:15:21 +00:00
Dejan Bosanac 9a0298f3e9 https://issues.apache.org/jira/browse/AMQ-6077 - define default values (based on system property) for connection factory and object message
(cherry picked from commit eeec0c07b0)
2015-12-15 12:52:30 +00:00
Dejan Bosanac 5a8cd29195 https://issues.apache.org/jira/browse/AMQ-6077 - test
(cherry picked from commit 7951037f20)
(cherry picked from commit f3aedc753c)
2015-12-14 19:13:56 +00:00
Dejan Bosanac 7a262b74db https://issues.apache.org/jira/browse/AMQ-6077 - define object message trusted packages on connection factory
(cherry picked from commit 94446e53dc)
(cherry picked from commit 5e02e305ea)
2015-12-14 19:13:49 +00:00
Timothy Bish 0ac1e23d00 https://issues.apache.org/jira/browse/AMQ-6074
Make the transportConnector configs consistent across all four variants
by removing the enableCipherSuites option on openwire NIO+SSL.  RC4 was
enabled on the broker side but in later JDK releases that suite is
disbaled as it is insecure so the client side couldn't find a supported
suite.
(cherry picked from commit 315147c5ef)
2015-12-07 12:29:03 -05:00
Torsten Mielke 8daf6f503e https://issues.apache.org/jira/browse/AMQ-6071 - Log info about corrupted journal records at WARN level
(cherry picked from commit 66c348b1b8)
2015-12-04 15:24:24 -05:00
Daniel Kulp 82e12f0e5f Fix compile failure after back ports/cherry-picks 2015-12-03 19:38:28 +01:00
Dejan Bosanac 7eb9b218b2 https://issues.apache.org/jira/browse/AMQ-6013 - init serializable packages statically 2015-12-03 19:22:45 +01:00
Dejan Bosanac e7a4b53f79 https://issues.apache.org/jira/browse/AMQ-6013 - restrict classes which can be serialized inside the broker 2015-12-03 19:22:30 +01:00
gtully d5f6b0297e https://issues.apache.org/jira/browse/AMQ-6070 - set correct originalDestination property value in advisories
(cherry picked from commit 75ff17af41)
2015-12-03 09:00:39 -05:00
Christopher L. Shannon (cshannon) 58359a85d8 https://issues.apache.org/jira/browse/AMQ-6062
Updated QueueBrowserSubscription to use a ConcurrentMap to avoid a
potential race condition when multiple queue browsers browse
multiple queues.

(cherry picked from commit d346a765e3)
2015-12-02 15:55:37 +00:00
Christopher L. Shannon (cshannon) bbb002afda https://issues.apache.org/jira/browse/AMQ-6069
Fixed contains method in PrioritizedPendinList which was not returning
correctly.  This was causing messages to not be removed from the
dispatchPendingList when purge was called inside a Queue leading to an
eventual OOM error if enough messages were purged. This fix also
improves performance of the contains method.

(cherry picked from commit 8363c99b51)
2015-12-02 13:43:03 +00:00
Christopher L. Shannon 9617700725 https://issues.apache.org/jira/browse/AMQ-6066
Improving performance of OrderedPendingList contains method

Thanks for David Sitsky for the patch

(cherry picked from commit 673c2928a1)
2015-11-30 19:20:35 +00:00
Christopher L. Shannon (cshannon) a38c3d4b6b https://issues.apache.org/jira/browse/AMQ-5898
Removing assertion in VirtualDestinationInterceptor to allow
multiple composite destinations to forward to a physical destination

(cherry picked from commit 35b7ac250b)
2015-11-25 13:46:52 +00:00
Timothy Bish 451344486b https://issues.apache.org/jira/browse/AMQ-6055
Account for Authzid in SASL PLAIN mechanism and provide a means to fail
the authorization if the challenge response is invalid.  Update the
client to properly exclude sasl mechanism that don't apply to it's
configured credentials such as using only ANONYMOUS when no user or
password is set.
(cherry picked from commit b5dd0a16f4)
2015-11-20 14:40:34 -05:00
Robert Gemmell c8994b1d2e AMQ-6055: fix for earlier change to plain response encoding
(cherry picked from commit d7e4c6d96f)
2015-11-20 14:40:21 -05:00
Robert Gemmell e5c46df48c AMQ-6055: uptest test client and add [currently-ignored] test to demonstrate the issue
(cherry picked from commit ce5628a389)
2015-11-20 14:40:07 -05:00
Romain Manni-Bucau d9a79d172b release the connection even if broker communication fails
(cherry picked from commit 934f3cea7e)
2015-11-20 13:37:03 +00:00