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/06 11:14:06 UTC

[25/25] 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/85043a4b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/85043a4b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/85043a4b

Branch: refs/heads/fb_tomee2_owb16
Commit: 85043a4b1cf99208fe22304019a7364d4a09a7a4
Parents: 6e0ebe1 554ccb1
Author: Mark Struberg <st...@apache.org>
Authored: Wed May 6 11:12:59 2015 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed May 6 11:12:59 2015 +0200

----------------------------------------------------------------------
 .../openejb/config/DeploymentsResolver.java     | 22 +++++-
 .../src/main/resources/default.exclusions       |  1 +
 .../openejb/config/DeploymentsResolverTest.java | 72 ++++++++++++++++++++
 pom.xml                                         |  2 +-
 .../cxf/rs/AdvancedProviderConfigTest.java      | 14 ++--
 .../server/cxf/rs/CustomContextTest.java        | 15 ++--
 .../cxf/rs/CustomSecurityContextTest.java       | 26 +++++--
 .../rs/DynamicSubclassEjbDeploymentTest.java    |  9 +--
 .../server/cxf/rs/EjbDeploymentTest.java        |  9 +--
 .../openejb/server/cxf/rs/RsInjectionTest.java  | 15 ++--
 .../cxf/rs/RsInterceptorInjectionTest.java      |  9 ++-
 .../server/cxf/rs/RsWithInterfaceTest.java      | 12 +++-
 .../server/cxf/rs/SimpleApplicationTest.java    | 17 ++---
 .../SimpleApplicationWithLongMappingTest.java   | 11 +--
 ...icationWithLongMappingWithNoAppPathTest.java | 11 +--
 .../rs/SimpleApplicationWithMappingTest.java    | 11 +--
 .../openejb/server/cxf/rs/SingletonTest.java    |  5 +-
 .../openejb/server/cxf/rs/SubResourceTest.java  |  9 ++-
 server/openejb-cxf/pom.xml                      |  2 +-
 .../org/apache/tomee/embedded/Container.java    | 13 ++--
 20 files changed, 218 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/85043a4b/pom.xml
----------------------------------------------------------------------