Merge remote-tracking branch 'apache/tomee-1.7.x' into cxf-2617-17x

Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c9d2329c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c9d2329c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c9d2329c

Branch: refs/heads/tomee-1.7.x
Commit: c9d2329cb8c2418b6b71009e3faa0d573af19568
Parents: 08d4b1c 6a33d09
Author: Jonathan Gallimore <j...@jrg.me.uk>
Authored: Wed Aug 9 14:30:23 2017 +0100
Committer: Jonathan Gallimore <j...@jrg.me.uk>
Committed: Wed Aug 9 14:30:23 2017 +0100

----------------------------------------------------------------------
 .../openejb/assembler/classic/Assembler.java    |  82 ++++++++-
 .../openejb/assembler/classic/ResourceInfo.java |   2 +
 .../apache/openejb/core/mdb/MdbContainer.java   |  21 ++-
 .../org/apache/openejb/testing/Classes.java     |   2 +-
 .../ApplicationResourceLifecycleTest.java       |  92 ++++++++++
 .../core/mdb/ResourceAdapterControlTest.java    |  16 +-
 .../mdb/ResourceAdapterDeliveryActiveTest.java  | 184 +++++++++++++++++++
 .../src/test/resources/app-resources.xml        |  21 +++
 8 files changed, 407 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


Reply via email to