This closes #643
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d59299cc Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d59299cc Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d59299cc Branch: refs/heads/master Commit: d59299cc925ea6bf16dc1839166cc578c3b47fee Parents: 7bf62ff 89e0c46 Author: Martyn Taylor <[email protected]> Authored: Tue Jul 19 16:05:58 2016 +0100 Committer: Martyn Taylor <[email protected]> Committed: Tue Jul 19 16:05:58 2016 +0100 ---------------------------------------------------------------------- .../config/ActiveMQDefaultConfiguration.java | 7 + .../remoting/impl/netty/TransportConstants.java | 9 + .../core/protocol/stomp/StompConnection.java | 6 +- .../protocol/stomp/StompProtocolManager.java | 2 +- .../stomp/v11/StompFrameHandlerV11.java | 130 +++++------ .../artemis/core/config/Configuration.java | 4 + .../core/config/impl/ConfigurationImpl.java | 16 ++ .../deployers/impl/FileConfigurationParser.java | 2 + .../core/remoting/server/RemotingService.java | 6 + .../server/impl/RemotingServiceImpl.java | 130 +++++++---- .../resources/schema/artemis-configuration.xsd | 8 + .../core/config/impl/FileConfigurationTest.java | 1 + .../resources/ConfigurationTest-full-config.xml | 1 + docs/user-manual/en/configuration-index.md | 1 + docs/user-manual/en/connection-ttl.md | 5 + .../en/protocols-interoperability.md | 65 ++++-- .../client/IncompatibleVersionTest.java | 3 +- .../integration/client/TemporaryQueueTest.java | 5 +- .../tests/integration/remoting/PingTest.java | 3 +- .../integration/stomp/StompOverHttpTest.java | 4 +- .../stomp/StompOverWebsocketTest.java | 4 +- .../tests/integration/stomp/StompTest.java | 18 ++ .../tests/integration/stomp/StompTestBase.java | 88 ++++++-- .../integration/stomp/v11/StompV11Test.java | 214 +++++++++++++++++++ .../integration/stomp/v11/StompV11TestBase.java | 2 +- 25 files changed, 553 insertions(+), 181 deletions(-) ----------------------------------------------------------------------
