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/9a6010bb Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9a6010bb Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9a6010bb Branch: refs/heads/master Commit: 9a6010bbe9d47ce79ec5ffe57d08f901bff88a60 Parents: cf1295b 5830c20 Author: Jonathan Gallimore <[email protected]> Authored: Wed Jul 19 19:57:44 2017 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Wed Jul 19 19:57:44 2017 +0100 ---------------------------------------------------------------------- .../arquillian/tests/naming/IvmContextTest.java | 67 +++++++ .../arquillian/tests/naming/NamingBean.java | 135 ++++++++++++++ .../tests/naming/list-context-ejbjar.xml | 38 ++++ .../openejb/core/ivm/naming/IvmContext.java | 22 +-- .../openejb/ivm/naming/IvmContextTest.java | 186 ++++++++++++++++++- .../cxf/rs/AppPropertiesPropagationTest.java | 131 +++++++++++++ .../server/rest/InternalApplication.java | 7 + 7 files changed, 568 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
