Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1451118073 for ; Wed, 16 Dec 2015 15:23:29 +0000 (UTC) Received: (qmail 84977 invoked by uid 500); 16 Dec 2015 15:23:28 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 84931 invoked by uid 500); 16 Dec 2015 15:23:28 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 84916 invoked by uid 99); 16 Dec 2015 15:23:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Dec 2015 15:23:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9CED2E09B2; Wed, 16 Dec 2015 15:23:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andytaylor@apache.org To: commits@activemq.apache.org Date: Wed, 16 Dec 2015 15:23:30 -0000 Message-Id: In-Reply-To: <35d29887a1134c0d99ed4d529d893a4a@git.apache.org> References: <35d29887a1134c0d99ed4d529d893a4a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] activemq-artemis git commit: merge #268 - ARTEMIS-302 more changes around XA reliability (resilience on failures) merge #268 - ARTEMIS-302 more changes around XA reliability (resilience on failures) Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1f3d189d Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1f3d189d Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1f3d189d Branch: refs/heads/master Commit: 1f3d189dc88442f29c5211a678bdef97c895cf16 Parents: a2c8e6b af1f79b Author: Andy Taylor Authored: Wed Dec 16 15:22:23 2015 +0000 Committer: Andy Taylor Committed: Wed Dec 16 15:22:23 2015 +0000 ---------------------------------------------------------------------- .../core/client/impl/ClientSessionImpl.java | 14 +- .../activemq/artemis/ra/ActiveMQRALogger.java | 10 +- .../artemis/ra/ActiveMQRAManagedConnection.java | 2 +- .../artemis/ra/ActiveMQRAXAResource.java | 21 +- .../artemis/ra/ActiveMQResourceAdapter.java | 188 +++--- .../artemis/ra/inflow/ActiveMQActivation.java | 76 +-- .../ra/inflow/ActiveMQMessageHandler.java | 3 +- .../impl/journal/JournalStorageManager.java | 3 +- .../core/server/cluster/impl/BridgeImpl.java | 23 + .../core/server/impl/ServerConsumerImpl.java | 3 +- .../core/server/impl/ServerSessionImpl.java | 9 +- .../core/transaction/impl/TransactionImpl.java | 148 ++-- .../transaction/impl/TransactionImplTest.java | 673 +++++++++++++++++++ .../byteman/ClusteredBridgeReconnectTest.java | 228 +++++++ .../byteman/ConcurrentDeliveryCancelTest.java | 92 +-- .../tests/extras/byteman/TimeoutXATest.java | 12 +- ...MDBMultipleHandlersServerDisconnectTest.java | 116 +++- .../cluster/bridge/BridgeReconnectTest.java | 4 + .../failover/AsynchronousFailoverTest.java | 8 +- .../integration/ra/ResourceAdapterTest.java | 48 +- .../integration/xa/BasicXaRecoveryTest.java | 3 + .../tests/unit/ra/ResourceAdapterTest.java | 24 +- 22 files changed, 1371 insertions(+), 337 deletions(-) ----------------------------------------------------------------------