Merge remote-tracking branch 'apache/tomee-1.7.x' into resource-pre-destroy-17x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/bba93f16 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bba93f16 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bba93f16 Branch: refs/heads/tomee-1.7.x Commit: bba93f1696bb9879a4741587ae8fde983d933e52 Parents: 6b25264 74021cd Author: Jonathan Gallimore <[email protected]> Authored: Tue Jul 25 11:44:08 2017 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Tue Jul 25 11:44:08 2017 +0100 ---------------------------------------------------------------------- .../ActivationConfigPropertyOverride.java | 36 ++++- .../apache/openejb/core/mdb/MdbContainer.java | 7 + ...ContainerOverwriteBothConfigurationTest.java | 152 ++++++++++++++++++ ...erOverwriteIdContainerConfigurationTest.java | 150 ++++++++++++++++++ ...tainerOverwriteMessageConfigurationTest.java | 150 ++++++++++++++++++ ...rwriteReadTheContainerConfigurationTest.java | 147 +++++++++++++++++ ...ContainerOverwriteSystemContainerIdTest.java | 158 +++++++++++++++++++ .../ActivationContainerOverwriteSystemTest.java | 158 +++++++++++++++++++ .../ActivationConfigPropertyOverrideTest.java | 45 ++++-- 9 files changed, 991 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
