Merge branch 'TOMEE-2330_tomee-7.1.x' of github.com:otaviojava/tomee into tomee-7.1.x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4adec2f8 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4adec2f8 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4adec2f8 Branch: refs/heads/tomee-7.1.x Commit: 4adec2f85e7937232ebde1dc426742a20e6884c9 Parents: 14cf776 02dce4c Author: Jonathan Gallimore <[email protected]> Authored: Wed Dec 19 21:54:54 2018 +0000 Committer: Jonathan Gallimore <[email protected]> Committed: Wed Dec 19 21:54:54 2018 +0000 ---------------------------------------------------------------------- .gitignore | 2 +- .../arquillian-tomee-webprofile-tests/pom.xml | 2 +- .../arquillian/tests/cmp/CmpMappingTest.java | 58 ++++ .../arquillian/tests/cmp/CmpServlet.java | 46 +++ .../openejb/arquillian/tests/cmp/MyCmpBean.java | 69 ++++ .../arquillian/tests/cmp/MyLocalHome.java | 30 ++ .../arquillian/tests/cmp/MyLocalObject.java | 23 ++ .../arquillian/tests/cmp/MyRemoteHome.java | 30 ++ .../arquillian/tests/cmp/MyRemoteObject.java | 25 ++ .../arquillian/tests/cmp/sample/ActorBean.java | 70 ++++ .../tests/cmp/sample/ActorDetails.java | 39 +++ .../tests/cmp/sample/CustomOrmXmlTest.java | 76 +++++ .../arquillian/tests/cmp/sample/LocalActor.java | 29 ++ .../tests/cmp/sample/LocalActorHome.java | 31 ++ .../arquillian/tests/cmp/sample/LocalMovie.java | 39 +++ .../tests/cmp/sample/LocalMovieHome.java | 33 ++ .../arquillian/tests/cmp/sample/MovieBean.java | 118 +++++++ .../tests/cmp/sample/MovieDetails.java | 45 +++ .../tests/cmp/sample/MoviesBusiness.java | 25 ++ .../tests/cmp/sample/MoviesBusinessBean.java | 80 +++++ .../tests/cmp/sample/MoviesBusinessHome.java | 27 ++ .../tests/cmp/sample/MoviesServlet.java | 91 +++++ .../src/test/resources/arquillian.xml | 2 + .../openejb/arquillian/tests/cmp/ejb-jar.xml | 54 +++ .../arquillian/tests/cmp/openejb-cmp-orm.xml | 32 ++ .../arquillian/tests/cmp/sample/custom-orm.xml | 54 +++ .../arquillian/tests/cmp/sample/ejb-jar.xml | 164 +++++++++ .../arquillian/tests/cmp/sample/openejb-jar.xml | 34 ++ .../arquillian/tests/cmp/sample/persistence.xml | 32 ++ .../openejb/arquillian/tests/cmp/sample/web.xml | 48 +++ .../apache/openejb/config/CmpJpaConversion.java | 118 +++++-- .../apache/openejb/config/ReadDescriptors.java | 5 +- .../src/main/resources/test-orm.xml | 32 ++ .../openejb/config/ReadDescriptorsTest.java | 10 + .../openejb/core/LegacyInterfaceTest.java | 147 ++++++++ .../core/webservices/JPACMDIntegrationTest.java | 341 +++++++++++++++++++ .../openejb/config/test-openejb-cmp-orm.xml | 32 ++ .../java/org/apache/openejb/jee/JaxbJavaee.java | 83 +++-- 38 files changed, 2112 insertions(+), 64 deletions(-) ----------------------------------------------------------------------
