This closes #1064
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a353da0c Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a353da0c Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a353da0c Branch: refs/heads/master Commit: a353da0caf7454f1c9f47dada5c2f05efd2370ed Parents: 2a3885d fe0ca4d Author: Martyn Taylor <[email protected]> Authored: Mon Mar 6 11:53:15 2017 +0000 Committer: Martyn Taylor <[email protected]> Committed: Mon Mar 6 11:53:15 2017 +0000 ---------------------------------------------------------------------- .../artemis/cli/commands/tools/PrintData.java | 7 + .../cli/commands/tools/XmlDataExporter.java | 42 +- .../cli/commands/tools/XmlDataExporterUtil.java | 11 +- .../cli/commands/tools/XmlDataImporter.java | 10 +- .../org/apache/activemq/artemis/Closeable.java | 22 + .../artemis/api/core/ActiveMQBuffer.java | 13 + .../artemis/api/core/ActiveMQBuffers.java | 15 + .../activemq/artemis/api/core/SimpleString.java | 34 + .../core/buffers/impl/ChannelBufferWrapper.java | 84 +- .../artemis/core/persistence/Persister.java | 30 + .../apache/activemq/artemis/utils/ByteUtil.java | 8 + .../activemq/artemis/utils/TypedProperties.java | 62 +- .../apache/activemq/artemis/utils/UTF8Util.java | 36 +- .../artemis/utils/TypedPropertiesTest.java | 10 +- .../config/ActiveMQDefaultConfiguration.java | 20 - .../activemq/artemis/api/core/ICoreMessage.java | 90 ++ .../activemq/artemis/api/core/Message.java | 637 +++++------ .../artemis/api/core/RefCountMessage.java | 81 ++ .../api/core/RefCountMessageListener.java | 31 + .../artemis/api/core/client/ClientMessage.java | 69 +- .../api/core/management/ManagementHelper.java | 18 +- .../impl/ResetLimitWrappedActiveMQBuffer.java | 24 +- .../core/client/impl/ClientConsumerImpl.java | 4 +- .../client/impl/ClientLargeMessageImpl.java | 22 +- .../core/client/impl/ClientMessageImpl.java | 69 +- .../core/client/impl/ClientMessageInternal.java | 4 +- .../core/client/impl/ClientProducerImpl.java | 50 +- .../CompressedLargeMessageControllerImpl.java | 6 + .../client/impl/LargeMessageControllerImpl.java | 15 + .../artemis/core/message/BodyEncoder.java | 55 - .../artemis/core/message/LargeBodyEncoder.java | 55 + .../artemis/core/message/impl/CoreMessage.java | 1068 ++++++++++++++++++ .../core/message/impl/CoreMessagePersister.java | 66 ++ .../artemis/core/message/impl/MessageImpl.java | 1059 ----------------- .../core/message/impl/MessageInternal.java | 57 - .../core/impl/ActiveMQSessionContext.java | 17 +- .../core/protocol/core/impl/ChannelImpl.java | 1 + .../core/protocol/core/impl/PacketImpl.java | 30 +- .../core/impl/RemotingConnectionImpl.java | 1 + .../core/impl/wireformat/MessagePacket.java | 21 +- .../SessionReceiveClientLargeMessage.java | 5 +- .../wireformat/SessionReceiveLargeMessage.java | 14 +- .../impl/wireformat/SessionReceiveMessage.java | 60 +- .../SessionSendContinuationMessage.java | 8 +- .../wireformat/SessionSendLargeMessage.java | 12 +- .../impl/wireformat/SessionSendMessage.java | 54 +- .../activemq/artemis/reader/MapMessageUtil.java | 4 +- .../spi/core/remoting/SessionContext.java | 14 +- .../artemis/message/CoreMessageTest.java | 365 ++++++ artemis-distribution/pom.xml | 10 - .../jdbc/store/journal/JDBCJournalImpl.java | 36 +- .../jdbc/store/journal/JDBCJournalRecord.java | 7 +- .../api/jms/management/JMSManagementHelper.java | 3 +- .../jms/client/ActiveMQBytesMessage.java | 4 +- .../artemis/jms/client/ActiveMQMessage.java | 8 +- .../jms/transaction/JMSTransactionDetail.java | 12 +- .../artemis/core/journal/EncoderPersister.java | 51 + .../activemq/artemis/core/journal/Journal.java | 55 +- .../journal/impl/AbstractJournalUpdateTask.java | 3 +- .../core/journal/impl/FileWrapperJournal.java | 26 +- .../artemis/core/journal/impl/JournalBase.java | 63 +- .../core/journal/impl/JournalCompactor.java | 9 +- .../artemis/core/journal/impl/JournalImpl.java | 62 +- .../impl/dataformat/JournalAddRecord.java | 20 +- .../impl/dataformat/JournalAddRecordTX.java | 17 +- .../protocol/amqp/broker/AMQPMessage.java | 872 ++++++++++++++ .../amqp/broker/AMQPMessagePersister.java | 75 ++ .../amqp/broker/AMQPSessionCallback.java | 45 +- .../amqp/broker/ProtonProtocolManager.java | 12 +- .../broker/ProtonProtocolManagerFactory.java | 14 + .../amqp/converter/AMQPContentTypeSupport.java | 146 +++ .../protocol/amqp/converter/AMQPConverter.java | 44 + .../amqp/converter/AMQPMessageIdHelper.java | 252 +++++ .../amqp/converter/AMQPMessageSupport.java | 308 +++++ .../amqp/converter/AmqpCoreConverter.java | 351 ++++++ .../amqp/converter/CoreAmqpConverter.java | 461 ++++++++ .../amqp/converter/ProtonMessageConverter.java | 101 -- .../converter/jms/ServerJMSBytesMessage.java | 10 +- .../amqp/converter/jms/ServerJMSMapMessage.java | 6 +- .../amqp/converter/jms/ServerJMSMessage.java | 71 +- .../converter/jms/ServerJMSObjectMessage.java | 9 +- .../converter/jms/ServerJMSStreamMessage.java | 8 +- .../converter/jms/ServerJMSTextMessage.java | 6 +- .../message/AMQPContentTypeSupport.java | 146 --- .../converter/message/AMQPMessageIdHelper.java | 252 ----- .../converter/message/AMQPMessageSupport.java | 276 ----- .../converter/message/AMQPMessageTypes.java | 30 - .../message/AMQPNativeInboundTransformer.java | 44 - .../message/AMQPNativeOutboundTransformer.java | 80 -- .../message/AMQPRawInboundTransformer.java | 62 - .../amqp/converter/message/EncodedMessage.java | 67 -- .../converter/message/InboundTransformer.java | 243 ---- .../message/JMSMappingInboundTransformer.java | 196 ---- .../message/JMSMappingOutboundTransformer.java | 592 ---------- .../converter/message/OutboundTransformer.java | 53 - .../amqp/proton/AMQPConnectionContext.java | 4 + .../proton/ProtonServerReceiverContext.java | 39 +- .../amqp/proton/ProtonServerSenderContext.java | 30 +- .../amqp/proton/ProtonTransactionHandler.java | 3 +- .../amqp/proton/handler/ProtonHandler.java | 2 +- .../protocol/amqp/util/NettyReadable.java | 139 +++ .../artemis/protocol/amqp/util/TLSEncode.java | 52 + .../amqp/converter/TestConversions.java | 619 +--------- .../message/AMQPContentTypeSupportTest.java | 10 +- .../message/AMQPMessageIdHelperTest.java | 11 +- .../message/AMQPMessageSupportTest.java | 11 +- .../JMSMappingInboundTransformerTest.java | 234 +--- .../JMSMappingOutboundTransformerTest.java | 387 +------ .../JMSTransformationSpeedComparisonTest.java | 94 +- .../message/MessageTransformationTest.java | 150 +-- .../protocol/amqp/message/AMQPMessageTest.java | 63 ++ .../core/protocol/mqtt/MQTTProtocolManager.java | 6 - .../core/protocol/mqtt/MQTTPublishManager.java | 31 +- .../protocol/mqtt/MQTTRetainMessageManager.java | 8 +- .../core/protocol/mqtt/MQTTSessionCallback.java | 12 +- .../artemis/core/protocol/mqtt/MQTTUtil.java | 20 +- .../protocol/openwire/OpenWireConnection.java | 3 - .../openwire/OpenWireMessageConverter.java | 34 +- .../openwire/OpenWireProtocolManager.java | 9 +- .../core/protocol/openwire/OpenwireMessage.java | 499 ++++++++ .../core/protocol/openwire/amq/AMQConsumer.java | 9 +- .../core/protocol/openwire/amq/AMQSession.java | 14 +- .../protocol/openwire/util/OpenWireUtil.java | 12 +- .../ActiveMQStompProtocolMessageBundle.java | 3 +- .../core/protocol/stomp/StompConnection.java | 17 +- .../protocol/stomp/StompProtocolManager.java | 14 +- .../core/protocol/stomp/StompSession.java | 51 +- .../artemis/core/protocol/stomp/StompUtils.java | 6 +- .../stomp/VersionedStompFrameHandler.java | 23 +- .../stomp/v12/StompFrameHandlerV12.java | 8 +- .../artemis/core/config/Configuration.java | 8 - .../core/config/impl/ConfigurationImpl.java | 32 - .../deployers/impl/FileConfigurationParser.java | 4 - .../activemq/artemis/core/filter/Filter.java | 4 +- .../artemis/core/filter/impl/FilterImpl.java | 19 +- .../management/impl/AddressControlImpl.java | 6 +- .../core/management/impl/QueueControlImpl.java | 10 +- .../impl/openmbean/OpenTypeSupport.java | 21 +- .../artemis/core/paging/PagedMessage.java | 4 +- .../artemis/core/paging/PagingStore.java | 7 +- .../core/paging/cursor/PagedReferenceImpl.java | 16 +- .../cursor/impl/PageSubscriptionImpl.java | 4 +- .../activemq/artemis/core/paging/impl/Page.java | 5 +- .../core/paging/impl/PagedMessageImpl.java | 70 +- .../core/paging/impl/PagingStoreImpl.java | 46 +- .../core/persistence/StorageManager.java | 16 +- .../journal/AbstractJournalStorageManager.java | 60 +- .../impl/journal/AddMessageRecord.java | 8 +- .../impl/journal/DescribeJournal.java | 17 +- .../impl/journal/JournalRecordIds.java | 3 + .../impl/journal/JournalStorageManager.java | 14 +- .../journal/LargeMessageTXFailureCallback.java | 6 +- .../impl/journal/LargeServerMessageImpl.java | 108 +- .../journal/codec/LargeMessageEncoding.java | 55 - .../journal/codec/LargeMessagePersister.java | 62 + .../nullpm/NullStorageLargeServerMessage.java | 16 +- .../impl/nullpm/NullStorageManager.java | 15 +- .../artemis/core/postoffice/Binding.java | 9 +- .../artemis/core/postoffice/Bindings.java | 6 +- .../artemis/core/postoffice/PostOffice.java | 18 +- .../core/postoffice/impl/BindingsImpl.java | 26 +- .../core/postoffice/impl/DivertBinding.java | 8 +- .../core/postoffice/impl/LocalQueueBinding.java | 8 +- .../core/postoffice/impl/PostOfficeImpl.java | 121 +- .../core/protocol/ServerPacketDecoder.java | 6 +- .../core/ServerSessionPacketHandler.java | 83 +- .../core/impl/ActiveMQPacketHandler.java | 2 +- .../protocol/core/impl/CoreProtocolManager.java | 13 +- .../core/impl/CoreProtocolManagerFactory.java | 14 + .../protocol/core/impl/CoreSessionCallback.java | 9 +- .../impl/wireformat/ReplicationAddMessage.java | 14 +- .../wireformat/ReplicationAddTXMessage.java | 14 +- .../wireformat/ReplicationPageWriteMessage.java | 2 +- .../core/remoting/server/RemotingService.java | 4 + .../server/impl/RemotingServiceImpl.java | 11 +- .../core/replication/ReplicatedJournal.java | 52 +- .../core/replication/ReplicationEndpoint.java | 7 +- .../core/replication/ReplicationManager.java | 11 +- .../core/server/ActiveMQServerLogger.java | 8 +- .../activemq/artemis/core/server/Bindable.java | 6 +- .../artemis/core/server/LargeServerMessage.java | 3 +- .../artemis/core/server/MessageReference.java | 10 +- .../activemq/artemis/core/server/Queue.java | 3 +- .../artemis/core/server/ServerMessage.java | 78 -- .../artemis/core/server/ServerSession.java | 23 +- .../core/server/cluster/Transformer.java | 4 +- .../core/server/cluster/impl/BridgeImpl.java | 14 +- .../cluster/impl/ClusterConnectionBridge.java | 13 +- .../core/server/cluster/impl/Redistributor.java | 3 +- .../cluster/impl/RemoteQueueBindingImpl.java | 13 +- .../core/server/impl/ActiveMQServerImpl.java | 2 +- .../artemis/core/server/impl/DivertImpl.java | 9 +- .../artemis/core/server/impl/JournalLoader.java | 6 +- .../core/server/impl/LastValueQueue.java | 9 +- .../core/server/impl/MessageReferenceImpl.java | 24 +- .../server/impl/PostOfficeJournalLoader.java | 7 +- .../artemis/core/server/impl/QueueImpl.java | 60 +- .../artemis/core/server/impl/RefsOperation.java | 4 +- .../core/server/impl/ScaleDownHandler.java | 37 +- .../core/server/impl/ServerConsumerImpl.java | 30 +- .../core/server/impl/ServerMessageImpl.java | 341 ------ .../core/server/impl/ServerSessionImpl.java | 156 +-- .../server/management/ManagementService.java | 7 +- .../management/impl/ManagementServiceImpl.java | 15 +- .../core/transaction/TransactionDetail.java | 8 +- .../transaction/impl/CoreTransactionDetail.java | 11 +- .../spi/core/protocol/MessageConverter.java | 10 +- .../spi/core/protocol/MessagePersister.java | 88 ++ .../spi/core/protocol/ProtocolManager.java | 12 +- .../core/protocol/ProtocolManagerFactory.java | 15 + .../spi/core/protocol/SessionCallback.java | 6 +- .../resources/schema/artemis-configuration.xsd | 16 - .../core/config/impl/ConfigurationImplTest.java | 9 - .../artemis/core/filter/impl/FilterTest.java | 12 +- .../group/impl/ClusteredResetMockTest.java | 7 +- .../impl/ScheduledDeliveryHandlerTest.java | 200 ++-- .../transaction/impl/TransactionImplTest.java | 16 +- .../artemis/tests/util/ActiveMQTestBase.java | 14 +- .../resources/ConfigurationTest-full-config.xml | 2 - .../test/resources/artemis-configuration.xsd | 16 - .../activemq/artemis/ActiveMQWebLogger.java | 5 +- docs/user-manual/en/SUMMARY.md | 2 - docs/user-manual/en/aerogear-integration.md | 104 -- docs/user-manual/en/vertx-integration.md | 88 -- .../jms/example/HatColourChangeTransformer.java | 4 +- .../example/AddForwardingTimeTransformer.java | 7 +- examples/features/sub-modules/aerogear/pom.xml | 115 -- .../features/sub-modules/aerogear/readme.html | 157 --- .../artemis/jms/example/AerogearExample.java | 76 -- .../main/resources/activemq/server0/broker.xml | 76 -- .../aerogear/src/main/resources/jndi.properties | 20 - examples/features/sub-modules/pom.xml | 2 - examples/features/sub-modules/vertx/pom.xml | 142 --- examples/features/sub-modules/vertx/readme.html | 103 -- .../artemis/core/example/ExampleVerticle.java | 53 - .../core/example/VertxConnectorExample.java | 103 -- .../main/resources/activemq/server0/broker.xml | 82 -- .../aerogear-chat/aerogear-chat.css | 102 -- .../aerogear-chat/aerogear-chat.js | 116 -- .../aerogear-chat/aerogear-index.html | 97 -- .../aerogear-chat/aerogear.min.js | 19 - .../stomp-websockets/aerogear-chat/stomp.js | 392 ------- .../activemq-aerogear-integration/pom.xml | 75 -- .../aerogear/ActiveMQAeroGearBundle.java | 47 - .../aerogear/ActiveMQAeroGearLogger.java | 70 -- .../aerogear/AeroGearConnectorService.java | 367 ------ .../AeroGearConnectorServiceFactory.java | 48 - .../integration/aerogear/AeroGearConstants.java | 83 -- integration/activemq-vertx-integration/pom.xml | 144 --- .../integration/vertx/ActiveMQVertxLogger.java | 55 - .../vertx/IncomingVertxEventHandler.java | 265 ----- .../vertx/OutgoingVertxEventHandler.java | 290 ----- .../integration/vertx/VertxConstants.java | 82 -- .../VertxIncomingConnectorServiceFactory.java | 51 - .../VertxOutgoingConnectorServiceFactory.java | 49 - pom.xml | 17 +- .../PartialPooledByteBufAllocator.java | 5 + .../amqp/client/util/UnmodifiableDelivery.java | 6 + .../journal/gcfree/EncodersBench.java | 5 +- .../byteman/JMSBridgeReconnectionTest.java | 4 +- .../tests/extras/byteman/MessageCopyTest.java | 163 --- tests/integration-tests/pom.xml | 43 - .../integration/DuplicateDetectionTest.java | 6 +- .../aerogear/AeroGearBasicServerTest.java | 350 ------ .../amqp/AmqpDescribedTypePayloadTest.java | 6 +- .../integration/amqp/AmqpSendReceiveTest.java | 21 - .../tests/integration/amqp/ProtonTest.java | 73 +- .../integration/client/AckBatchSizeTest.java | 14 +- .../integration/client/AcknowledgeTest.java | 172 ++- .../tests/integration/client/ConsumerTest.java | 265 ++++- .../integration/client/HangConsumerTest.java | 7 +- .../InVMNonPersistentMessageBufferTest.java | 36 +- .../client/InterruptedLargeMessageTest.java | 10 +- .../integration/client/LargeMessageTest.java | 5 +- .../integration/clientcrash/ClientExitTest.java | 4 +- .../integration/cluster/bridge/BridgeTest.java | 10 +- .../cluster/bridge/SimpleTransformer.java | 6 +- .../distribution/ClusterHeadersRemovedTest.java | 5 +- .../distribution/MessageRedistributionTest.java | 4 +- .../tests/integration/divert/DivertTest.java | 5 +- .../interceptors/InterceptorTest.java | 8 +- .../integration/journal/MessageJournalTest.java | 130 +++ .../journal/NIOJournalCompactTest.java | 6 +- .../integration/karaf/ArtemisFeatureTest.java | 2 + .../management/ManagementHelperTest.java | 8 +- .../management/ManagementServiceImplTest.java | 25 +- .../integration/mqtt/imported/MQTTTest.java | 2 +- .../integration/paging/PagingSendTest.java | 3 +- .../tests/integration/paging/PagingTest.java | 4 +- .../DeleteMessagesOnStartupTest.java | 10 +- .../persistence/ExportFormatTest.java | 28 +- .../replication/ReplicationTest.java | 71 +- .../integration/server/FakeStorageManager.java | 6 +- .../tests/integration/server/ScaleDownTest.java | 4 +- .../ssl/CoreClientOverOneWaySSLTest.java | 4 +- .../ssl/CoreClientOverTwoWaySSLTest.java | 5 +- .../vertx/ActiveMQVertxUnitTest.java | 774 ------------- .../storage/PersistMultiThreadTest.java | 30 +- .../stress/paging/PageCursorStressTest.java | 24 +- .../core/server/impl/QueueConcurrentTest.java | 6 +- tests/unit-tests/pom.xml | 6 + .../core/journal/impl/JournalImplTestUnit.java | 2 +- .../unit/core/message/impl/MessageImplTest.java | 14 +- .../tests/unit/core/paging/impl/PageTest.java | 42 +- .../core/paging/impl/PagingManagerImplTest.java | 16 +- .../core/paging/impl/PagingStoreImplTest.java | 64 +- .../core/postoffice/impl/BindingsImplTest.java | 16 +- .../unit/core/postoffice/impl/FakeQueue.java | 9 +- .../impl/WildcardAddressManagerUnitTest.java | 12 +- .../unit/core/server/impl/QueueImplTest.java | 4 +- .../unit/core/server/impl/fakes/FakeFilter.java | 7 +- .../server/impl/fakes/FakeJournalLoader.java | 6 +- .../core/server/impl/fakes/FakePostOffice.java | 22 +- .../tests/unit/util/FakePagingManager.java | 7 +- .../artemis/tests/unit/util/MemorySizeTest.java | 4 +- .../artemis/tests/unit/util/UTF8Test.java | 10 +- 316 files changed, 8454 insertions(+), 12406 deletions(-) ----------------------------------------------------------------------
