TOMEE-2295 attempting something else
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/addc3ce1 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/addc3ce1 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/addc3ce1 Branch: refs/heads/tomee-7.1.x Commit: addc3ce1c85882220ab7f0a4217c6990453f8f37 Parents: f3406e0 Author: Jonathan Gallimore <[email protected]> Authored: Tue Dec 4 14:45:20 2018 +0000 Committer: Otavio Santana <[email protected]> Committed: Mon Dec 17 13:58:00 2018 -0200 ---------------------------------------------------------------------- .../arquillian/tests/cmp/sample/Actor.java | 35 ----------- .../arquillian/tests/cmp/sample/ActorBean.java | 45 -------------- .../tests/cmp/sample/ActorLocalHome.java | 34 ----------- .../tests/cmp/sample/CustomOrmXmlTest.java | 2 +- .../tests/cmp/sample/MovieServlet.java | 4 +- .../tests/cmp/sample/MoviesBusinessBean.java | 9 +-- .../tests/cmp/sample/MoviesBusinessLocal.java | 2 +- .../arquillian/tests/cmp/sample/Person.java | 32 ++++++++++ .../arquillian/tests/cmp/sample/PersonBean.java | 64 ++++++++++++++++++++ .../tests/cmp/sample/PersonLocalHome.java | 34 +++++++++++ .../arquillian/tests/cmp/sample/ejb-jar.xml | 27 ++++----- .../arquillian/tests/cmp/sample/openejb-jar.xml | 8 +-- 12 files changed, 152 insertions(+), 144 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/addc3ce1/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/Actor.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/Actor.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/Actor.java deleted file mode 100644 index 739b53c..0000000 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/Actor.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.openejb.arquillian.tests.cmp.sample; - -/** - * @version $Revision$ $Date$ - */ -public interface Actor extends javax.ejb.EJBLocalObject { - - Integer getId(); - - void setId(Integer id); - - String getFirstname(); - - void setFirstname(String firstname); - - String getLastname(); - - void setLastname(String lastname); -} http://git-wip-us.apache.org/repos/asf/tomee/blob/addc3ce1/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/ActorBean.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/ActorBean.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/ActorBean.java deleted file mode 100644 index 3ac4087..0000000 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/ActorBean.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.openejb.arquillian.tests.cmp.sample; - -import javax.ejb.EntityBean; - -public abstract class ActorBean implements EntityBean { - - public ActorBean() { - } - - public Integer ejbCreate(final String firstName, final String lastName) { - this.setFirstname(firstName); - this.setLastname(lastName); - return null; - } - - public abstract Integer getId(); - - public abstract void setId(Integer id); - - public abstract String getFirstname(); - - public abstract void setFirstname(String firstname); - - public abstract String getLastname(); - - public abstract void setLastname(String lastname); - - -} http://git-wip-us.apache.org/repos/asf/tomee/blob/addc3ce1/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/ActorLocalHome.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/ActorLocalHome.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/ActorLocalHome.java deleted file mode 100644 index 9878d6f..0000000 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/ActorLocalHome.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.openejb.arquillian.tests.cmp.sample; - -import javax.ejb.CreateException; -import javax.ejb.FinderException; -import java.util.Collection; - -/** - * @version $Revision$ $Date$ - */ -interface ActorLocalHome extends javax.ejb.EJBLocalHome { - - Actor create(String firstName, String lastName) throws CreateException; - - Actor findByPrimaryKey(Integer primarykey) throws FinderException; - - Collection findAll() throws FinderException; - -} http://git-wip-us.apache.org/repos/asf/tomee/blob/addc3ce1/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlTest.java ---------------------------------------------------------------------- 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 7a706f3..2a96925 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 @@ -43,7 +43,7 @@ public class CustomOrmXmlTest { public static WebArchive createDeployment() { WebArchive archive = ShrinkWrap.create(WebArchive.class, CustomOrmXmlTest.class.getSimpleName() + ".war") .addClasses(MovieServlet.class, MovieException.class, MoviesBusinessBean.class, - MoviesBusinessLocal.class, MoviesBusinessLocalHome.class, ActorBean.class, ActorLocalHome.class, Actor.class) + MoviesBusinessLocal.class, MoviesBusinessLocalHome.class, PersonBean.class, PersonLocalHome.class, Person.class) .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") .addAsWebInfResource(new ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/web.xml"), "web.xml"); http://git-wip-us.apache.org/repos/asf/tomee/blob/addc3ce1/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MovieServlet.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MovieServlet.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MovieServlet.java index 730e78d..213439b 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MovieServlet.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MovieServlet.java @@ -52,8 +52,8 @@ public class MovieServlet extends HttpServlet { final MoviesBusinessLocal bean = home.create(); - bean.addActor("Will", "Smith"); - pw.println("Actor added successfully"); + bean.addActor("Will Smith"); + pw.println("Person added successfully"); bean.remove(); pw.flush(); http://git-wip-us.apache.org/repos/asf/tomee/blob/addc3ce1/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MoviesBusinessBean.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MoviesBusinessBean.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MoviesBusinessBean.java index 3baa70a..0f6cced 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MoviesBusinessBean.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MoviesBusinessBean.java @@ -45,16 +45,17 @@ public class MoviesBusinessBean implements SessionBean { this.ctx = ctx; } - public void addActor(final String firstName, final String lastName) throws MovieException { + public void addActor(final String name) throws MovieException { try { final InitialContext context = new InitialContext(); - final ActorLocalHome actorLocalHome = (ActorLocalHome) - PortableRemoteObject.narrow(context.lookup("java:comp/env/ejb/ActorBean"), ActorLocalHome.class); + final PersonLocalHome personLocalHome = (PersonLocalHome) + PortableRemoteObject.narrow(context.lookup("java:comp/env/ejb/PersonBean"), PersonLocalHome.class); - final Actor actor = actorLocalHome.create(firstName, lastName); + final Person person = personLocalHome.create(name); } catch (NamingException | CreateException e) { throw new MovieException(e); } } + } http://git-wip-us.apache.org/repos/asf/tomee/blob/addc3ce1/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MoviesBusinessLocal.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MoviesBusinessLocal.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MoviesBusinessLocal.java index a924686..3e458a7 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MoviesBusinessLocal.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/MoviesBusinessLocal.java @@ -20,5 +20,5 @@ import java.rmi.RemoteException; public interface MoviesBusinessLocal extends javax.ejb.EJBLocalObject { - int addActor(final String firstName, final String lastName) throws RemoteException, MovieException; + int addActor(final String name) throws RemoteException, MovieException; } http://git-wip-us.apache.org/repos/asf/tomee/blob/addc3ce1/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/Person.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/Person.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/Person.java new file mode 100644 index 0000000..31aeb87 --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/Person.java @@ -0,0 +1,32 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * <p/> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p/> + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.openejb.arquillian.tests.cmp.sample; + +/** + * @version $Revision$ $Date$ + */ +public interface Person extends javax.ejb.EJBLocalObject { + + Integer getId(); + + void setId(Integer id); + + String getName(); + + void setName(String name); + +} http://git-wip-us.apache.org/repos/asf/tomee/blob/addc3ce1/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/PersonBean.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/PersonBean.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/PersonBean.java new file mode 100644 index 0000000..39c0ef4 --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/PersonBean.java @@ -0,0 +1,64 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * <p/> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p/> + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.openejb.arquillian.tests.cmp.sample; + +import javax.ejb.CreateException; +import javax.ejb.EntityBean; +import javax.ejb.EntityContext; + +public abstract class PersonBean implements EntityBean { + + public PersonBean() { + } + + public Integer ejbCreate(final String name) { + this.setName(name); + return null; + } + + public abstract Integer getId(); + + public abstract void setId(Integer id); + + public abstract String getName(); + + public abstract void setName(String name); + + public void ejbPostCreate(String name) throws CreateException { + } + + public void setEntityContext(EntityContext ctx) { + } + + public void unsetEntityContext() { + } + + public void ejbRemove() { + } + + public void ejbLoad() { + } + + public void ejbStore() { + } + + public void ejbPassivate() { + } + + public void ejbActivate() { + } +} http://git-wip-us.apache.org/repos/asf/tomee/blob/addc3ce1/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/PersonLocalHome.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/PersonLocalHome.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/PersonLocalHome.java new file mode 100644 index 0000000..c35a0ae --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/PersonLocalHome.java @@ -0,0 +1,34 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * <p/> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p/> + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.openejb.arquillian.tests.cmp.sample; + +import javax.ejb.CreateException; +import javax.ejb.FinderException; +import java.util.Collection; + +/** + * @version $Revision$ $Date$ + */ +interface PersonLocalHome extends javax.ejb.EJBLocalHome { + + Person create(String name) throws CreateException; + + Person findByPrimaryKey(Integer primarykey) throws FinderException; + + Collection findAll() throws FinderException; + +} http://git-wip-us.apache.org/repos/asf/tomee/blob/addc3ce1/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml ---------------------------------------------------------------------- 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 556dfc3..c5af41d 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 @@ -33,31 +33,28 @@ <session-type>Stateless</session-type> <transaction-type>Container</transaction-type> <ejb-local-ref> - <ejb-ref-name>ejb/ActorBean</ejb-ref-name> + <ejb-ref-name>ejb/PersonBean</ejb-ref-name> <ejb-ref-type>Entity</ejb-ref-type> - <local-home>org.apache.openejb.arquillian.tests.cmp.sample.ActorLocalHome</local-home> - <local>org.apache.openejb.arquillian.tests.cmp.sample.Actor</local> - <ejb-link>ActorBean</ejb-link> + <local-home>org.apache.openejb.arquillian.tests.cmp.sample.PersonLocalHome</local-home> + <local>org.apache.openejb.arquillian.tests.cmp.sample.Person</local> + <ejb-link>PersonBean</ejb-link> </ejb-local-ref> </session> <entity> - <ejb-name>ActorBean</ejb-name> - <local-home>org.apache.openejb.arquillian.tests.cmp.sample.ActorLocalHome</local-home> - <local>org.apache.openejb.arquillian.tests.cmp.sample.Actor</local> - <ejb-class>org.apache.openejb.arquillian.tests.cmp.sample.ActorBean</ejb-class> + <ejb-name>PersonBean</ejb-name> + <local-home>org.apache.openejb.arquillian.tests.cmp.sample.PersonLocalHome</local-home> + <local>org.apache.openejb.arquillian.tests.cmp.sample.Person</local> + <ejb-class>org.apache.openejb.arquillian.tests.cmp.sample.PersonBean</ejb-class> <persistence-type>Container</persistence-type> <prim-key-class>java.lang.Integer</prim-key-class> <reentrant>false</reentrant> <cmp-version>2.x</cmp-version> - <abstract-schema-name>ActorBean</abstract-schema-name> + <abstract-schema-name>PersonBean</abstract-schema-name> <cmp-field> <field-name>id</field-name> </cmp-field> <cmp-field> - <field-name>firstname</field-name> - </cmp-field> - <cmp-field> - <field-name>lastname</field-name> + <field-name>name</field-name> </cmp-field> <primkey-field>id</primkey-field> <query> @@ -65,7 +62,7 @@ <method-name>findAll</method-name> <method-params/> </query-method> - <ejb-ql>SELECT a FROM ActorBean as a</ejb-ql> + <ejb-ql>SELECT p FROM PersonBean as p</ejb-ql> </query> </entity> </enterprise-beans> @@ -79,7 +76,7 @@ </container-transaction> <container-transaction> <method> - <ejb-name>ActorBean</ejb-name> + <ejb-name>PersonBean</ejb-name> <method-name>*</method-name> </method> <trans-attribute>Supports</trans-attribute> http://git-wip-us.apache.org/repos/asf/tomee/blob/addc3ce1/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/openejb-jar.xml ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/openejb-jar.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/openejb-jar.xml index e01a3de..1de720e 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/openejb-jar.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/openejb-jar.xml @@ -2,13 +2,7 @@ <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1";> <enterprise-beans> <entity> - <ejb-name>MovieBean</ejb-name> - <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen-2.1";> - <uuid/> - </key-generator> - </entity> - <entity> - <ejb-name>ActorBean</ejb-name> + <ejb-name>PersonBean</ejb-name> <key-generator xmlns="http://www.openejb.org/xml/ns/pkgen-2.1";> <uuid/> </key-generator>
