You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2020/10/28 16:04:24 UTC
[activemq-artemis] branch master updated (4d6096f -> 05d5db8)
This is an automated email from the ASF dual-hosted git repository.
gtully pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git.
from 4d6096f This closes #3287
new 8499eac ARTEMIS-2937 Server Side AMQP Connectivity with options to transfer queues or replicate data
new 12280cd ARTEMIS-2937 DOCS & Examples on AMQP Broker Connection
new 05d5db8 Merge pull request #3316 from clebertsuconic/ARTEMIS-2937
The 7869 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 3 +
.../apache/activemq/artemis/logs/AuditLogger.java | 26 +
.../apache/activemq/artemis/utils/ByteUtil.java | 26 +-
.../artemis/utils/collections/LinkedList.java | 11 +
.../artemis/utils/collections/LinkedListImpl.java | 135 +++-
.../utils/collections/PriorityLinkedList.java | 10 +
.../utils/collections/PriorityLinkedListImpl.java | 33 +
.../apache/activemq/artemis/utils/ExecuteUtil.java | 140 ++++
.../activemq/artemis/utils/network/NetUtil.java | 88 +--
.../api/core/management/ActiveMQServerControl.java | 9 +
.../core/remoting/impl/netty/NettyConnector.java | 56 +-
.../remoting/impl/netty/NettyConnectorFactory.java | 13 +-
.../uri/ConnectorTransportConfigurationParser.java | 8 +-
.../org/apache/activemq/artemis/utils/XMLUtil.java | 4 +
.../protocol/amqp/broker/AMQPLargeMessage.java | 19 +-
.../artemis/protocol/amqp/broker/AMQPMessage.java | 112 +--
.../amqp/broker/AMQPMessageBrokerAccessor.java | 48 ++
.../amqp/broker/AMQPMessagePersisterV2.java | 9 +-
.../protocol/amqp/broker/AMQPSessionCallback.java | 6 +-
.../broker/ActiveMQProtonRemotingConnection.java | 4 +
.../amqp/broker/ProtonProtocolManager.java | 43 +-
.../amqp/broker/ProtonProtocolManagerFactory.java | 14 +
.../amqp/connect/AMQPBrokerConnection.java | 556 +++++++++++++++
.../AMQPBrokerConnectionChannelHandler.java | 66 ++
.../amqp/connect/AMQPBrokerConnectionManager.java | 248 +++++++
.../mirror/AMQPMirrorControllerAggregation.java | 118 ++++
.../connect/mirror/AMQPMirrorControllerSource.java | 203 ++++++
.../connect/mirror/AMQPMirrorControllerTarget.java | 361 ++++++++++
.../connect/mirror/AMQPMirrorMessageFactory.java | 91 +++
.../amqp/logger/ActiveMQAMQPProtocolLogger.java | 12 +
.../amqp/proton/AMQPConnectionContext.java | 112 ++-
.../protocol/amqp/proton/AMQPSessionContext.java | 57 +-
.../amqp/proton/ProtonAbstractReceiver.java | 303 ++++++++
.../protocol/amqp/proton/ProtonInitializable.java | 2 +-
.../amqp/proton/ProtonServerReceiverContext.java | 312 +--------
.../amqp/proton/ProtonServerSenderContext.java | 779 ++++++++++++---------
...tonInitializable.java => SenderController.java} | 24 +-
.../protocol/amqp/broker/AMQPMessageTest.java | 103 +--
.../amqp/proton/ProtonServerSenderContextTest.java | 2 +-
.../core/protocol/openwire/amq/AMQConsumer.java | 16 +-
.../artemis/core/config/Configuration.java | 6 +-
.../AMQPBrokerConnectConfiguration.java | 116 +++
.../AMQPBrokerConnectionAddressType.java} | 15 +-
.../AMQPBrokerConnectionElement.java | 87 +++
.../AMQPMirrorBrokerConnectionElement.java | 92 +++
.../BrokerConnectConfiguration.java | 110 +++
.../core/config/impl/ConfigurationImpl.java | 15 +
.../deployers/impl/FileConfigurationParser.java | 81 ++-
.../management/impl/ActiveMQServerControlImpl.java | 55 ++
.../paging/cursor/impl/PageSubscriptionImpl.java | 42 +-
.../journal/AbstractJournalStorageManager.java | 4 +
.../artemis/core/postoffice/AddressManager.java | 3 +
.../artemis/core/postoffice/PostOffice.java | 11 +
.../core/postoffice/impl/PostOfficeImpl.java | 47 ++
.../core/postoffice/impl/SimpleAddressManager.java | 19 +
.../core/remoting/server/RemotingService.java | 3 +
.../remoting/server/impl/RemotingServiceImpl.java | 7 +
.../artemis/core/server/ActiveMQServer.java | 20 +-
...ConnectorService.java => BrokerConnection.java} | 5 +-
.../artemis/core/server/ConnectorService.java | 1 +
.../apache/activemq/artemis/core/server/Queue.java | 13 +
.../artemis/core/server/RoutingContext.java | 4 +
.../artemis/core/server/ServerConsumer.java | 7 +-
.../core/server/impl/ActiveMQServerImpl.java | 104 ++-
.../artemis/core/server/impl/AddressInfo.java | 79 ++-
.../artemis/core/server/impl/LastValueQueue.java | 1 +
.../core/server/impl/MessageReferenceImpl.java | 1 +
.../artemis/core/server/impl/QueueImpl.java | 132 ++--
.../core/server/impl/RoutingContextImpl.java | 7 +-
.../core/server/impl/ServerConsumerImpl.java | 19 +-
.../core/server/mirror/MirrorController.java | 44 ++
.../protocol/AbstractProtocolManagerFactory.java | 10 +-
.../spi/core/protocol/ProtocolManagerFactory.java | 3 +
.../artemis/utils/XMLConfigurationUtil.java | 32 +-
.../resources/schema/artemis-configuration.xsd | 142 ++++
.../core/config/impl/AMQPConnectMatchTest.java | 36 +
.../artemis/core/list/PriorityLinkedListTest.java | 113 ++-
.../core/server/impl/AdressInfoJSonTest.java | 49 ++
.../server/impl/ScheduledDeliveryHandlerTest.java | 6 +
.../resources/ConfigurationTest-full-config.xml | 15 +
.../src/test/resources/artemis-configuration.xsd | 446 +++++++++++-
docs/user-manual/en/SUMMARY.md | 1 +
docs/user-manual/en/amqp-broker-connections.md | 238 +++++++
.../amqp-receiving-messages/pom.xml | 165 +++++
.../amqp-receiving-messages/readme.md | 7 +
.../jms/example/BrokerConnectionReceiver.java | 81 +++
.../src/main/resources/activemq/server0/broker.xml | 117 ++++
.../src/main/resources/activemq/server1/broker.xml | 110 +++
.../amqp-sending-messages/pom.xml | 165 +++++
.../amqp-sending-messages/readme.md | 7 +
.../jms/example/BrokerConnectionSender.java | 78 +++
.../src/main/resources/activemq/server0/broker.xml | 117 ++++
.../src/main/resources/activemq/server1/broker.xml | 110 +++
.../broker-connection/amqp-sending-overssl/pom.xml | 165 +++++
.../amqp-sending-overssl}/readme.md | 0
.../jms/example/BrokerConnectionSenderSSL.java | 78 +++
.../activemq/server0/activemq.example.keystore | Bin
.../activemq/server0/activemq.example.truststore | Bin
.../src/main/resources/activemq/server0/broker.xml | 65 ++
.../activemq/server1}/activemq.example.keystore | Bin
.../activemq/server1}/activemq.example.truststore | Bin
.../src/main/resources/activemq/server1/broker.xml | 60 ++
examples/features/{ => broker-connection}/pom.xml | 30 +-
examples/features/pom.xml | 2 +
.../transport/amqp/client/AmqpMessage.java | 9 +
.../integration/amqp/AmqpClientTestSupport.java | 61 +-
.../amqp/AmqpReferenceDeliveryAnnotationTest.java | 144 ++++
.../integration/amqp/connect/AMQPBridgeTest.java | 234 +++++++
.../integration/amqp/connect/AMQPReplicaTest.java | 683 ++++++++++++++++++
.../amqp/connect/MirrorControllerBasicTest.java | 116 +++
.../amqp/connect/QpidDispatchPeerTest.java | 183 +++++
.../tests/integration/cli/DummyServerConsumer.java | 7 +-
.../management/ActiveMQServerControlTest.java | 52 ++
.../ActiveMQServerControlUsingCoreTest.java | 19 +
.../test/resources/QpidRouterPeerTest-qpidr.conf | 51 ++
.../config/impl/ConfigurationValidationTest.java | 52 ++
.../tests/unit/core/postoffice/impl/FakeQueue.java | 6 +
.../core/server/impl/fakes/FakePostOffice.java | 17 +
.../artemis/tests/unit/util/LinkedListTest.java | 80 ++-
119 files changed, 8365 insertions(+), 1129 deletions(-)
create mode 100644 artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ExecuteUtil.java
create mode 100644 artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageBrokerAccessor.java
create mode 100644 artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnection.java
create mode 100644 artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnectionChannelHandler.java
create mode 100644 artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/AMQPBrokerConnectionManager.java
create mode 100644 artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerAggregation.java
create mode 100644 artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerSource.java
create mode 100644 artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java
create mode 100644 artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorMessageFactory.java
create mode 100644 artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonAbstractReceiver.java
copy artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/{ProtonInitializable.java => SenderController.java} (71%)
create mode 100644 artemis-server/src/main/java/org/apache/activemq/artemis/core/config/amqpBrokerConnectivity/AMQPBrokerConnectConfiguration.java
copy artemis-server/src/main/java/org/apache/activemq/artemis/core/{server/ConnectorService.java => config/amqpBrokerConnectivity/AMQPBrokerConnectionAddressType.java} (77%)
create mode 100644 artemis-server/src/main/java/org/apache/activemq/artemis/core/config/amqpBrokerConnectivity/AMQPBrokerConnectionElement.java
create mode 100644 artemis-server/src/main/java/org/apache/activemq/artemis/core/config/amqpBrokerConnectivity/AMQPMirrorBrokerConnectionElement.java
create mode 100644 artemis-server/src/main/java/org/apache/activemq/artemis/core/config/brokerConnectivity/BrokerConnectConfiguration.java
copy artemis-server/src/main/java/org/apache/activemq/artemis/core/server/{ConnectorService.java => BrokerConnection.java} (90%)
create mode 100644 artemis-server/src/main/java/org/apache/activemq/artemis/core/server/mirror/MirrorController.java
create mode 100644 artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/AMQPConnectMatchTest.java
create mode 100644 artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/AdressInfoJSonTest.java
create mode 100644 docs/user-manual/en/amqp-broker-connections.md
create mode 100644 examples/features/broker-connection/amqp-receiving-messages/pom.xml
create mode 100644 examples/features/broker-connection/amqp-receiving-messages/readme.md
create mode 100644 examples/features/broker-connection/amqp-receiving-messages/src/main/java/org/apache/activemq/artemis/jms/example/BrokerConnectionReceiver.java
create mode 100644 examples/features/broker-connection/amqp-receiving-messages/src/main/resources/activemq/server0/broker.xml
create mode 100644 examples/features/broker-connection/amqp-receiving-messages/src/main/resources/activemq/server1/broker.xml
create mode 100644 examples/features/broker-connection/amqp-sending-messages/pom.xml
create mode 100644 examples/features/broker-connection/amqp-sending-messages/readme.md
create mode 100644 examples/features/broker-connection/amqp-sending-messages/src/main/java/org/apache/activemq/artemis/jms/example/BrokerConnectionSender.java
create mode 100644 examples/features/broker-connection/amqp-sending-messages/src/main/resources/activemq/server0/broker.xml
create mode 100644 examples/features/broker-connection/amqp-sending-messages/src/main/resources/activemq/server1/broker.xml
create mode 100644 examples/features/broker-connection/amqp-sending-overssl/pom.xml
copy examples/features/{standard/ssl-enabled => broker-connection/amqp-sending-overssl}/readme.md (100%)
create mode 100644 examples/features/broker-connection/amqp-sending-overssl/src/main/java/org/apache/activemq/artemis/jms/example/BrokerConnectionSenderSSL.java
copy examples/features/{standard/ssl-enabled => broker-connection/amqp-sending-overssl}/src/main/resources/activemq/server0/activemq.example.keystore (100%)
copy examples/features/{standard/ssl-enabled => broker-connection/amqp-sending-overssl}/src/main/resources/activemq/server0/activemq.example.truststore (100%)
create mode 100644 examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/broker.xml
copy examples/features/{standard/ssl-enabled/src/main/resources/activemq/server0 => broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1}/activemq.example.keystore (100%)
copy examples/features/{standard/ssl-enabled/src/main/resources/activemq/server0 => broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1}/activemq.example.truststore (100%)
create mode 100644 examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/broker.xml
copy examples/features/{ => broker-connection}/pom.xml (68%)
create mode 100644 tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReferenceDeliveryAnnotationTest.java
create mode 100644 tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeTest.java
create mode 100644 tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPReplicaTest.java
create mode 100644 tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/MirrorControllerBasicTest.java
create mode 100644 tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/QpidDispatchPeerTest.java
create mode 100644 tests/integration-tests/src/test/resources/QpidRouterPeerTest-qpidr.conf