Merge remote-tracking branch 'refs/remotes/origin/master' into tomee-7.0.0-M1
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6648975a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6648975a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6648975a Branch: refs/heads/tomee-7.0.0-M1 Commit: 6648975a2a8421b7b4bfa676b710d475a84bd0f7 Parents: e99dbb7 3035c83 Author: andygumbre...@apache.org <andy...@gmx.de> Authored: Mon Nov 2 19:54:17 2015 +0100 Committer: andygumbre...@apache.org <andy...@gmx.de> Committed: Mon Nov 2 19:54:17 2015 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/core/WebContext.java | 51 ++++-- .../tomee/catalina/JavaeeInstanceManager.java | 16 +- .../tomee/catalina/OpenEJBContextConfig.java | 36 +++- .../tomee/catalina/TomEEWebappClassLoader.java | 15 ++ .../JavaEEDefaultServerEnpointConfigurator.java | 166 ++++++++++++++++++- 5 files changed, 267 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
