From 5e7b730f09428318ff6cf99796a19d10fdc52305 Mon Sep 17 00:00:00 2001 From: Hardy Ferentschik Date: Wed, 13 Jul 2011 16:35:00 +0200 Subject: [PATCH] HHH-6371 changing the import statements in the annotation xml processing to use org.hibernate.metamodel.source.annotation.jaxb instad of org.hibernate.metamodel.source.annotation.xml --- .../AnnotationsSourceProcessor.java | 2 +- .../xml/mocker/AbstractAttributesBuilder.java | 26 +++++++-------- .../mocker/AbstractEntityObjectMocker.java | 22 ++++++------- .../xml/mocker/AbstractMocker.java | 4 +-- .../annotations/xml/mocker/AccessHelper.java | 2 +- .../xml/mocker/AnnotationMocker.java | 22 ++++++------- .../xml/mocker/AttributesBuilder.java | 26 +++++++-------- .../annotations/xml/mocker/BasicMocker.java | 4 +-- .../mocker/DefaultConfigurationHelper.java | 8 ++--- .../xml/mocker/ElementCollectionMocker.java | 4 +-- .../mocker/EmbeddableAttributesBuilder.java | 26 +++++++-------- .../xml/mocker/EmbeddableMocker.java | 24 +++++++------- .../xml/mocker/EmbeddedIdMocker.java | 4 +-- .../xml/mocker/EmbeddedMocker.java | 4 +-- .../xml/mocker/EntityMappingsMocker.java | 14 ++++---- .../annotations/xml/mocker/EntityMocker.java | 32 +++++++++---------- .../xml/mocker/GlobalAnnotationMocker.java | 18 +++++------ .../xml/mocker/GlobalAnnotations.java | 18 +++++------ .../annotations/xml/mocker/IdMocker.java | 6 ++-- .../xml/mocker/ListenerMocker.java | 18 +++++------ .../xml/mocker/ManyToManyMocker.java | 4 +-- .../xml/mocker/ManyToOneMocker.java | 4 +-- .../xml/mocker/MappedSuperclassMocker.java | 24 +++++++------- .../annotations/xml/mocker/MockHelper.java | 2 +- .../xml/mocker/OneToManyMocker.java | 4 +-- .../xml/mocker/OneToOneMocker.java | 4 +-- .../xml/mocker/PersistenceMetadataMocker.java | 2 +- .../xml/mocker/PropertyMocker.java | 14 ++++---- .../annotations/xml/mocker/SchemaAware.java | 8 ++--- .../xml/mocker/TransientMocker.java | 4 +-- .../annotations/xml/mocker/VersionMocker.java | 4 +-- .../metamodel/source/internal/JaxbHelper.java | 2 +- .../xml/mocker/AbstractMockerTest.java | 2 +- .../xml/mocker/BasicMockerTest.java | 8 ++--- .../DefaultConfigurationHelperTest.java | 2 +- .../annotations/xml/mocker/OverrideTest.java | 2 +- 36 files changed, 187 insertions(+), 187 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationsSourceProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationsSourceProcessor.java index 043cec65a6..1145302da6 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationsSourceProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationsSourceProcessor.java @@ -66,7 +66,7 @@ import org.hibernate.metamodel.domain.Hierarchical; import org.hibernate.metamodel.domain.Type; import org.hibernate.metamodel.domain.NonEntity; import org.hibernate.metamodel.domain.Superclass; -import org.hibernate.metamodel.source.annotation.xml.XMLEntityMappings; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntityMappings; import org.hibernate.metamodel.source.annotations.entity.EntityClass; import org.hibernate.service.ServiceRegistry; import org.hibernate.service.classloading.spi.ClassLoaderService; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractAttributesBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractAttributesBuilder.java index 81e26a2220..4efcf41c23 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractAttributesBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractAttributesBuilder.java @@ -27,21 +27,21 @@ import java.util.List; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.source.annotation.xml.XMLBasic; -import org.hibernate.metamodel.source.annotation.xml.XMLElementCollection; -import org.hibernate.metamodel.source.annotation.xml.XMLEmbedded; -import org.hibernate.metamodel.source.annotation.xml.XMLEmbeddedId; -import org.hibernate.metamodel.source.annotation.xml.XMLId; -import org.hibernate.metamodel.source.annotation.xml.XMLManyToMany; -import org.hibernate.metamodel.source.annotation.xml.XMLManyToOne; -import org.hibernate.metamodel.source.annotation.xml.XMLOneToMany; -import org.hibernate.metamodel.source.annotation.xml.XMLOneToOne; -import org.hibernate.metamodel.source.annotation.xml.XMLTransient; -import org.hibernate.metamodel.source.annotation.xml.XMLVersion; +import org.hibernate.metamodel.source.annotation.jaxb.XMLBasic; +import org.hibernate.metamodel.source.annotation.jaxb.XMLElementCollection; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEmbedded; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEmbeddedId; +import org.hibernate.metamodel.source.annotation.jaxb.XMLId; +import org.hibernate.metamodel.source.annotation.jaxb.XMLManyToMany; +import org.hibernate.metamodel.source.annotation.jaxb.XMLManyToOne; +import org.hibernate.metamodel.source.annotation.jaxb.XMLOneToMany; +import org.hibernate.metamodel.source.annotation.jaxb.XMLOneToOne; +import org.hibernate.metamodel.source.annotation.jaxb.XMLTransient; +import org.hibernate.metamodel.source.annotation.jaxb.XMLVersion; /** - * Abstract Parser to handle {@link org.hibernate.metamodel.source.annotation.xml.XMLAttributes XMLAttributes} - * and {@link org.hibernate.metamodel.source.annotation.xml.XMLEmbeddableAttributes XMLEmbeddableAttributes}. + * Abstract Parser to handle {@link org.hibernate.metamodel.source.annotation.jaxb.XMLAttributes XMLAttributes} + * and {@link org.hibernate.metamodel.source.annotation.jaxb.XMLEmbeddableAttributes XMLEmbeddableAttributes}. * * It would be really helpful if these two classes can implement an interface with those abstract methods in this class. * diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractEntityObjectMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractEntityObjectMocker.java index ada9a6efa0..d479bc8ad3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractEntityObjectMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractEntityObjectMocker.java @@ -29,17 +29,17 @@ import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.hibernate.AssertionFailure; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLAttributes; -import org.hibernate.metamodel.source.annotation.xml.XMLEntityListeners; -import org.hibernate.metamodel.source.annotation.xml.XMLIdClass; -import org.hibernate.metamodel.source.annotation.xml.XMLPostLoad; -import org.hibernate.metamodel.source.annotation.xml.XMLPostPersist; -import org.hibernate.metamodel.source.annotation.xml.XMLPostRemove; -import org.hibernate.metamodel.source.annotation.xml.XMLPostUpdate; -import org.hibernate.metamodel.source.annotation.xml.XMLPrePersist; -import org.hibernate.metamodel.source.annotation.xml.XMLPreRemove; -import org.hibernate.metamodel.source.annotation.xml.XMLPreUpdate; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAttributes; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntityListeners; +import org.hibernate.metamodel.source.annotation.jaxb.XMLIdClass; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostLoad; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostPersist; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostRemove; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostUpdate; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPrePersist; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPreRemove; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPreUpdate; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMocker.java index 30b645aa4a..4d91c50663 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMocker.java @@ -31,8 +31,8 @@ import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.DotName; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLUniqueConstraint; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLUniqueConstraint; import org.hibernate.metamodel.source.annotations.JPADotNames; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AccessHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AccessHelper.java index 33ea7b5943..9bd9289ec4 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AccessHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AccessHelper.java @@ -38,7 +38,7 @@ import org.hibernate.MappingException; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.metamodel.source.annotations.JandexHelper; import org.hibernate.metamodel.source.annotations.xml.PseudoJpaDotNames; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; import org.hibernate.metamodel.source.annotations.JPADotNames; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AnnotationMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AnnotationMocker.java index 4be7b035bd..ecccf5151f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AnnotationMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AnnotationMocker.java @@ -35,17 +35,17 @@ import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.DotName; import org.hibernate.AssertionFailure; -import org.hibernate.metamodel.source.annotation.xml.XMLAssociationOverride; -import org.hibernate.metamodel.source.annotation.xml.XMLAttributeOverride; -import org.hibernate.metamodel.source.annotation.xml.XMLCollectionTable; -import org.hibernate.metamodel.source.annotation.xml.XMLColumn; -import org.hibernate.metamodel.source.annotation.xml.XMLEnumType; -import org.hibernate.metamodel.source.annotation.xml.XMLJoinColumn; -import org.hibernate.metamodel.source.annotation.xml.XMLJoinTable; -import org.hibernate.metamodel.source.annotation.xml.XMLLob; -import org.hibernate.metamodel.source.annotation.xml.XMLOrderColumn; -import org.hibernate.metamodel.source.annotation.xml.XMLPrimaryKeyJoinColumn; -import org.hibernate.metamodel.source.annotation.xml.XMLTemporalType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAssociationOverride; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAttributeOverride; +import org.hibernate.metamodel.source.annotation.jaxb.XMLCollectionTable; +import org.hibernate.metamodel.source.annotation.jaxb.XMLColumn; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEnumType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLJoinColumn; +import org.hibernate.metamodel.source.annotation.jaxb.XMLJoinTable; +import org.hibernate.metamodel.source.annotation.jaxb.XMLLob; +import org.hibernate.metamodel.source.annotation.jaxb.XMLOrderColumn; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPrimaryKeyJoinColumn; +import org.hibernate.metamodel.source.annotation.jaxb.XMLTemporalType; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AttributesBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AttributesBuilder.java index fb20f550c2..13fc86e9f0 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AttributesBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AttributesBuilder.java @@ -27,19 +27,19 @@ import java.util.List; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLAttributes; -import org.hibernate.metamodel.source.annotation.xml.XMLBasic; -import org.hibernate.metamodel.source.annotation.xml.XMLElementCollection; -import org.hibernate.metamodel.source.annotation.xml.XMLEmbedded; -import org.hibernate.metamodel.source.annotation.xml.XMLEmbeddedId; -import org.hibernate.metamodel.source.annotation.xml.XMLId; -import org.hibernate.metamodel.source.annotation.xml.XMLManyToMany; -import org.hibernate.metamodel.source.annotation.xml.XMLManyToOne; -import org.hibernate.metamodel.source.annotation.xml.XMLOneToMany; -import org.hibernate.metamodel.source.annotation.xml.XMLOneToOne; -import org.hibernate.metamodel.source.annotation.xml.XMLTransient; -import org.hibernate.metamodel.source.annotation.xml.XMLVersion; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAttributes; +import org.hibernate.metamodel.source.annotation.jaxb.XMLBasic; +import org.hibernate.metamodel.source.annotation.jaxb.XMLElementCollection; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEmbedded; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEmbeddedId; +import org.hibernate.metamodel.source.annotation.jaxb.XMLId; +import org.hibernate.metamodel.source.annotation.jaxb.XMLManyToMany; +import org.hibernate.metamodel.source.annotation.jaxb.XMLManyToOne; +import org.hibernate.metamodel.source.annotation.jaxb.XMLOneToMany; +import org.hibernate.metamodel.source.annotation.jaxb.XMLOneToOne; +import org.hibernate.metamodel.source.annotation.jaxb.XMLTransient; +import org.hibernate.metamodel.source.annotation.jaxb.XMLVersion; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/BasicMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/BasicMocker.java index 0332d9eee8..f8b556df38 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/BasicMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/BasicMocker.java @@ -29,8 +29,8 @@ import java.util.List; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLBasic; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLBasic; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/DefaultConfigurationHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/DefaultConfigurationHelper.java index 6f08c05be2..77af5a6847 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/DefaultConfigurationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/DefaultConfigurationHelper.java @@ -37,10 +37,10 @@ import org.hibernate.internal.util.StringHelper; import org.hibernate.metamodel.source.annotations.JPADotNames; import org.hibernate.metamodel.source.annotations.JandexHelper; import org.hibernate.metamodel.source.annotations.xml.filter.IndexedAnnotationFilter; -import org.hibernate.metamodel.source.annotation.xml.XMLEmbeddable; -import org.hibernate.metamodel.source.annotation.xml.XMLEntity; -import org.hibernate.metamodel.source.annotation.xml.XMLMappedSuperclass; -import org.hibernate.metamodel.source.annotation.xml.XMLTable; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEmbeddable; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntity; +import org.hibernate.metamodel.source.annotation.jaxb.XMLMappedSuperclass; +import org.hibernate.metamodel.source.annotation.jaxb.XMLTable; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ElementCollectionMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ElementCollectionMocker.java index 95540ba0ee..84c25a00cf 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ElementCollectionMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ElementCollectionMocker.java @@ -29,8 +29,8 @@ import java.util.List; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLElementCollection; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLElementCollection; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddableAttributesBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddableAttributesBuilder.java index 7b8274448e..ee10cd8a94 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddableAttributesBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddableAttributesBuilder.java @@ -28,19 +28,19 @@ import java.util.List; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLBasic; -import org.hibernate.metamodel.source.annotation.xml.XMLElementCollection; -import org.hibernate.metamodel.source.annotation.xml.XMLEmbeddableAttributes; -import org.hibernate.metamodel.source.annotation.xml.XMLEmbedded; -import org.hibernate.metamodel.source.annotation.xml.XMLEmbeddedId; -import org.hibernate.metamodel.source.annotation.xml.XMLId; -import org.hibernate.metamodel.source.annotation.xml.XMLManyToMany; -import org.hibernate.metamodel.source.annotation.xml.XMLManyToOne; -import org.hibernate.metamodel.source.annotation.xml.XMLOneToMany; -import org.hibernate.metamodel.source.annotation.xml.XMLOneToOne; -import org.hibernate.metamodel.source.annotation.xml.XMLTransient; -import org.hibernate.metamodel.source.annotation.xml.XMLVersion; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLBasic; +import org.hibernate.metamodel.source.annotation.jaxb.XMLElementCollection; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEmbeddableAttributes; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEmbedded; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEmbeddedId; +import org.hibernate.metamodel.source.annotation.jaxb.XMLId; +import org.hibernate.metamodel.source.annotation.jaxb.XMLManyToMany; +import org.hibernate.metamodel.source.annotation.jaxb.XMLManyToOne; +import org.hibernate.metamodel.source.annotation.jaxb.XMLOneToMany; +import org.hibernate.metamodel.source.annotation.jaxb.XMLOneToOne; +import org.hibernate.metamodel.source.annotation.jaxb.XMLTransient; +import org.hibernate.metamodel.source.annotation.jaxb.XMLVersion; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddableMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddableMocker.java index 6a243090e8..1fe68b3c74 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddableMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddableMocker.java @@ -26,18 +26,18 @@ package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.logging.Logger; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLAttributes; -import org.hibernate.metamodel.source.annotation.xml.XMLEmbeddable; -import org.hibernate.metamodel.source.annotation.xml.XMLEntityListeners; -import org.hibernate.metamodel.source.annotation.xml.XMLIdClass; -import org.hibernate.metamodel.source.annotation.xml.XMLPostLoad; -import org.hibernate.metamodel.source.annotation.xml.XMLPostPersist; -import org.hibernate.metamodel.source.annotation.xml.XMLPostRemove; -import org.hibernate.metamodel.source.annotation.xml.XMLPostUpdate; -import org.hibernate.metamodel.source.annotation.xml.XMLPrePersist; -import org.hibernate.metamodel.source.annotation.xml.XMLPreRemove; -import org.hibernate.metamodel.source.annotation.xml.XMLPreUpdate; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAttributes; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEmbeddable; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntityListeners; +import org.hibernate.metamodel.source.annotation.jaxb.XMLIdClass; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostLoad; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostPersist; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostRemove; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostUpdate; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPrePersist; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPreRemove; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPreUpdate; /** * Mock to {@link javax.persistence.Embeddable @Embeddable} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddedIdMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddedIdMocker.java index f9a274ce9b..0ea66f870d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddedIdMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddedIdMocker.java @@ -25,8 +25,8 @@ package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLEmbeddedId; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEmbeddedId; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddedMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddedMocker.java index 0b3e061c41..e2f6f94c5a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddedMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EmbeddedMocker.java @@ -25,8 +25,8 @@ package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLEmbedded; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEmbedded; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMappingsMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMappingsMocker.java index 60a9159395..ad5acc3ebf 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMappingsMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMappingsMocker.java @@ -31,13 +31,13 @@ import org.jboss.jandex.Index; import org.jboss.logging.Logger; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLEmbeddable; -import org.hibernate.metamodel.source.annotation.xml.XMLEntity; -import org.hibernate.metamodel.source.annotation.xml.XMLEntityMappings; -import org.hibernate.metamodel.source.annotation.xml.XMLMappedSuperclass; -import org.hibernate.metamodel.source.annotation.xml.XMLPersistenceUnitDefaults; -import org.hibernate.metamodel.source.annotation.xml.XMLPersistenceUnitMetadata; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEmbeddable; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntity; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntityMappings; +import org.hibernate.metamodel.source.annotation.jaxb.XMLMappedSuperclass; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPersistenceUnitDefaults; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPersistenceUnitMetadata; import org.hibernate.service.ServiceRegistry; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMocker.java index 0b6f78e526..757c746841 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/EntityMocker.java @@ -37,22 +37,22 @@ import org.jboss.logging.Logger; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLAttributes; -import org.hibernate.metamodel.source.annotation.xml.XMLDiscriminatorColumn; -import org.hibernate.metamodel.source.annotation.xml.XMLEntity; -import org.hibernate.metamodel.source.annotation.xml.XMLEntityListeners; -import org.hibernate.metamodel.source.annotation.xml.XMLIdClass; -import org.hibernate.metamodel.source.annotation.xml.XMLInheritance; -import org.hibernate.metamodel.source.annotation.xml.XMLPostLoad; -import org.hibernate.metamodel.source.annotation.xml.XMLPostPersist; -import org.hibernate.metamodel.source.annotation.xml.XMLPostRemove; -import org.hibernate.metamodel.source.annotation.xml.XMLPostUpdate; -import org.hibernate.metamodel.source.annotation.xml.XMLPrePersist; -import org.hibernate.metamodel.source.annotation.xml.XMLPreRemove; -import org.hibernate.metamodel.source.annotation.xml.XMLPreUpdate; -import org.hibernate.metamodel.source.annotation.xml.XMLSecondaryTable; -import org.hibernate.metamodel.source.annotation.xml.XMLTable; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAttributes; +import org.hibernate.metamodel.source.annotation.jaxb.XMLDiscriminatorColumn; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntity; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntityListeners; +import org.hibernate.metamodel.source.annotation.jaxb.XMLIdClass; +import org.hibernate.metamodel.source.annotation.jaxb.XMLInheritance; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostLoad; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostPersist; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostRemove; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostUpdate; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPrePersist; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPreRemove; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPreUpdate; +import org.hibernate.metamodel.source.annotation.jaxb.XMLSecondaryTable; +import org.hibernate.metamodel.source.annotation.jaxb.XMLTable; /** * Mock to {@link javax.persistence.Entity @Entity} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotationMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotationMocker.java index 1723db0748..be7320c0fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotationMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotationMocker.java @@ -31,15 +31,15 @@ import java.util.List; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; -import org.hibernate.metamodel.source.annotation.xml.XMLColumnResult; -import org.hibernate.metamodel.source.annotation.xml.XMLEntityResult; -import org.hibernate.metamodel.source.annotation.xml.XMLFieldResult; -import org.hibernate.metamodel.source.annotation.xml.XMLNamedNativeQuery; -import org.hibernate.metamodel.source.annotation.xml.XMLNamedQuery; -import org.hibernate.metamodel.source.annotation.xml.XMLQueryHint; -import org.hibernate.metamodel.source.annotation.xml.XMLSequenceGenerator; -import org.hibernate.metamodel.source.annotation.xml.XMLSqlResultSetMapping; -import org.hibernate.metamodel.source.annotation.xml.XMLTableGenerator; +import org.hibernate.metamodel.source.annotation.jaxb.XMLColumnResult; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntityResult; +import org.hibernate.metamodel.source.annotation.jaxb.XMLFieldResult; +import org.hibernate.metamodel.source.annotation.jaxb.XMLNamedNativeQuery; +import org.hibernate.metamodel.source.annotation.jaxb.XMLNamedQuery; +import org.hibernate.metamodel.source.annotation.jaxb.XMLQueryHint; +import org.hibernate.metamodel.source.annotation.jaxb.XMLSequenceGenerator; +import org.hibernate.metamodel.source.annotation.jaxb.XMLSqlResultSetMapping; +import org.hibernate.metamodel.source.annotation.jaxb.XMLTableGenerator; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotations.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotations.java index 9dd1f2f2c6..79aba78350 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotations.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotations.java @@ -38,15 +38,15 @@ import org.jboss.logging.Logger; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; import org.hibernate.metamodel.source.MappingException; -import org.hibernate.metamodel.source.annotation.xml.XMLAttributes; -import org.hibernate.metamodel.source.annotation.xml.XMLEntity; -import org.hibernate.metamodel.source.annotation.xml.XMLEntityMappings; -import org.hibernate.metamodel.source.annotation.xml.XMLId; -import org.hibernate.metamodel.source.annotation.xml.XMLNamedNativeQuery; -import org.hibernate.metamodel.source.annotation.xml.XMLNamedQuery; -import org.hibernate.metamodel.source.annotation.xml.XMLSequenceGenerator; -import org.hibernate.metamodel.source.annotation.xml.XMLSqlResultSetMapping; -import org.hibernate.metamodel.source.annotation.xml.XMLTableGenerator; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAttributes; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntity; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntityMappings; +import org.hibernate.metamodel.source.annotation.jaxb.XMLId; +import org.hibernate.metamodel.source.annotation.jaxb.XMLNamedNativeQuery; +import org.hibernate.metamodel.source.annotation.jaxb.XMLNamedQuery; +import org.hibernate.metamodel.source.annotation.jaxb.XMLSequenceGenerator; +import org.hibernate.metamodel.source.annotation.jaxb.XMLSqlResultSetMapping; +import org.hibernate.metamodel.source.annotation.jaxb.XMLTableGenerator; import org.hibernate.metamodel.source.annotations.JPADotNames; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/IdMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/IdMocker.java index 8e418e76f1..e26bc9fd6c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/IdMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/IdMocker.java @@ -31,9 +31,9 @@ import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLGeneratedValue; -import org.hibernate.metamodel.source.annotation.xml.XMLId; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLGeneratedValue; +import org.hibernate.metamodel.source.annotation.jaxb.XMLId; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ListenerMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ListenerMocker.java index 89123afa5d..9cce58d2dd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ListenerMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ListenerMocker.java @@ -32,15 +32,15 @@ import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; import org.hibernate.MappingException; -import org.hibernate.metamodel.source.annotation.xml.XMLEntityListener; -import org.hibernate.metamodel.source.annotation.xml.XMLEntityListeners; -import org.hibernate.metamodel.source.annotation.xml.XMLPostLoad; -import org.hibernate.metamodel.source.annotation.xml.XMLPostPersist; -import org.hibernate.metamodel.source.annotation.xml.XMLPostRemove; -import org.hibernate.metamodel.source.annotation.xml.XMLPostUpdate; -import org.hibernate.metamodel.source.annotation.xml.XMLPrePersist; -import org.hibernate.metamodel.source.annotation.xml.XMLPreRemove; -import org.hibernate.metamodel.source.annotation.xml.XMLPreUpdate; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntityListener; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntityListeners; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostLoad; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostPersist; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostRemove; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostUpdate; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPrePersist; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPreRemove; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPreUpdate; /** * {@link javax.persistence.EntityListeners @EntityListeners} mocker diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ManyToManyMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ManyToManyMocker.java index 3e7b17223c..269992d64c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ManyToManyMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ManyToManyMocker.java @@ -29,8 +29,8 @@ import java.util.List; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLManyToMany; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLManyToMany; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ManyToOneMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ManyToOneMocker.java index 9e14156efd..db46e85d2a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ManyToOneMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/ManyToOneMocker.java @@ -29,8 +29,8 @@ import java.util.List; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLManyToOne; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLManyToOne; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MappedSuperclassMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MappedSuperclassMocker.java index f272994ff4..ebb46e2af1 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MappedSuperclassMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MappedSuperclassMocker.java @@ -26,18 +26,18 @@ package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.logging.Logger; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLAttributes; -import org.hibernate.metamodel.source.annotation.xml.XMLEntityListeners; -import org.hibernate.metamodel.source.annotation.xml.XMLIdClass; -import org.hibernate.metamodel.source.annotation.xml.XMLMappedSuperclass; -import org.hibernate.metamodel.source.annotation.xml.XMLPostLoad; -import org.hibernate.metamodel.source.annotation.xml.XMLPostPersist; -import org.hibernate.metamodel.source.annotation.xml.XMLPostRemove; -import org.hibernate.metamodel.source.annotation.xml.XMLPostUpdate; -import org.hibernate.metamodel.source.annotation.xml.XMLPrePersist; -import org.hibernate.metamodel.source.annotation.xml.XMLPreRemove; -import org.hibernate.metamodel.source.annotation.xml.XMLPreUpdate; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAttributes; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntityListeners; +import org.hibernate.metamodel.source.annotation.jaxb.XMLIdClass; +import org.hibernate.metamodel.source.annotation.jaxb.XMLMappedSuperclass; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostLoad; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostPersist; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostRemove; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPostUpdate; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPrePersist; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPreRemove; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPreUpdate; /** * Mock to {@link javax.persistence.MappedSuperclass @MappedSuperClass} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MockHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MockHelper.java index 5b6f8ca5a4..9e8b96c71c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MockHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MockHelper.java @@ -41,7 +41,7 @@ import org.jboss.jandex.Type; import org.hibernate.HibernateException; import org.hibernate.internal.util.StringHelper; -import org.hibernate.metamodel.source.annotation.xml.XMLCascadeType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLCascadeType; import org.hibernate.metamodel.source.annotations.JPADotNames; import org.hibernate.service.ServiceRegistry; import org.hibernate.service.classloading.spi.ClassLoaderService; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/OneToManyMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/OneToManyMocker.java index 71db95cd1f..d537311eee 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/OneToManyMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/OneToManyMocker.java @@ -29,8 +29,8 @@ import java.util.List; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLOneToMany; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLOneToMany; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/OneToOneMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/OneToOneMocker.java index 076b7dee88..f60e198363 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/OneToOneMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/OneToOneMocker.java @@ -29,8 +29,8 @@ import java.util.List; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLOneToOne; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLOneToOne; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/PersistenceMetadataMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/PersistenceMetadataMocker.java index 745d60cddd..52fed81ec2 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/PersistenceMetadataMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/PersistenceMetadataMocker.java @@ -10,7 +10,7 @@ import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.hibernate.metamodel.source.annotations.xml.PseudoJpaDotNames; -import org.hibernate.metamodel.source.annotation.xml.XMLPersistenceUnitDefaults; +import org.hibernate.metamodel.source.annotation.jaxb.XMLPersistenceUnitDefaults; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/PropertyMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/PropertyMocker.java index 7f029e1d2f..c2d0dee299 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/PropertyMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/PropertyMocker.java @@ -33,13 +33,13 @@ import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.hibernate.HibernateException; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLEnumType; -import org.hibernate.metamodel.source.annotation.xml.XMLMapKey; -import org.hibernate.metamodel.source.annotation.xml.XMLMapKeyClass; -import org.hibernate.metamodel.source.annotation.xml.XMLMapKeyColumn; -import org.hibernate.metamodel.source.annotation.xml.XMLMapKeyJoinColumn; -import org.hibernate.metamodel.source.annotation.xml.XMLTemporalType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEnumType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLMapKey; +import org.hibernate.metamodel.source.annotation.jaxb.XMLMapKeyClass; +import org.hibernate.metamodel.source.annotation.jaxb.XMLMapKeyColumn; +import org.hibernate.metamodel.source.annotation.jaxb.XMLMapKeyJoinColumn; +import org.hibernate.metamodel.source.annotation.jaxb.XMLTemporalType; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/SchemaAware.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/SchemaAware.java index 69cfc9e97d..49ee82765f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/SchemaAware.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/SchemaAware.java @@ -23,10 +23,10 @@ */ package org.hibernate.metamodel.source.annotations.xml.mocker; -import org.hibernate.metamodel.source.annotation.xml.XMLCollectionTable; -import org.hibernate.metamodel.source.annotation.xml.XMLJoinTable; -import org.hibernate.metamodel.source.annotation.xml.XMLSecondaryTable; -import org.hibernate.metamodel.source.annotation.xml.XMLTable; +import org.hibernate.metamodel.source.annotation.jaxb.XMLCollectionTable; +import org.hibernate.metamodel.source.annotation.jaxb.XMLJoinTable; +import org.hibernate.metamodel.source.annotation.jaxb.XMLSecondaryTable; +import org.hibernate.metamodel.source.annotation.jaxb.XMLTable; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/TransientMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/TransientMocker.java index 2f3e1767ff..e2b0ee8b1c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/TransientMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/TransientMocker.java @@ -25,8 +25,8 @@ package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLTransient; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLTransient; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/VersionMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/VersionMocker.java index 90d4bc22fd..fe13d95625 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/VersionMocker.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/VersionMocker.java @@ -25,8 +25,8 @@ package org.hibernate.metamodel.source.annotations.xml.mocker; import org.jboss.jandex.ClassInfo; -import org.hibernate.metamodel.source.annotation.xml.XMLAccessType; -import org.hibernate.metamodel.source.annotation.xml.XMLVersion; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAccessType; +import org.hibernate.metamodel.source.annotation.jaxb.XMLVersion; /** * @author Strong Liu diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbHelper.java index 64d4fd28d9..bbc1faa0b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbHelper.java @@ -54,7 +54,7 @@ import org.hibernate.metamodel.MetadataSources; import org.hibernate.metamodel.source.MappingException; import org.hibernate.metamodel.source.Origin; import org.hibernate.metamodel.source.XsdException; -import org.hibernate.metamodel.source.annotation.xml.XMLEntityMappings; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntityMappings; import org.hibernate.metamodel.source.hbm.jaxb.mapping.XMLHibernateMapping; import org.hibernate.service.classloading.spi.ClassLoaderService; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMockerTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMockerTest.java index 745a50a705..fb7f33a4c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMockerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMockerTest.java @@ -38,7 +38,7 @@ import org.jboss.jandex.Indexer; import org.hibernate.AnnotationException; import org.hibernate.HibernateException; -import org.hibernate.metamodel.source.annotation.xml.XMLEntityMappings; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntityMappings; import org.hibernate.service.ServiceRegistry; import org.hibernate.service.classloading.spi.ClassLoaderService; import org.hibernate.testing.ServiceRegistryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/BasicMockerTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/BasicMockerTest.java index dfeea93066..e4fe64ef32 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/BasicMockerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/BasicMockerTest.java @@ -29,10 +29,10 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.Index; import org.junit.Test; -import org.hibernate.metamodel.source.annotation.xml.XMLAttributes; -import org.hibernate.metamodel.source.annotation.xml.XMLEntity; -import org.hibernate.metamodel.source.annotation.xml.XMLGeneratedValue; -import org.hibernate.metamodel.source.annotation.xml.XMLId; +import org.hibernate.metamodel.source.annotation.jaxb.XMLAttributes; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntity; +import org.hibernate.metamodel.source.annotation.jaxb.XMLGeneratedValue; +import org.hibernate.metamodel.source.annotation.jaxb.XMLId; import org.hibernate.metamodel.source.annotations.JPADotNames; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/DefaultConfigurationHelperTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/DefaultConfigurationHelperTest.java index 223d545089..af95f98934 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/DefaultConfigurationHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/DefaultConfigurationHelperTest.java @@ -18,7 +18,7 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.Index; import org.junit.Test; -import org.hibernate.metamodel.source.annotation.xml.XMLEntity; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntity; import org.hibernate.metamodel.source.annotations.JPADotNames; import static org.junit.Assert.assertArrayEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/OverrideTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/OverrideTest.java index b1729dffb7..e011f161f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/OverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/OverrideTest.java @@ -32,7 +32,7 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.Index; import org.junit.Test; -import org.hibernate.metamodel.source.annotation.xml.XMLEntity; +import org.hibernate.metamodel.source.annotation.jaxb.XMLEntity; import org.hibernate.metamodel.source.annotations.JPADotNames; import static org.junit.Assert.assertArrayEquals;