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/e83b40dc Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e83b40dc Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e83b40dc Branch: refs/heads/master Commit: e83b40dc624b171bf446a01f3745431f81c10920 Parents: ac5049f cf5ed05 Author: Jonathan Gallimore <[email protected]> Authored: Tue Jul 25 11:07:30 2017 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Tue Jul 25 11:07:30 2017 +0100 ---------------------------------------------------------------------- .../ActivationConfigPropertyOverride.java | 39 ++++- .../openejb/core/ivm/naming/IvmContext.java | 10 +- .../apache/openejb/core/mdb/MdbContainer.java | 31 ++-- ...ContainerOverwriteBothConfigurationTest.java | 152 ++++++++++++++++++ ...erOverwriteIdContainerConfigurationTest.java | 150 ++++++++++++++++++ ...tainerOverwriteMessageConfigurationTest.java | 150 ++++++++++++++++++ ...rwriteReadTheContainerConfigurationTest.java | 147 +++++++++++++++++ ...ContainerOverwriteSystemContainerIdTest.java | 158 +++++++++++++++++++ .../ActivationContainerOverwriteSystemTest.java | 158 +++++++++++++++++++ .../ActivationConfigPropertyOverrideTest.java | 27 +++- .../openejb/core/ivm/naming/IvmContextTest.java | 4 +- .../openejb/ivm/naming/IvmContextTest.java | 122 +++++++++++++- .../cxf/rs/AppPropertiesPropagationTest.java | 10 +- 13 files changed, 1132 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
