From commits-return-45487-archive-asf-public=cust-asf.ponee.io@tomee.apache.org Wed Dec 19 22:53:33 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 5A7611807BC for ; Wed, 19 Dec 2018 22:53:30 +0100 (CET) Received: (qmail 89919 invoked by uid 500); 19 Dec 2018 21:53:29 -0000 Mailing-List: contact commits-help@tomee.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tomee.apache.org Delivered-To: mailing list commits@tomee.apache.org Received: (qmail 89602 invoked by uid 99); 19 Dec 2018 21:53:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2018 21:53:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 29893E148D; Wed, 19 Dec 2018 21:53:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jgallimore@apache.org To: commits@tomee.apache.org Date: Wed, 19 Dec 2018 21:53:45 -0000 Message-Id: <7cbcdf344e9c44ac91ab1b17b41ed558@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [19/26] tomee git commit: Adding further basic CMP tests Adding further basic CMP tests Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/29ab1f47 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/29ab1f47 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/29ab1f47 Branch: refs/heads/tomee-7.0.x Commit: 29ab1f47719b4f63f12ccbc8dcc5df81aeddd6ab Parents: fd73c7c Author: Jonathan Gallimore Authored: Fri Nov 16 15:06:17 2018 +0000 Committer: Otavio Santana Committed: Mon Dec 17 09:00:00 2018 -0200 ---------------------------------------------------------------------- .../openejb/arquillian/tests/cmp/MyCmpBean.java | 53 +++++++++++++++++++ .../arquillian/tests/cmp/MyLocalHome.java | 14 +++++ .../arquillian/tests/cmp/MyLocalObject.java | 7 +++ .../arquillian/tests/cmp/MyRemoteHome.java | 14 +++++ .../arquillian/tests/cmp/MyRemoteObject.java | 9 ++++ .../openejb/arquillian/tests/cmp/ejb-jar.xml | 54 ++++++++++++++++++++ .../arquillian/tests/cmp/openejb-cmp-orm.xml | 32 ++++++++++++ .../apache/openejb/config/ReadDescriptors.java | 3 +- .../openejb/config/ReadDescriptorsTest.java | 10 ++++ .../openejb/config/test-openejb-cmp-orm.xml | 32 ++++++++++++ 10 files changed, 227 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/29ab1f47/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyCmpBean.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyCmpBean.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyCmpBean.java new file mode 100644 index 0000000..20ecd76 --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyCmpBean.java @@ -0,0 +1,53 @@ +package org.apache.openejb.arquillian.tests.cmp; + +import javax.ejb.CreateException; +import javax.ejb.EntityBean; +import javax.ejb.EntityContext; +import javax.ejb.LocalHome; +import javax.ejb.RemoteHome; +import javax.ejb.RemoveException; + +@LocalHome(MyLocalHome.class) +@RemoteHome(MyRemoteHome.class) +public abstract class MyCmpBean implements EntityBean { + + // CMP + public abstract Integer getId(); + + public abstract void setId(Integer id); + + public abstract String getName(); + + public abstract void setName(String number); + + public void doit() { + } + + public Integer ejbCreateObject(final String id) throws CreateException { + return null; + } + + public void ejbPostCreateObject(final String id) { + } + + public void setEntityContext(final EntityContext ctx) { + } + + public void unsetEntityContext() { + } + + public void ejbActivate() { + } + + public void ejbPassivate() { + } + + public void ejbLoad() { + } + + public void ejbStore() { + } + + public void ejbRemove() throws RemoveException { + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/29ab1f47/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyLocalHome.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyLocalHome.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyLocalHome.java new file mode 100644 index 0000000..8eb489e --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyLocalHome.java @@ -0,0 +1,14 @@ +package org.apache.openejb.arquillian.tests.cmp; + +public interface MyLocalHome extends javax.ejb.EJBLocalHome { + + public MyLocalObject createObject(String name) + throws javax.ejb.CreateException; + + public MyLocalObject findByPrimaryKey(Integer primarykey) + throws javax.ejb.FinderException; + + public java.util.Collection findEmptyCollection() + throws javax.ejb.FinderException; + +} http://git-wip-us.apache.org/repos/asf/tomee/blob/29ab1f47/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyLocalObject.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyLocalObject.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyLocalObject.java new file mode 100644 index 0000000..c007571 --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyLocalObject.java @@ -0,0 +1,7 @@ +package org.apache.openejb.arquillian.tests.cmp; + +public interface MyLocalObject extends javax.ejb.EJBLocalObject { + + public void doit(); + +} http://git-wip-us.apache.org/repos/asf/tomee/blob/29ab1f47/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyRemoteHome.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyRemoteHome.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyRemoteHome.java new file mode 100644 index 0000000..9153ad6 --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyRemoteHome.java @@ -0,0 +1,14 @@ +package org.apache.openejb.arquillian.tests.cmp; + +public interface MyRemoteHome extends javax.ejb.EJBHome { + + public MyRemoteObject createObject(String name) + throws javax.ejb.CreateException, java.rmi.RemoteException; + + public MyRemoteObject findByPrimaryKey(Integer primarykey) + throws javax.ejb.FinderException, java.rmi.RemoteException; + + public java.util.Collection findEmptyCollection() + throws javax.ejb.FinderException, java.rmi.RemoteException; + +} http://git-wip-us.apache.org/repos/asf/tomee/blob/29ab1f47/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyRemoteObject.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyRemoteObject.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyRemoteObject.java new file mode 100644 index 0000000..c745289 --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/MyRemoteObject.java @@ -0,0 +1,9 @@ +package org.apache.openejb.arquillian.tests.cmp; + +import java.rmi.RemoteException; + +public interface MyRemoteObject extends javax.ejb.EJBObject { + + public void doit() throws RemoteException; + +} http://git-wip-us.apache.org/repos/asf/tomee/blob/29ab1f47/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/ejb-jar.xml ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/ejb-jar.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/ejb-jar.xml new file mode 100644 index 0000000..d9b2065 --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/ejb-jar.xml @@ -0,0 +1,54 @@ + + + + + + MyCmpBean + org.apache.openejb.arquillian.tests.cmp.MyCmpBean + Container + java.lang.Integer + false + + name + + id + + + findByPrimaryKey + + java.lang.Integer + + + SELECT OBJECT(DL) FROM License DL + + + + + + + MyCmpBean + * + + Supports + + + http://git-wip-us.apache.org/repos/asf/tomee/blob/29ab1f47/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/openejb-cmp-orm.xml ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/openejb-cmp-orm.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/openejb-cmp-orm.xml new file mode 100644 index 0000000..19cf79d --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/openejb-cmp-orm.xml @@ -0,0 +1,32 @@ + + + + + MyCmpBean + + SELECT OBJECT(DL) FROM License DL + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/29ab1f47/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java index b3942a0..683ca91 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java @@ -538,7 +538,8 @@ public class ReadDescriptors implements DynamicDeployer { return current; } - private void readCmpOrm(final EjbModule ejbModule) throws OpenEJBException { + // package scoped for testing + void readCmpOrm(final EjbModule ejbModule) throws OpenEJBException { final Object data = ejbModule.getAltDDs().get("openejb-cmp-orm.xml"); if (data != null && !(data instanceof EntityMappings)) { if (data instanceof URL) { http://git-wip-us.apache.org/repos/asf/tomee/blob/29ab1f47/container/openejb-core/src/test/java/org/apache/openejb/config/ReadDescriptorsTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/ReadDescriptorsTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/ReadDescriptorsTest.java index c8d029d..a46e9a9 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/config/ReadDescriptorsTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/config/ReadDescriptorsTest.java @@ -19,6 +19,8 @@ package org.apache.openejb.config; import org.apache.openejb.config.sys.Resource; import org.apache.openejb.config.sys.Resources; +import org.apache.openejb.jee.EjbJar; +import org.apache.openejb.jee.jpa.EntityMappings; import org.junit.Assert; import org.junit.Test; @@ -92,4 +94,12 @@ public class ReadDescriptorsTest { Assert.assertNull(res.getProperties().getProperty("InitializeAfterDeployment")); } + @Test + public void testReadCmpOrmDescriptor() throws Exception { + final EjbModule ejbModule = new EjbModule(new EjbJar()); + ejbModule.getAltDDs().put("openejb-cmp-orm.xml", getClass().getResource("test-openejb-cmp-orm.xml")); + new ReadDescriptors().readCmpOrm(ejbModule); + Assert.assertNotNull(ejbModule.getAltDDs().get("openejb-cmp-orm.xml")); + Assert.assertTrue(EntityMappings.class.isInstance(ejbModule.getAltDDs().get("openejb-cmp-orm.xml"))); + } } http://git-wip-us.apache.org/repos/asf/tomee/blob/29ab1f47/container/openejb-core/src/test/resources/org/apache/openejb/config/test-openejb-cmp-orm.xml ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/resources/org/apache/openejb/config/test-openejb-cmp-orm.xml b/container/openejb-core/src/test/resources/org/apache/openejb/config/test-openejb-cmp-orm.xml new file mode 100644 index 0000000..f26eb72 --- /dev/null +++ b/container/openejb-core/src/test/resources/org/apache/openejb/config/test-openejb-cmp-orm.xml @@ -0,0 +1,32 @@ + + + + + MyCmpBean + + SELECT OBJECT(DL) FROM License DL + + + + + + + + + \ No newline at end of file