Merge remote-tracking branch 'apache/master' into resource-pre-destroy-master
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d2594302 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d2594302 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d2594302 Branch: refs/heads/master Commit: d25943021b8c584b1161d908f57d2a3142a3e88c Parents: e83b40d cb6baa0 Author: Jonathan Gallimore <[email protected]> Authored: Thu Aug 3 00:05:40 2017 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Thu Aug 3 00:05:40 2017 +0100 ---------------------------------------------------------------------- .../apache/openejb/core/mdb/MdbContainer.java | 21 ++- .../core/mdb/ResourceAdapterControlTest.java | 16 +- .../mdb/ResourceAdapterDeliveryActiveTest.java | 184 +++++++++++++++++++ pom.xml | 2 +- .../org/apache/tomee/embedded/Container.java | 28 +++ 5 files changed, 241 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
