You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2015/05/12 16:46:03 UTC
[6/8] tomee git commit: Merge branch 'master' into fb_tomee2_owb16
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/478671a4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/478671a4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/478671a4
Branch: refs/heads/fb_tomee2_owb16
Commit: 478671a4c92f0a6765a1e7cefefeb94ae1fe1aa6
Parents: a19d26e 515d875
Author: Mark Struberg <st...@apache.org>
Authored: Fri May 8 12:36:26 2015 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Fri May 8 12:36:26 2015 +0200
----------------------------------------------------------------------
.../jaxrs/context/EjbContextInjectionTest.java | 16 ++++++++---
.../EjbInterceptorContextInjectionTest.java | 13 ++++++++-
.../tests/jaxrs/suspended/SuspendedTest.java | 5 ++--
.../apache/openejb/config/DeploymentLoader.java | 28 ++++++++++++++++++--
.../maven/plugin/test/JAXRSReloadTest.java | 17 +++++++++---
pom.xml | 2 +-
.../apache/tomee/RemoteTomEEEJBContainerIT.java | 2 +-
.../org/apache/tomee/installer/Installer.java | 17 ++++++++++++
tomee/tomee-embedded/pom.xml | 28 ++++++++++++++++++++
.../java/org/apache/tomee/embedded/Main.java | 11 ++++++++
10 files changed, 126 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/478671a4/pom.xml
----------------------------------------------------------------------