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
The following commit(s) were added to refs/heads/master by this push:
new ef646f8 Rename file for custom-orm
ef646f8 is described below
commit ef646f8bf699a1aebb1011b34e2558f695af4b8e
Author: Jonathan Gallimore <[email protected]>
AuthorDate: Tue Jul 23 16:00:30 2019 +0100
Rename file for custom-orm
---
.../openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java | 2 +-
.../apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlEarTest.java | 2 +-
.../arquillian/tests/cmp/sample/CustomOrmXmlHibernateEarTest.java | 2 +-
.../openejb/arquillian/tests/cmp/sample/persistence-hibernate.xml | 2 +-
.../org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml | 2 +-
5 files changed, 5 insertions(+), 5 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 6aa5d6e..af88bd9 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/openejb-cmp-generated-orm.xml")
+ .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/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/CustomOrmXmlEarTest.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlEarTest.java
index 550f9ad..da042bc 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlEarTest.java
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlEarTest.java
@@ -51,7 +51,7 @@ public class CustomOrmXmlEarTest {
final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class,
"ejb-jar.jar")
.addClasses(ActorBean.class, MovieBean.class,
MovieDetails.class, MoviesBusinessBean.class)
- .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/custom-orm.xml"),
"META-INF/custom-orm.xml")
.addAsResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml"),
"META-INF/persistence.xml")
.addAsResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/openejb-jar.xml"),
"META-INF/openejb-jar.xml")
.addAsResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml"),
"META-INF/ejb-jar.xml");
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlHibernateEarTest.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlHibernateEarTest.java
index 2eb9302..c6a4b2b 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlHibernateEarTest.java
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlHibernateEarTest.java
@@ -53,7 +53,7 @@ public class CustomOrmXmlHibernateEarTest {
final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class,
"ejb-jar.jar")
.addClasses(ActorBean.class, MovieBean.class,
MovieDetails.class, MoviesBusinessBean.class)
- .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/custom-orm.xml"),
"META-INF/custom-orm.xml")
.addAsResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/persistence-hibernate.xml"),
"META-INF/persistence.xml")
.addAsResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/openejb-jar.xml"),
"META-INF/openejb-jar.xml")
.addAsResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml"),
"META-INF/ejb-jar.xml");
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence-hibernate.xml
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence-hibernate.xml
index e7a437a..6799035 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence-hibernate.xml
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence-hibernate.xml
@@ -21,7 +21,7 @@
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<jta-data-source>My DataSource</jta-data-source>
<non-jta-data-source>My Unmanaged DataSource</non-jta-data-source>
- <mapping-file>META-INF/openejb-cmp-generated-orm.xml</mapping-file>
+ <mapping-file>META-INF/custom-orm.xml</mapping-file>
<class>openejb.org.apache.openejb.arquillian.tests.cmp.sample.Movie</class>
<class>openejb.org.apache.openejb.arquillian.tests.cmp.sample.Actor</class>
<properties>
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml
index ce03420..b7aa872 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml
@@ -20,7 +20,7 @@
<persistence-unit name="cmp" transaction-type="JTA">
<jta-data-source>My DataSource</jta-data-source>
<non-jta-data-source>My Unmanaged DataSource</non-jta-data-source>
- <mapping-file>META-INF/openejb-cmp-generated-orm.xml</mapping-file>
+ <mapping-file>META-INF/custom-orm.xml</mapping-file>
<class>openejb.org.apache.openejb.arquillian.tests.cmp.sample.Movie</class>
<class>openejb.org.apache.openejb.arquillian.tests.cmp.sample.Actor</class>
<properties>
