This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-7.1.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-7.1.x by this push:
new 9e2c27e Changes missed on previous commit
9e2c27e is described below
commit 9e2c27e0f3ab99481102987bcb85938cd0712a3f
Author: Jonathan Gallimore <j...@jrg.me.uk>
AuthorDate: Wed Jul 24 16:17:35 2019 +0100
Changes missed on previous commit
---
.../arquillian/tests/cmp/sample/custom-orm.xml | 6 +--
.../arquillian/tests/cmp/sample/ejb-jar.xml | 52 +++++++++----------
.../openejb/arquillian/tests/cmp/sample/web.xml | 4 +-
arquillian/arquillian-tomee-tests/pom.xml | 58 ++++++++++++++++++++++
4 files changed, 89 insertions(+), 31 deletions(-)
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/custom-orm.xml
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/custom-orm.xml
index 22dbae5..2605550 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/custom-orm.xml
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/custom-orm.xml
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm";
version="1.0">
+<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm";
version="2.0">
<entity
class="openejb.org.apache.openejb.arquillian.tests.cmp.sample.Movie"
name="Movie">
<description>CustomOrmXmlTest#MovieBean</description>
<table/>
@@ -31,7 +31,7 @@
<column name="movie_name" length="250"/>
</basic>
<basic name="genre"/>
- <many-to-many mapped-by="movies" name="actors"/>
+ <many-to-many mapped-by="movies" name="actors"
target-entity="openejb.org.apache.openejb.arquillian.tests.cmp.sample.Actor"
access="FIELD"/>
</attributes>
</entity>
<entity
class="openejb.org.apache.openejb.arquillian.tests.cmp.sample.Actor"
name="Actor">
@@ -47,7 +47,7 @@
<basic name="name">
<column name="actor_name" length="250"/>
</basic>
- <many-to-many name="movies"/>
+ <many-to-many name="movies"
target-entity="openejb.org.apache.openejb.arquillian.tests.cmp.sample.Movie"
access="FIELD"/>
</attributes>
</entity>
</entity-mappings>
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml
index 8b39053..9e32d43 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml
@@ -21,31 +21,31 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd";>
<display-name>RosterJAR</display-name>
<enterprise-beans>
- <session>
- <ejb-name>RosterBean</ejb-name>
-
<home>org.apache.openejb.arquillian.tests.cmp.sample.MoviesBusinessHome</home>
-
<remote>org.apache.openejb.arquillian.tests.cmp.sample.MoviesBusiness</remote>
-
<ejb-class>org.apache.openejb.arquillian.tests.cmp.sample.MoviesBusinessBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <ejb-local-ref>
- <ejb-ref-name>ejb/Actor</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
-
<local-home>org.apache.openejb.arquillian.tests.cmp.sample.LocalActorHome</local-home>
-
<local>org.apache.openejb.arquillian.tests.cmp.sample.LocalActor</local>
- <ejb-link>ActorBean</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <ejb-ref-name>ejb/Movie</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
-
<local-home>org.apache.openejb.arquillian.tests.cmp.sample.LocalMovieHome</local-home>
-
<local>org.apache.openejb.arquillian.tests.cmp.sample.LocalMovie</local>
- <ejb-link>MovieBean</ejb-link>
- </ejb-local-ref>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
+ <session>
+ <ejb-name>MoviesBean</ejb-name>
+
<home>org.apache.openejb.arquillian.tests.cmp.sample.MoviesBusinessHome</home>
+
<remote>org.apache.openejb.arquillian.tests.cmp.sample.MoviesBusiness</remote>
+
<ejb-class>org.apache.openejb.arquillian.tests.cmp.sample.MoviesBusinessBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/Actor</ejb-ref-name>
+ <ejb-ref-type>Entity</ejb-ref-type>
+
<local-home>org.apache.openejb.arquillian.tests.cmp.sample.LocalActorHome</local-home>
+ <local>org.apache.openejb.arquillian.tests.cmp.sample.LocalActor</local>
+ <ejb-link>ActorBean</ejb-link>
+ </ejb-local-ref>
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/Movie</ejb-ref-name>
+ <ejb-ref-type>Entity</ejb-ref-type>
+
<local-home>org.apache.openejb.arquillian.tests.cmp.sample.LocalMovieHome</local-home>
+ <local>org.apache.openejb.arquillian.tests.cmp.sample.LocalMovie</local>
+ <ejb-link>MovieBean</ejb-link>
+ </ejb-local-ref>
+ <security-identity>
+ <use-caller-identity/>
+ </security-identity>
+ </session>
<entity>
<ejb-name>MovieBean</ejb-name>
<local-home>org.apache.openejb.arquillian.tests.cmp.sample.LocalMovieHome</local-home>
@@ -138,7 +138,7 @@
<assembly-descriptor>
<container-transaction>
<method>
- <ejb-name>RosterBean</ejb-name>
+ <ejb-name>MoviesBean</ejb-name>
<method-intf>Remote</method-intf>
<method-name>*</method-name>
</method>
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/web.xml
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/web.xml
index 68cbacb..03de133 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/web.xml
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/web.xml
@@ -24,12 +24,12 @@
id="WebApp_ID" version="2.5">
<servlet>
- <servlet-name>RosterServlet</servlet-name>
+ <servlet-name>MoviesServlet</servlet-name>
<servlet-class>org.apache.openejb.arquillian.tests.cmp.sample.MoviesServlet</servlet-class>
</servlet>
<servlet-mapping>
- <servlet-name>RosterServlet</servlet-name>
+ <servlet-name>MoviesServlet</servlet-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>
diff --git a/arquillian/arquillian-tomee-tests/pom.xml
b/arquillian/arquillian-tomee-tests/pom.xml
index ba7107e..930dc9a 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -121,6 +121,64 @@
<version>${project.version}</version>
</dependency>
+
+ <!-- for tests with Hibernate -->
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>4.3.9.Final</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>4.3.9.Final</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.common</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>4.0.5.Final</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.7</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jandex</artifactId>
+ <version>1.1.0.Final</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.1.3.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ <version>1.2.0.Beta1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.18.1-GA</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- just to get it in the correct order -->
<dependency>
<groupId>${project.groupId}</groupId>
