Merge branch 'master' into fb_tomee2_owb16
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c0ffb49b Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c0ffb49b Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c0ffb49b Branch: refs/heads/master Commit: c0ffb49b88e7b8abfa679310b036b23f8ff19b94 Parents: f01415e f286297 Author: Mark Struberg <[email protected]> Authored: Sat May 16 23:27:24 2015 +0200 Committer: Mark Struberg <[email protected]> Committed: Sat May 16 23:27:24 2015 +0200 ---------------------------------------------------------------------- .../apache/openejb/config/AppInfoBuilder.java | 16 ++++++ .../apache/openejb/config/ReadDescriptors.java | 7 ++- .../openejb/core/ivm/BaseEjbProxyHandler.java | 51 ++++++++++---------- 3 files changed, 47 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
