TOMEE-2295 use single class imports
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/79c9dbb6 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/79c9dbb6 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/79c9dbb6 Branch: refs/heads/tomee-7.0.x Commit: 79c9dbb6b00dadfe1c26a69360676a4d5f88583a Parents: 87d837c Author: Jonathan Gallimore <[email protected]> Authored: Thu Nov 29 10:21:24 2018 +0000 Committer: Otavio Santana <[email protected]> Committed: Mon Dec 17 08:47:10 2018 -0200 ---------------------------------------------------------------------- .../org/apache/openejb/config/CmpJpaConversion.java | 16 +++++++++++++++- .../apache/openejb/core/LegacyInterfaceTest.java | 13 +++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/79c9dbb6/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java b/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java index eca9896..ffe065a 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java @@ -20,7 +20,21 @@ package org.apache.openejb.config; import org.apache.openejb.OpenEJBException; import org.apache.openejb.core.cmp.CmpUtil; import org.apache.openejb.core.cmp.jpa.JpaCmpEngine; -import org.apache.openejb.jee.*; +import org.apache.openejb.jee.CmpField; +import org.apache.openejb.jee.CmpVersion; +import org.apache.openejb.jee.EjbJar; +import org.apache.openejb.jee.EjbRelation; +import org.apache.openejb.jee.EjbRelationshipRole; +import org.apache.openejb.jee.EnterpriseBean; +import org.apache.openejb.jee.EntityBean; +import org.apache.openejb.jee.JaxbJavaee; +import org.apache.openejb.jee.Multiplicity; +import org.apache.openejb.jee.PersistenceContextRef; +import org.apache.openejb.jee.PersistenceType; +import org.apache.openejb.jee.Query; +import org.apache.openejb.jee.QueryMethod; +import org.apache.openejb.jee.RelationshipRoleSource; +import org.apache.openejb.jee.Relationships; import org.apache.openejb.jee.jpa.AttributeOverride; import org.apache.openejb.jee.jpa.Attributes; import org.apache.openejb.jee.jpa.Basic; http://git-wip-us.apache.org/repos/asf/tomee/blob/79c9dbb6/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java index 6f755c8..30b433f 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java @@ -35,7 +35,20 @@ import org.apache.openejb.jee.Query; import org.apache.openejb.jee.QueryMethod; import org.apache.openejb.jee.SingletonBean; import org.apache.openejb.jee.TransAttribute; +<<<<<<< HEAD import org.apache.openejb.jee.jpa.*; +======= +import org.apache.openejb.jee.jpa.Attributes; +import org.apache.openejb.jee.jpa.Basic; +import org.apache.openejb.jee.jpa.Column; +import org.apache.openejb.jee.jpa.Entity; +import org.apache.openejb.jee.jpa.EntityMappings; +import org.apache.openejb.jee.jpa.Id; +import org.apache.openejb.jee.jpa.NamedQuery; +import org.apache.openejb.jee.jpa.unit.Persistence; +import org.apache.openejb.jee.jpa.unit.PersistenceUnit; +import org.apache.openejb.jee.jpa.unit.TransactionType; +>>>>>>> c8a734467d... TOMEE-2295 use single class imports import org.junit.AfterClass; import javax.ejb.CreateException;
