[tomee] 04/06: Fix test failures for custom ORM with CMP

[jgallimore]

This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 864b6fa2b78bcdf4112ad4f94eaa6f223f3e13e2
Author: Jonathan Gallimore <j...@jrg.me.uk>
AuthorDate: Thu Jul 4 21:22:46 2019 +0100

    Fix test failures for custom ORM with CMP
---
 .../openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java       | 2 +-
 .../apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlTest.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java
 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java
index af88bd9..6aa5d6e 100644
--- 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java
+++ 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java
@@ -46,7 +46,7 @@ public class CustomOrmXmlCastTest {
                         LocalMovie.class, LocalMovieHome.class, 
MovieBean.class, MovieDetails.class,
                         MoviesBusiness.class, MoviesBusinessBean.class, 
MoviesBusinessHome.class, MoviesServlet.class,
                         MoviesServlet2.class)
-                .addAsResource(new 
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/custom-orm.xml"),
 "META-INF/custom-orm.xml")
+                .addAsResource(new 
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/custom-orm.xml"),
 "META-INF/openejb-cmp-generated-orm.xml")
                 .addAsResource(new 
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml"),
 "META-INF/persistence.xml")
                 .addAsWebInfResource(new 
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/openejb-jar.xml"),
 "openejb-jar.xml")
                 .addAsWebInfResource(new 
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml"), 
"ejb-jar.xml")
diff --git 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlTest.java
 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlTest.java
index d48d27e..97bb17d 100644
--- 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlTest.java
+++ 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlTest.java
@@ -46,7 +46,7 @@ public class CustomOrmXmlTest {
                         LocalMovie.class, LocalMovieHome.class, 
MovieBean.class, MovieDetails.class,
                         MoviesBusiness.class, MoviesBusinessBean.class, 
MoviesBusinessHome.class,
                         MoviesServlet.class)
-                .addAsResource(new 
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/custom-orm.xml"),
 "META-INF/custom-orm.xml")
+                .addAsResource(new 
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/custom-orm.xml"),
 "META-INF/openejb-cmp-generated-orm.xml")
                 .addAsResource(new 
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml"),
 "META-INF/persistence.xml")
                 .addAsWebInfResource(new 
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/openejb-jar.xml"),
 "openejb-jar.xml")
                 .addAsWebInfResource(new 
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml"), 
"ejb-jar.xml")