From 1ca2bc19a5f667e10f9a2c2b10320b9c40921563 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Thu, 8 Jul 2010 23:41:23 +0000 Subject: [PATCH] HHH-5367 - Move annotations module sources into core module git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@19921 1b8cb986-b30d-0410-93ca-fae66ebed9b2 --- annotations/pom.xml | 2 + .../type/CharacterArrayClobType.java | 170 ------------------ .../test/annotations/cid/SomeEntityId.java | 2 - .../annotations/collectionelement/Boy.java | 1 - .../collectionelement/LocalizedString.java | 2 - .../annotations/embedded/WealthyPerson.java | 8 - .../idclassgeneratedvalue/Simple.java | 5 - .../idclassgeneratedvalue/Simple2.java | 1 - .../annotations/immutable/ImmutableTest.java | 8 +- .../test/annotations/manytomany/Cat.java | 3 - .../annotations/manytomany/GroupWithSet.java | 4 - .../test/annotations/manytoone/Frame.java | 1 - .../onetoone/OneToOneErrorTest.java | 1 - .../onetoone/hhh4851/Hardware.java | 7 - .../annotations/override/PropertyRecord.java | 1 - .../test/annotations/query/Chaos.java | 1 - .../test/annotations/target/Brand.java | 2 - .../test/annotations/target/LuggageImpl.java | 1 - core/pom.xml | 13 ++ .../org/hibernate/AnnotationException.java | 0 .../org/hibernate/annotations/AccessType.java | 0 .../java/org/hibernate/annotations/Any.java | 2 +- .../org/hibernate/annotations/AnyMetaDef.java | 0 .../hibernate/annotations/AnyMetaDefs.java | 0 .../org/hibernate/annotations/BatchSize.java | 0 .../java/org/hibernate/annotations/Cache.java | 0 .../annotations/CacheConcurrencyStrategy.java | 0 .../hibernate/annotations/CacheModeType.java | 0 .../org/hibernate/annotations/Cascade.java | 0 .../hibernate/annotations/CascadeType.java | 0 .../java/org/hibernate/annotations/Check.java | 0 .../hibernate/annotations/CollectionId.java | 0 .../annotations/CollectionOfElements.java | 2 +- .../org/hibernate/annotations/Columns.java | 0 .../annotations/DiscriminatorFormula.java | 0 .../org/hibernate/annotations/Entity.java | 0 .../java/org/hibernate/annotations/Fetch.java | 0 .../org/hibernate/annotations/FetchMode.java | 0 .../hibernate/annotations/FetchProfile.java | 2 +- .../hibernate/annotations/FetchProfiles.java | 2 +- .../org/hibernate/annotations/Filter.java | 0 .../org/hibernate/annotations/FilterDef.java | 0 .../org/hibernate/annotations/FilterDefs.java | 0 .../annotations/FilterJoinTable.java | 0 .../annotations/FilterJoinTables.java | 0 .../org/hibernate/annotations/Filters.java | 0 .../hibernate/annotations/FlushModeType.java | 0 .../annotations/ForceDiscriminator.java | 0 .../org/hibernate/annotations/ForeignKey.java | 0 .../org/hibernate/annotations/Formula.java | 0 .../org/hibernate/annotations/Generated.java | 0 .../hibernate/annotations/GenerationTime.java | 0 .../annotations/GenericGenerator.java | 0 .../annotations/GenericGenerators.java | 0 .../org/hibernate/annotations/Immutable.java | 0 .../java/org/hibernate/annotations/Index.java | 0 .../hibernate/annotations/IndexColumn.java | 0 .../annotations/JoinColumnOrFormula.java | 0 .../annotations/JoinColumnsOrFormulas.java | 0 .../hibernate/annotations/JoinFormula.java | 0 .../hibernate/annotations/LazyCollection.java | 0 .../annotations/LazyCollectionOption.java | 0 .../org/hibernate/annotations/LazyToOne.java | 0 .../annotations/LazyToOneOption.java | 0 .../org/hibernate/annotations/Loader.java | 0 .../org/hibernate/annotations/ManyToAny.java | 2 +- .../org/hibernate/annotations/MapKey.java | 0 .../annotations/MapKeyManyToMany.java | 0 .../org/hibernate/annotations/MetaValue.java | 0 .../annotations/NamedNativeQueries.java | 0 .../annotations/NamedNativeQuery.java | 0 .../hibernate/annotations/NamedQueries.java | 0 .../org/hibernate/annotations/NamedQuery.java | 0 .../org/hibernate/annotations/NaturalId.java | 0 .../org/hibernate/annotations/NotFound.java | 0 .../hibernate/annotations/NotFoundAction.java | 0 .../org/hibernate/annotations/OnDelete.java | 0 .../hibernate/annotations/OnDeleteAction.java | 0 .../hibernate/annotations/OptimisticLock.java | 0 .../annotations/OptimisticLockType.java | 0 .../org/hibernate/annotations/OrderBy.java | 0 .../org/hibernate/annotations/ParamDef.java | 0 .../org/hibernate/annotations/Parameter.java | 0 .../org/hibernate/annotations/Parent.java | 0 .../org/hibernate/annotations/Persister.java | 0 .../annotations/PolymorphismType.java | 0 .../java/org/hibernate/annotations/Proxy.java | 0 .../annotations/ResultCheckStyle.java | 0 .../org/hibernate/annotations/SQLDelete.java | 0 .../hibernate/annotations/SQLDeleteAll.java | 0 .../org/hibernate/annotations/SQLInsert.java | 0 .../org/hibernate/annotations/SQLUpdate.java | 0 .../java/org/hibernate/annotations/Sort.java | 0 .../org/hibernate/annotations/SortType.java | 0 .../org/hibernate/annotations/Subselect.java | 0 .../hibernate/annotations/Synchronize.java | 0 .../java/org/hibernate/annotations/Table.java | 0 .../org/hibernate/annotations/Tables.java | 0 .../org/hibernate/annotations/Target.java | 0 .../org/hibernate/annotations/Tuplizer.java | 0 .../org/hibernate/annotations/Tuplizers.java | 0 .../java/org/hibernate/annotations/Type.java | 0 .../org/hibernate/annotations/TypeDef.java | 0 .../org/hibernate/annotations/TypeDefs.java | 0 .../java/org/hibernate/annotations/Where.java | 0 .../hibernate/annotations/WhereJoinTable.java | 0 .../hibernate/cfg/AbstractPropertyHolder.java | 0 .../java/org/hibernate/cfg/AccessType.java | 2 +- .../org/hibernate/cfg/AnnotatedClassType.java | 0 .../org/hibernate/cfg/AnnotationBinder.java | 1 - .../cfg/AnnotationConfiguration.java | 26 +-- .../java/org/hibernate/cfg/BinderHelper.java | 1 - .../hibernate/cfg/ClassPropertyHolder.java | 0 .../cfg/CollectionPropertyHolder.java | 0 .../org/hibernate/cfg/ColumnsBuilder.java | 0 .../cfg/ComponentPropertyHolder.java | 0 .../cfg/ConfigurationArtefactType.java | 2 +- .../CopyIdentifierComponentSecondPass.java | 0 .../hibernate/cfg/CreateKeySecondPass.java | 0 .../DefaultComponentSafeNamingStrategy.java | 0 .../hibernate/cfg/EJB3DTDEntityResolver.java | 0 .../org/hibernate/cfg/EJB3NamingStrategy.java | 0 .../java/org/hibernate/cfg/Ejb3Column.java | 0 .../cfg/Ejb3DiscriminatorColumn.java | 0 .../org/hibernate/cfg/Ejb3JoinColumn.java | 0 .../org/hibernate/cfg/ExtendedMappings.java | 0 .../java/org/hibernate/cfg/FkSecondPass.java | 0 .../java/org/hibernate/cfg/IndexColumn.java | 0 .../cfg/IndexOrUniqueKeySecondPass.java | 0 .../org/hibernate/cfg/InheritanceState.java | 0 .../cfg/JoinedSubclassFkSecondPass.java | 0 .../cfg/NotYetImplementedException.java | 0 .../org/hibernate/cfg/OneToOneSecondPass.java | 0 .../PkDrivenByDefaultMapsIdSecondPass.java | 0 .../org/hibernate/cfg/PropertyContainer.java | 0 .../java/org/hibernate/cfg/PropertyData.java | 0 .../org/hibernate/cfg/PropertyHolder.java | 0 .../hibernate/cfg/PropertyHolderBuilder.java | 0 .../hibernate/cfg/PropertyInferredData.java | 0 .../hibernate/cfg/PropertyPreloadedData.java | 0 .../hibernate/cfg/RecoverableException.java | 0 .../cfg/SecondaryTableSecondPass.java | 0 .../cfg/SetSimpleValueTypeSecondPass.java | 0 .../java/org/hibernate/cfg/ToOneBinder.java | 0 .../org/hibernate/cfg/ToOneFkSecondPass.java | 0 .../hibernate/cfg/UniqueConstraintHolder.java | 0 ...VerifyFetchProfileReferenceSecondPass.java | 0 .../hibernate/cfg/WrappedInferredData.java | 0 .../cfg/annotations/ArrayBinder.java | 0 .../hibernate/cfg/annotations/BagBinder.java | 0 .../cfg/annotations/CollectionBinder.java | 0 .../cfg/annotations/CustomizableColumns.java | 1 - .../cfg/annotations/EntityBinder.java | 0 .../cfg/annotations/IdBagBinder.java | 0 .../hibernate/cfg/annotations/ListBinder.java | 0 .../hibernate/cfg/annotations/MapBinder.java | 0 .../annotations/MapKeyColumnDelegator.java | 0 .../MapKeyJoinColumnDelegator.java | 0 .../cfg/annotations/Nullability.java | 0 .../cfg/annotations/PrimitiveArrayBinder.java | 0 .../cfg/annotations/PropertyBinder.java | 0 .../cfg/annotations/QueryBinder.java | 0 .../ResultsetMappingSecondPass.java | 0 .../hibernate/cfg/annotations/SetBinder.java | 0 .../cfg/annotations/SimpleValueBinder.java | 3 +- .../cfg/annotations/TableBinder.java | 0 .../hibernate/cfg/annotations/Version.java | 15 +- .../reflection/JPAMetadataProvider.java | 0 .../JPAOverridenAnnotationReader.java | 0 .../annotations/reflection/XMLContext.java | 2 +- .../BeanValidationActivator.java | 0 .../BeanValidationEventListener.java | 0 .../beanvalidation/GroupsPerOperation.java | 0 .../HibernateTraversableResolver.java | 0 .../cfg/beanvalidation/TypeSafeActivator.java | 0 .../HibernateSearchEventListenerRegister.java | 0 .../org/hibernate/mapping/IdGenerator.java | 0 .../hibernate/mapping/SyntheticProperty.java | 0 .../org/hibernate/type/AbstractLobType.java | 2 + .../org/hibernate/type/ByteArrayBlobType.java | 7 +- .../type/CharacterArrayClobType.java | 49 +++++ .../java/org/hibernate/type/EnumType.java | 0 .../type/PrimitiveByteArrayBlobType.java | 8 +- .../type/PrimitiveCharacterArrayClobType.java | 19 +- .../type/SerializableToBlobType.java | 0 .../org/hibernate/type/StringClobType.java | 8 +- .../type/WrappedMaterializedBlobType.java | 0 .../resources/org/hibernate/ejb/orm_1_0.xsd | 0 .../resources/org/hibernate/ejb/orm_2_0.xsd | 0 distribution/pom.xml | 11 -- entitymanager/pom.xml | 5 - envers/pom.xml | 4 - 192 files changed, 117 insertions(+), 292 deletions(-) delete mode 100644 annotations/src/main/java/org/hibernate/type/CharacterArrayClobType.java rename {annotations => core}/src/main/java/org/hibernate/AnnotationException.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/AccessType.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Any.java (98%) rename {annotations => core}/src/main/java/org/hibernate/annotations/AnyMetaDef.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/AnyMetaDefs.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/BatchSize.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Cache.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/CacheModeType.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Cascade.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/CascadeType.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Check.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/CollectionId.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/CollectionOfElements.java (97%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Columns.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Entity.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Fetch.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/FetchMode.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/FetchProfile.java (96%) rename {annotations => core}/src/main/java/org/hibernate/annotations/FetchProfiles.java (99%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Filter.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/FilterDef.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/FilterDefs.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/FilterJoinTable.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/FilterJoinTables.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Filters.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/FlushModeType.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/ForceDiscriminator.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/ForeignKey.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Formula.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Generated.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/GenerationTime.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/GenericGenerator.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/GenericGenerators.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Immutable.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Index.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/IndexColumn.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/JoinColumnsOrFormulas.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/JoinFormula.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/LazyCollection.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/LazyCollectionOption.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/LazyToOne.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/LazyToOneOption.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Loader.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/ManyToAny.java (98%) rename {annotations => core}/src/main/java/org/hibernate/annotations/MapKey.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/MetaValue.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/NamedNativeQueries.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/NamedNativeQuery.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/NamedQueries.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/NamedQuery.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/NaturalId.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/NotFound.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/NotFoundAction.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/OnDelete.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/OnDeleteAction.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/OptimisticLock.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/OptimisticLockType.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/OrderBy.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/ParamDef.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Parameter.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Parent.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Persister.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/PolymorphismType.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Proxy.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/ResultCheckStyle.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/SQLDelete.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/SQLDeleteAll.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/SQLInsert.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/SQLUpdate.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Sort.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/SortType.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Subselect.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Synchronize.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Table.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Tables.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Target.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Tuplizer.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Tuplizers.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Type.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/TypeDef.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/TypeDefs.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/Where.java (100%) rename {annotations => core}/src/main/java/org/hibernate/annotations/WhereJoinTable.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/AccessType.java (99%) rename {annotations => core}/src/main/java/org/hibernate/cfg/AnnotatedClassType.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/AnnotationBinder.java (99%) rename {annotations => core}/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java (98%) rename {annotations => core}/src/main/java/org/hibernate/cfg/BinderHelper.java (99%) rename {annotations => core}/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/ColumnsBuilder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java (99%) rename {annotations => core}/src/main/java/org/hibernate/cfg/CopyIdentifierComponentSecondPass.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/Ejb3Column.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/ExtendedMappings.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/FkSecondPass.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/IndexColumn.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/InheritanceState.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/NotYetImplementedException.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/PkDrivenByDefaultMapsIdSecondPass.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/PropertyContainer.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/PropertyData.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/PropertyHolder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/PropertyInferredData.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/RecoverableException.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/SetSimpleValueTypeSecondPass.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/ToOneBinder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/UniqueConstraintHolder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/WrappedInferredData.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/BagBinder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/CustomizableColumns.java (95%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/ListBinder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/MapBinder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/MapKeyColumnDelegator.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/MapKeyJoinColumnDelegator.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/Nullability.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/SetBinder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java (99%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/TableBinder.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/Version.java (80%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/reflection/JPAMetadataProvider.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java (97%) rename {annotations => core}/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java (100%) rename {annotations => core}/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java (100%) rename {annotations => core}/src/main/java/org/hibernate/mapping/IdGenerator.java (100%) rename {annotations => core}/src/main/java/org/hibernate/mapping/SyntheticProperty.java (100%) rename {annotations => core}/src/main/java/org/hibernate/type/AbstractLobType.java (99%) rename {annotations => core}/src/main/java/org/hibernate/type/ByteArrayBlobType.java (96%) create mode 100644 core/src/main/java/org/hibernate/type/CharacterArrayClobType.java rename {annotations => core}/src/main/java/org/hibernate/type/EnumType.java (100%) rename {annotations => core}/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java (84%) rename {annotations => core}/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java (60%) rename {annotations => core}/src/main/java/org/hibernate/type/SerializableToBlobType.java (100%) rename {annotations => core}/src/main/java/org/hibernate/type/StringClobType.java (93%) rename {annotations => core}/src/main/java/org/hibernate/type/WrappedMaterializedBlobType.java (100%) rename {annotations => core}/src/main/resources/org/hibernate/ejb/orm_1_0.xsd (100%) rename {annotations => core}/src/main/resources/org/hibernate/ejb/orm_2_0.xsd (100%) diff --git a/annotations/pom.xml b/annotations/pom.xml index 4c5e40e4d5..1d3aa87e72 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -105,6 +105,7 @@ org.jboss.maven.plugins maven-test-ext-plugin + org.twdata.maven maven-cli-plugin diff --git a/annotations/src/main/java/org/hibernate/type/CharacterArrayClobType.java b/annotations/src/main/java/org/hibernate/type/CharacterArrayClobType.java deleted file mode 100644 index 02e6f49927..0000000000 --- a/annotations/src/main/java/org/hibernate/type/CharacterArrayClobType.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.type; - -import java.io.CharArrayReader; -import java.io.IOException; -import java.io.Reader; -import java.io.Serializable; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Types; -import java.util.ArrayList; - -import org.hibernate.HibernateException; -import org.hibernate.usertype.UserType; -import org.hibernate.util.ArrayHelper; - -/** - * Map a Character[] to a Clob - * Experimental - * - * @author Emmanuel Bernard - */ -public class CharacterArrayClobType implements UserType, Serializable { - public static final int BUFFER_SIZE = 4096; - - public int[] sqlTypes() { - return new int[]{Types.CLOB}; - } - - public Class returnedClass() { - return Character[].class; - } - - public boolean equals(Object x, Object y) throws HibernateException { - if ( x == y ) return true; - if ( x == null || y == null ) return false; - if ( x instanceof Character[] ) { - Object[] o1 = (Object[]) x; - Object[] o2 = (Object[]) y; - return ArrayHelper.isEquals( o1, o2 ); - } - else { - char[] c1 = (char[]) x; - char[] c2 = (char[]) y; - return ArrayHelper.isEquals( c1, c2 ); - } - } - - public int hashCode(Object x) throws HibernateException { - if ( x instanceof Character[] ) { - Object[] o = (Object[]) x; - return ArrayHelper.hash( o ); - } - else { - char[] c = (char[]) x; - return ArrayHelper.hash( c ); - } - } - - public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws HibernateException, SQLException { - Reader reader = rs.getCharacterStream( names[0] ); - if ( reader == null ) return null; - ArrayList result = new ArrayList(); - try { - char[] charbuf = new char[BUFFER_SIZE]; - for ( int i = reader.read( charbuf ); i > 0 ; i = reader.read( charbuf ) ) { - result.ensureCapacity( result.size() + BUFFER_SIZE ); - for ( int charIndex = 0; charIndex < i ; charIndex++ ) { - result.add( Character.valueOf( charbuf[charIndex] ) ); - } - } - } - catch (IOException e) { - throw new SQLException( e.getMessage() ); - } - if ( returnedClass().equals( Character[].class ) ) { - return result.toArray( new Character[ result.size() ] ); - } - else { - //very suboptimal - int length = result.size(); - char[] chars = new char[length]; - for ( int index = 0; index < length ; index++ ) { - chars[index] = ( (Character) result.get( index ) ).charValue(); - } - return chars; - } - } - - public void nullSafeSet(PreparedStatement st, Object value, int index) throws HibernateException, SQLException { - if ( value != null ) { - char[] chars; - if ( value instanceof Character[] ) { - Character[] character = (Character[]) value; - int length = character.length; - chars = new char[length]; - for ( int i = 0; i < length ; i++ ) { - chars[i] = character[i].charValue(); - } - } - else { - chars = (char[]) value; - } - CharArrayReader reader = new CharArrayReader( chars ); - st.setCharacterStream( index, reader, chars.length ); - } - else { - st.setNull( index, sqlTypes()[0] ); - } - } - - public Object deepCopy(Object value) throws HibernateException { - if ( value == null ) return null; - if ( value instanceof Character[] ) { - Character[] array = (Character[]) value; - int length = array.length; - Character[] copy = new Character[length]; - for ( int index = 0; index < length ; index++ ) { - copy[index] = Character.valueOf( array[index].charValue() ); - } - return copy; - } - else { - char[] array = (char[]) value; - int length = array.length; - char[] copy = new char[length]; - System.arraycopy( array, 0, copy, 0, length ); - return copy; - } - } - - public boolean isMutable() { - return true; - } - - public Serializable disassemble(Object value) throws HibernateException { - return (Serializable) deepCopy( value ); - } - - public Object assemble(Serializable cached, Object owner) throws HibernateException { - return deepCopy( cached ); - } - - public Object replace(Object original, Object target, Object owner) throws HibernateException { - return deepCopy( original ); - } -} diff --git a/annotations/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java b/annotations/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java index 77233db56a..47e5c7d317 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java @@ -3,8 +3,6 @@ package org.hibernate.test.annotations.cid; import java.io.Serializable; import javax.persistence.Embeddable; -import org.hibernate.annotations.*; - /** * @author bartek */ diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java b/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java index 7268c26f5d..d96bcb1542 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java @@ -21,7 +21,6 @@ import javax.persistence.OrderColumn; import javax.persistence.Table; import org.hibernate.annotations.CollectionOfElements; -import org.hibernate.test.annotations.collectionelement.FavoriteFood; /** * @author Emmanuel Bernard diff --git a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java b/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java index 10bca96c5d..e61ff5318a 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java @@ -5,7 +5,6 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javax.persistence.Column; import javax.persistence.ElementCollection; import javax.persistence.Embeddable; import javax.persistence.MapKeyColumn; @@ -13,7 +12,6 @@ import javax.persistence.MapKeyColumn; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.Filter; -import org.hibernate.annotations.MapKey; /** * @author Emmanuel Bernard diff --git a/annotations/src/test/java/org/hibernate/test/annotations/embedded/WealthyPerson.java b/annotations/src/test/java/org/hibernate/test/annotations/embedded/WealthyPerson.java index 1c7f3653aa..90667d8a16 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/embedded/WealthyPerson.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/embedded/WealthyPerson.java @@ -1,16 +1,8 @@ package org.hibernate.test.annotations.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; import javax.persistence.CollectionTable; -import javax.persistence.Column; import javax.persistence.ElementCollection; -import javax.persistence.Embedded; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serializable; import java.util.HashSet; import java.util.Set; diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple.java b/annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple.java index 0d335a434e..ea6b1c0e04 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple.java @@ -24,14 +24,9 @@ package org.hibernate.test.annotations.idclassgeneratedvalue; import java.io.Serializable; -import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.IdClass; -import javax.persistence.Table; - -import org.hibernate.annotations.GenericGenerator; /** * A Simple entity class. diff --git a/annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple2.java b/annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple2.java index e1e7a85a96..00b9e3ce70 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple2.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple2.java @@ -28,7 +28,6 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.IdClass; -import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; diff --git a/annotations/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java b/annotations/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java index e3101ff61e..6786d5cead 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java @@ -1,8 +1,6 @@ //$Id$ package org.hibernate.test.annotations.immutable; -import java.io.PrintWriter; -import java.io.StringWriter; import java.util.ArrayList; import java.util.List; @@ -11,12 +9,8 @@ import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.cfg.AnnotationConfiguration; -import org.hibernate.dialect.SQLServerDialect; import org.hibernate.test.annotations.TestCase; -import org.hibernate.test.annotations.fkcircularity.A; -import org.hibernate.test.annotations.fkcircularity.B; -import org.hibernate.test.annotations.fkcircularity.C; -import org.hibernate.test.annotations.fkcircularity.D; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java b/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java index ad4e7f1cbb..a505478b68 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java @@ -7,9 +7,6 @@ import javax.persistence.Entity; import javax.persistence.ManyToMany; import javax.persistence.Table; import javax.persistence.JoinTable; -import javax.persistence.JoinColumn; - -import org.hibernate.annotations.Index; /** * @author Emmanuel Bernard diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java b/annotations/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java index 5d53b7f6f5..4ac9b0c195 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java @@ -1,18 +1,14 @@ //$Id$ package org.hibernate.test.annotations.manytomany; -import java.util.Collection; import java.util.Set; import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; import javax.persistence.ManyToMany; import javax.persistence.OrderBy; import javax.persistence.Table; -import javax.persistence.UniqueConstraint; import org.hibernate.annotations.Where; import org.hibernate.annotations.FilterDef; diff --git a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java b/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java index 95c10517a6..72989e85ae 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java @@ -3,7 +3,6 @@ package org.hibernate.test.annotations.manytoone; import java.util.Set; import java.io.Serializable; -import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java b/annotations/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java index 59720d8cd0..34f39bb40b 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java @@ -3,7 +3,6 @@ package org.hibernate.test.annotations.onetoone; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Environment; -import org.hibernate.test.annotations.IncorrectEntity; import org.hibernate.SessionFactory; import org.hibernate.AnnotationException; diff --git a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java b/annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java index 428d38483f..f8e73ecdcc 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java @@ -1,7 +1,5 @@ package org.hibernate.test.annotations.onetoone.hhh4851; -import java.util.ArrayList; -import java.util.List; import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; import javax.persistence.DiscriminatorValue; @@ -10,14 +8,9 @@ import javax.persistence.FetchType; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.Table; -import org.hibernate.annotations.Cascade; -import org.hibernate.annotations.CascadeType; - @Entity @Table @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/annotations/src/test/java/org/hibernate/test/annotations/override/PropertyRecord.java b/annotations/src/test/java/org/hibernate/test/annotations/override/PropertyRecord.java index 5e37028f4e..5151f74ca0 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/override/PropertyRecord.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/override/PropertyRecord.java @@ -11,7 +11,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.CollectionTable; -import org.hibernate.annotations.MapKey; import org.hibernate.annotations.CollectionOfElements; /** diff --git a/annotations/src/test/java/org/hibernate/test/annotations/query/Chaos.java b/annotations/src/test/java/org/hibernate/test/annotations/query/Chaos.java index 8adfa0450d..585b48fa1c 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/query/Chaos.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/query/Chaos.java @@ -6,7 +6,6 @@ import java.util.HashSet; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import javax.persistence.NamedQuery; import javax.persistence.NamedNativeQuery; import javax.persistence.OneToMany; import javax.persistence.JoinColumn; diff --git a/annotations/src/test/java/org/hibernate/test/annotations/target/Brand.java b/annotations/src/test/java/org/hibernate/test/annotations/target/Brand.java index 850006039d..fc5a7814e3 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/target/Brand.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/target/Brand.java @@ -9,9 +9,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.ManyToMany; import javax.persistence.MapKeyClass; -import javax.persistence.JoinColumn; -import org.hibernate.annotations.MapKey; import org.hibernate.annotations.MapKeyManyToMany; /** diff --git a/annotations/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java b/annotations/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java index 3b774ffcce..756259749c 100644 --- a/annotations/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java +++ b/annotations/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java @@ -4,7 +4,6 @@ package org.hibernate.test.annotations.target; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.GeneratedValue; -import javax.persistence.ManyToOne; import javax.persistence.Embedded; import org.hibernate.annotations.Target; diff --git a/core/pom.xml b/core/pom.xml index 721d432170..a80ae5b0b8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -30,6 +30,19 @@ dom4j dom4j + + org.hibernate + hibernate-commons-annotations + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + + + javax.validation + validation-api + provided + diff --git a/annotations/src/main/java/org/hibernate/AnnotationException.java b/core/src/main/java/org/hibernate/AnnotationException.java similarity index 100% rename from annotations/src/main/java/org/hibernate/AnnotationException.java rename to core/src/main/java/org/hibernate/AnnotationException.java diff --git a/annotations/src/main/java/org/hibernate/annotations/AccessType.java b/core/src/main/java/org/hibernate/annotations/AccessType.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/AccessType.java rename to core/src/main/java/org/hibernate/annotations/AccessType.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Any.java b/core/src/main/java/org/hibernate/annotations/Any.java similarity index 98% rename from annotations/src/main/java/org/hibernate/annotations/Any.java rename to core/src/main/java/org/hibernate/annotations/Any.java index 7df05b39b4..5a2adb55f3 100644 --- a/annotations/src/main/java/org/hibernate/annotations/Any.java +++ b/core/src/main/java/org/hibernate/annotations/Any.java @@ -59,7 +59,7 @@ public @interface Any { * that the value must be eagerly fetched. The LAZY strategy is applied when bytecode * enhancement is used. If not specified, defaults to EAGER. */ - FetchType fetch() default EAGER; + FetchType fetch() default FetchType.EAGER; /** * Whether the association is optional. If set to false then a non-null relationship must always exist. */ diff --git a/annotations/src/main/java/org/hibernate/annotations/AnyMetaDef.java b/core/src/main/java/org/hibernate/annotations/AnyMetaDef.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/AnyMetaDef.java rename to core/src/main/java/org/hibernate/annotations/AnyMetaDef.java diff --git a/annotations/src/main/java/org/hibernate/annotations/AnyMetaDefs.java b/core/src/main/java/org/hibernate/annotations/AnyMetaDefs.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/AnyMetaDefs.java rename to core/src/main/java/org/hibernate/annotations/AnyMetaDefs.java diff --git a/annotations/src/main/java/org/hibernate/annotations/BatchSize.java b/core/src/main/java/org/hibernate/annotations/BatchSize.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/BatchSize.java rename to core/src/main/java/org/hibernate/annotations/BatchSize.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Cache.java b/core/src/main/java/org/hibernate/annotations/Cache.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Cache.java rename to core/src/main/java/org/hibernate/annotations/Cache.java diff --git a/annotations/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java b/core/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java rename to core/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java diff --git a/annotations/src/main/java/org/hibernate/annotations/CacheModeType.java b/core/src/main/java/org/hibernate/annotations/CacheModeType.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/CacheModeType.java rename to core/src/main/java/org/hibernate/annotations/CacheModeType.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Cascade.java b/core/src/main/java/org/hibernate/annotations/Cascade.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Cascade.java rename to core/src/main/java/org/hibernate/annotations/Cascade.java diff --git a/annotations/src/main/java/org/hibernate/annotations/CascadeType.java b/core/src/main/java/org/hibernate/annotations/CascadeType.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/CascadeType.java rename to core/src/main/java/org/hibernate/annotations/CascadeType.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Check.java b/core/src/main/java/org/hibernate/annotations/Check.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Check.java rename to core/src/main/java/org/hibernate/annotations/Check.java diff --git a/annotations/src/main/java/org/hibernate/annotations/CollectionId.java b/core/src/main/java/org/hibernate/annotations/CollectionId.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/CollectionId.java rename to core/src/main/java/org/hibernate/annotations/CollectionId.java diff --git a/annotations/src/main/java/org/hibernate/annotations/CollectionOfElements.java b/core/src/main/java/org/hibernate/annotations/CollectionOfElements.java similarity index 97% rename from annotations/src/main/java/org/hibernate/annotations/CollectionOfElements.java rename to core/src/main/java/org/hibernate/annotations/CollectionOfElements.java index 2b873aa93f..1c014b422c 100644 --- a/annotations/src/main/java/org/hibernate/annotations/CollectionOfElements.java +++ b/core/src/main/java/org/hibernate/annotations/CollectionOfElements.java @@ -48,5 +48,5 @@ public @interface CollectionOfElements { */ Class targetElement() default void.class; - FetchType fetch() default LAZY; + FetchType fetch() default FetchType.LAZY; } diff --git a/annotations/src/main/java/org/hibernate/annotations/Columns.java b/core/src/main/java/org/hibernate/annotations/Columns.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Columns.java rename to core/src/main/java/org/hibernate/annotations/Columns.java diff --git a/annotations/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java b/core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java rename to core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Entity.java b/core/src/main/java/org/hibernate/annotations/Entity.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Entity.java rename to core/src/main/java/org/hibernate/annotations/Entity.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Fetch.java b/core/src/main/java/org/hibernate/annotations/Fetch.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Fetch.java rename to core/src/main/java/org/hibernate/annotations/Fetch.java diff --git a/annotations/src/main/java/org/hibernate/annotations/FetchMode.java b/core/src/main/java/org/hibernate/annotations/FetchMode.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/FetchMode.java rename to core/src/main/java/org/hibernate/annotations/FetchMode.java diff --git a/annotations/src/main/java/org/hibernate/annotations/FetchProfile.java b/core/src/main/java/org/hibernate/annotations/FetchProfile.java similarity index 96% rename from annotations/src/main/java/org/hibernate/annotations/FetchProfile.java rename to core/src/main/java/org/hibernate/annotations/FetchProfile.java index a2e7b94fbb..9e186f52ed 100644 --- a/annotations/src/main/java/org/hibernate/annotations/FetchProfile.java +++ b/core/src/main/java/org/hibernate/annotations/FetchProfile.java @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * diff --git a/annotations/src/main/java/org/hibernate/annotations/FetchProfiles.java b/core/src/main/java/org/hibernate/annotations/FetchProfiles.java similarity index 99% rename from annotations/src/main/java/org/hibernate/annotations/FetchProfiles.java rename to core/src/main/java/org/hibernate/annotations/FetchProfiles.java index 95ed8cedff..e3182b6673 100644 --- a/annotations/src/main/java/org/hibernate/annotations/FetchProfiles.java +++ b/core/src/main/java/org/hibernate/annotations/FetchProfiles.java @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * diff --git a/annotations/src/main/java/org/hibernate/annotations/Filter.java b/core/src/main/java/org/hibernate/annotations/Filter.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Filter.java rename to core/src/main/java/org/hibernate/annotations/Filter.java diff --git a/annotations/src/main/java/org/hibernate/annotations/FilterDef.java b/core/src/main/java/org/hibernate/annotations/FilterDef.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/FilterDef.java rename to core/src/main/java/org/hibernate/annotations/FilterDef.java diff --git a/annotations/src/main/java/org/hibernate/annotations/FilterDefs.java b/core/src/main/java/org/hibernate/annotations/FilterDefs.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/FilterDefs.java rename to core/src/main/java/org/hibernate/annotations/FilterDefs.java diff --git a/annotations/src/main/java/org/hibernate/annotations/FilterJoinTable.java b/core/src/main/java/org/hibernate/annotations/FilterJoinTable.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/FilterJoinTable.java rename to core/src/main/java/org/hibernate/annotations/FilterJoinTable.java diff --git a/annotations/src/main/java/org/hibernate/annotations/FilterJoinTables.java b/core/src/main/java/org/hibernate/annotations/FilterJoinTables.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/FilterJoinTables.java rename to core/src/main/java/org/hibernate/annotations/FilterJoinTables.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Filters.java b/core/src/main/java/org/hibernate/annotations/Filters.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Filters.java rename to core/src/main/java/org/hibernate/annotations/Filters.java diff --git a/annotations/src/main/java/org/hibernate/annotations/FlushModeType.java b/core/src/main/java/org/hibernate/annotations/FlushModeType.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/FlushModeType.java rename to core/src/main/java/org/hibernate/annotations/FlushModeType.java diff --git a/annotations/src/main/java/org/hibernate/annotations/ForceDiscriminator.java b/core/src/main/java/org/hibernate/annotations/ForceDiscriminator.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/ForceDiscriminator.java rename to core/src/main/java/org/hibernate/annotations/ForceDiscriminator.java diff --git a/annotations/src/main/java/org/hibernate/annotations/ForeignKey.java b/core/src/main/java/org/hibernate/annotations/ForeignKey.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/ForeignKey.java rename to core/src/main/java/org/hibernate/annotations/ForeignKey.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Formula.java b/core/src/main/java/org/hibernate/annotations/Formula.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Formula.java rename to core/src/main/java/org/hibernate/annotations/Formula.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Generated.java b/core/src/main/java/org/hibernate/annotations/Generated.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Generated.java rename to core/src/main/java/org/hibernate/annotations/Generated.java diff --git a/annotations/src/main/java/org/hibernate/annotations/GenerationTime.java b/core/src/main/java/org/hibernate/annotations/GenerationTime.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/GenerationTime.java rename to core/src/main/java/org/hibernate/annotations/GenerationTime.java diff --git a/annotations/src/main/java/org/hibernate/annotations/GenericGenerator.java b/core/src/main/java/org/hibernate/annotations/GenericGenerator.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/GenericGenerator.java rename to core/src/main/java/org/hibernate/annotations/GenericGenerator.java diff --git a/annotations/src/main/java/org/hibernate/annotations/GenericGenerators.java b/core/src/main/java/org/hibernate/annotations/GenericGenerators.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/GenericGenerators.java rename to core/src/main/java/org/hibernate/annotations/GenericGenerators.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Immutable.java b/core/src/main/java/org/hibernate/annotations/Immutable.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Immutable.java rename to core/src/main/java/org/hibernate/annotations/Immutable.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Index.java b/core/src/main/java/org/hibernate/annotations/Index.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Index.java rename to core/src/main/java/org/hibernate/annotations/Index.java diff --git a/annotations/src/main/java/org/hibernate/annotations/IndexColumn.java b/core/src/main/java/org/hibernate/annotations/IndexColumn.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/IndexColumn.java rename to core/src/main/java/org/hibernate/annotations/IndexColumn.java diff --git a/annotations/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java b/core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java rename to core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java diff --git a/annotations/src/main/java/org/hibernate/annotations/JoinColumnsOrFormulas.java b/core/src/main/java/org/hibernate/annotations/JoinColumnsOrFormulas.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/JoinColumnsOrFormulas.java rename to core/src/main/java/org/hibernate/annotations/JoinColumnsOrFormulas.java diff --git a/annotations/src/main/java/org/hibernate/annotations/JoinFormula.java b/core/src/main/java/org/hibernate/annotations/JoinFormula.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/JoinFormula.java rename to core/src/main/java/org/hibernate/annotations/JoinFormula.java diff --git a/annotations/src/main/java/org/hibernate/annotations/LazyCollection.java b/core/src/main/java/org/hibernate/annotations/LazyCollection.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/LazyCollection.java rename to core/src/main/java/org/hibernate/annotations/LazyCollection.java diff --git a/annotations/src/main/java/org/hibernate/annotations/LazyCollectionOption.java b/core/src/main/java/org/hibernate/annotations/LazyCollectionOption.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/LazyCollectionOption.java rename to core/src/main/java/org/hibernate/annotations/LazyCollectionOption.java diff --git a/annotations/src/main/java/org/hibernate/annotations/LazyToOne.java b/core/src/main/java/org/hibernate/annotations/LazyToOne.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/LazyToOne.java rename to core/src/main/java/org/hibernate/annotations/LazyToOne.java diff --git a/annotations/src/main/java/org/hibernate/annotations/LazyToOneOption.java b/core/src/main/java/org/hibernate/annotations/LazyToOneOption.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/LazyToOneOption.java rename to core/src/main/java/org/hibernate/annotations/LazyToOneOption.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Loader.java b/core/src/main/java/org/hibernate/annotations/Loader.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Loader.java rename to core/src/main/java/org/hibernate/annotations/Loader.java diff --git a/annotations/src/main/java/org/hibernate/annotations/ManyToAny.java b/core/src/main/java/org/hibernate/annotations/ManyToAny.java similarity index 98% rename from annotations/src/main/java/org/hibernate/annotations/ManyToAny.java rename to core/src/main/java/org/hibernate/annotations/ManyToAny.java index 489eabab17..9fe7501a0d 100644 --- a/annotations/src/main/java/org/hibernate/annotations/ManyToAny.java +++ b/core/src/main/java/org/hibernate/annotations/ManyToAny.java @@ -59,5 +59,5 @@ public @interface ManyToAny { * that the value must be eagerly fetched. The LAZY strategy is applied when bytecode * enhancement is used. If not specified, defaults to EAGER. */ - FetchType fetch() default EAGER; + FetchType fetch() default FetchType.EAGER; } diff --git a/annotations/src/main/java/org/hibernate/annotations/MapKey.java b/core/src/main/java/org/hibernate/annotations/MapKey.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/MapKey.java rename to core/src/main/java/org/hibernate/annotations/MapKey.java diff --git a/annotations/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java b/core/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java rename to core/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java diff --git a/annotations/src/main/java/org/hibernate/annotations/MetaValue.java b/core/src/main/java/org/hibernate/annotations/MetaValue.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/MetaValue.java rename to core/src/main/java/org/hibernate/annotations/MetaValue.java diff --git a/annotations/src/main/java/org/hibernate/annotations/NamedNativeQueries.java b/core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/NamedNativeQueries.java rename to core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java diff --git a/annotations/src/main/java/org/hibernate/annotations/NamedNativeQuery.java b/core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/NamedNativeQuery.java rename to core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java diff --git a/annotations/src/main/java/org/hibernate/annotations/NamedQueries.java b/core/src/main/java/org/hibernate/annotations/NamedQueries.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/NamedQueries.java rename to core/src/main/java/org/hibernate/annotations/NamedQueries.java diff --git a/annotations/src/main/java/org/hibernate/annotations/NamedQuery.java b/core/src/main/java/org/hibernate/annotations/NamedQuery.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/NamedQuery.java rename to core/src/main/java/org/hibernate/annotations/NamedQuery.java diff --git a/annotations/src/main/java/org/hibernate/annotations/NaturalId.java b/core/src/main/java/org/hibernate/annotations/NaturalId.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/NaturalId.java rename to core/src/main/java/org/hibernate/annotations/NaturalId.java diff --git a/annotations/src/main/java/org/hibernate/annotations/NotFound.java b/core/src/main/java/org/hibernate/annotations/NotFound.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/NotFound.java rename to core/src/main/java/org/hibernate/annotations/NotFound.java diff --git a/annotations/src/main/java/org/hibernate/annotations/NotFoundAction.java b/core/src/main/java/org/hibernate/annotations/NotFoundAction.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/NotFoundAction.java rename to core/src/main/java/org/hibernate/annotations/NotFoundAction.java diff --git a/annotations/src/main/java/org/hibernate/annotations/OnDelete.java b/core/src/main/java/org/hibernate/annotations/OnDelete.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/OnDelete.java rename to core/src/main/java/org/hibernate/annotations/OnDelete.java diff --git a/annotations/src/main/java/org/hibernate/annotations/OnDeleteAction.java b/core/src/main/java/org/hibernate/annotations/OnDeleteAction.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/OnDeleteAction.java rename to core/src/main/java/org/hibernate/annotations/OnDeleteAction.java diff --git a/annotations/src/main/java/org/hibernate/annotations/OptimisticLock.java b/core/src/main/java/org/hibernate/annotations/OptimisticLock.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/OptimisticLock.java rename to core/src/main/java/org/hibernate/annotations/OptimisticLock.java diff --git a/annotations/src/main/java/org/hibernate/annotations/OptimisticLockType.java b/core/src/main/java/org/hibernate/annotations/OptimisticLockType.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/OptimisticLockType.java rename to core/src/main/java/org/hibernate/annotations/OptimisticLockType.java diff --git a/annotations/src/main/java/org/hibernate/annotations/OrderBy.java b/core/src/main/java/org/hibernate/annotations/OrderBy.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/OrderBy.java rename to core/src/main/java/org/hibernate/annotations/OrderBy.java diff --git a/annotations/src/main/java/org/hibernate/annotations/ParamDef.java b/core/src/main/java/org/hibernate/annotations/ParamDef.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/ParamDef.java rename to core/src/main/java/org/hibernate/annotations/ParamDef.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Parameter.java b/core/src/main/java/org/hibernate/annotations/Parameter.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Parameter.java rename to core/src/main/java/org/hibernate/annotations/Parameter.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Parent.java b/core/src/main/java/org/hibernate/annotations/Parent.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Parent.java rename to core/src/main/java/org/hibernate/annotations/Parent.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Persister.java b/core/src/main/java/org/hibernate/annotations/Persister.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Persister.java rename to core/src/main/java/org/hibernate/annotations/Persister.java diff --git a/annotations/src/main/java/org/hibernate/annotations/PolymorphismType.java b/core/src/main/java/org/hibernate/annotations/PolymorphismType.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/PolymorphismType.java rename to core/src/main/java/org/hibernate/annotations/PolymorphismType.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Proxy.java b/core/src/main/java/org/hibernate/annotations/Proxy.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Proxy.java rename to core/src/main/java/org/hibernate/annotations/Proxy.java diff --git a/annotations/src/main/java/org/hibernate/annotations/ResultCheckStyle.java b/core/src/main/java/org/hibernate/annotations/ResultCheckStyle.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/ResultCheckStyle.java rename to core/src/main/java/org/hibernate/annotations/ResultCheckStyle.java diff --git a/annotations/src/main/java/org/hibernate/annotations/SQLDelete.java b/core/src/main/java/org/hibernate/annotations/SQLDelete.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/SQLDelete.java rename to core/src/main/java/org/hibernate/annotations/SQLDelete.java diff --git a/annotations/src/main/java/org/hibernate/annotations/SQLDeleteAll.java b/core/src/main/java/org/hibernate/annotations/SQLDeleteAll.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/SQLDeleteAll.java rename to core/src/main/java/org/hibernate/annotations/SQLDeleteAll.java diff --git a/annotations/src/main/java/org/hibernate/annotations/SQLInsert.java b/core/src/main/java/org/hibernate/annotations/SQLInsert.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/SQLInsert.java rename to core/src/main/java/org/hibernate/annotations/SQLInsert.java diff --git a/annotations/src/main/java/org/hibernate/annotations/SQLUpdate.java b/core/src/main/java/org/hibernate/annotations/SQLUpdate.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/SQLUpdate.java rename to core/src/main/java/org/hibernate/annotations/SQLUpdate.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Sort.java b/core/src/main/java/org/hibernate/annotations/Sort.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Sort.java rename to core/src/main/java/org/hibernate/annotations/Sort.java diff --git a/annotations/src/main/java/org/hibernate/annotations/SortType.java b/core/src/main/java/org/hibernate/annotations/SortType.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/SortType.java rename to core/src/main/java/org/hibernate/annotations/SortType.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Subselect.java b/core/src/main/java/org/hibernate/annotations/Subselect.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Subselect.java rename to core/src/main/java/org/hibernate/annotations/Subselect.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Synchronize.java b/core/src/main/java/org/hibernate/annotations/Synchronize.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Synchronize.java rename to core/src/main/java/org/hibernate/annotations/Synchronize.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Table.java b/core/src/main/java/org/hibernate/annotations/Table.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Table.java rename to core/src/main/java/org/hibernate/annotations/Table.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Tables.java b/core/src/main/java/org/hibernate/annotations/Tables.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Tables.java rename to core/src/main/java/org/hibernate/annotations/Tables.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Target.java b/core/src/main/java/org/hibernate/annotations/Target.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Target.java rename to core/src/main/java/org/hibernate/annotations/Target.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Tuplizer.java b/core/src/main/java/org/hibernate/annotations/Tuplizer.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Tuplizer.java rename to core/src/main/java/org/hibernate/annotations/Tuplizer.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Tuplizers.java b/core/src/main/java/org/hibernate/annotations/Tuplizers.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Tuplizers.java rename to core/src/main/java/org/hibernate/annotations/Tuplizers.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Type.java b/core/src/main/java/org/hibernate/annotations/Type.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Type.java rename to core/src/main/java/org/hibernate/annotations/Type.java diff --git a/annotations/src/main/java/org/hibernate/annotations/TypeDef.java b/core/src/main/java/org/hibernate/annotations/TypeDef.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/TypeDef.java rename to core/src/main/java/org/hibernate/annotations/TypeDef.java diff --git a/annotations/src/main/java/org/hibernate/annotations/TypeDefs.java b/core/src/main/java/org/hibernate/annotations/TypeDefs.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/TypeDefs.java rename to core/src/main/java/org/hibernate/annotations/TypeDefs.java diff --git a/annotations/src/main/java/org/hibernate/annotations/Where.java b/core/src/main/java/org/hibernate/annotations/Where.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/Where.java rename to core/src/main/java/org/hibernate/annotations/Where.java diff --git a/annotations/src/main/java/org/hibernate/annotations/WhereJoinTable.java b/core/src/main/java/org/hibernate/annotations/WhereJoinTable.java similarity index 100% rename from annotations/src/main/java/org/hibernate/annotations/WhereJoinTable.java rename to core/src/main/java/org/hibernate/annotations/WhereJoinTable.java diff --git a/annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java b/core/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java rename to core/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/AccessType.java b/core/src/main/java/org/hibernate/cfg/AccessType.java similarity index 99% rename from annotations/src/main/java/org/hibernate/cfg/AccessType.java rename to core/src/main/java/org/hibernate/cfg/AccessType.java index 6b71db3932..0655d052a4 100644 --- a/annotations/src/main/java/org/hibernate/cfg/AccessType.java +++ b/core/src/main/java/org/hibernate/cfg/AccessType.java @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * diff --git a/annotations/src/main/java/org/hibernate/cfg/AnnotatedClassType.java b/core/src/main/java/org/hibernate/cfg/AnnotatedClassType.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/AnnotatedClassType.java rename to core/src/main/java/org/hibernate/cfg/AnnotatedClassType.java diff --git a/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java b/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java similarity index 99% rename from annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java rename to core/src/main/java/org/hibernate/cfg/AnnotationBinder.java index 33cb5340f0..8aff4e5228 100644 --- a/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java +++ b/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java @@ -170,7 +170,6 @@ import org.hibernate.mapping.UnionSubclass; import org.hibernate.persister.entity.JoinedSubclassEntityPersister; import org.hibernate.persister.entity.SingleTableEntityPersister; import org.hibernate.persister.entity.UnionSubclassEntityPersister; -import org.hibernate.type.TypeFactory; /** * JSR 175 annotation binder which reads the annotations from classes, applies the diff --git a/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java b/core/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java similarity index 98% rename from annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java rename to core/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java index 5b8b911a76..822e223186 100644 --- a/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java +++ b/core/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java @@ -76,7 +76,6 @@ import org.hibernate.annotations.common.reflection.MetadataProviderInjector; import org.hibernate.annotations.common.reflection.ReflectionManager; import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.java.JavaReflectionManager; -import org.hibernate.cfg.annotations.Version; import org.hibernate.cfg.annotations.reflection.JPAMetadataProvider; import org.hibernate.cfg.beanvalidation.BeanValidationActivator; import org.hibernate.engine.NamedQueryDefinition; @@ -131,10 +130,6 @@ public class AnnotationConfiguration extends Configuration { */ private static final String SEARCH_STARTUP_METHOD = "enableHibernateSearch"; - static { - Version.touch(); //touch version - } - public static final String ARTEFACT_PROCESSING_ORDER = "hibernate.mapping.precedence"; public static final ConfigurationArtefactType[] DEFAULT_ARTEFACT_PROCESSING_ORDER = new ConfigurationArtefactType[] { ConfigurationArtefactType.HBM, ConfigurationArtefactType.CLASS }; @@ -235,6 +230,7 @@ public class AnnotationConfiguration extends Configuration { * * @throws MappingException in case there is a configuration error for the specified class */ + @SuppressWarnings({ "unchecked" }) public AnnotationConfiguration addAnnotatedClass(Class persistentClass) throws MappingException { XClass persistentXClass = reflectionManager.toXClass( persistentClass ); try { @@ -431,6 +427,7 @@ public class AnnotationConfiguration extends Configuration { applyBeanValidationConstraintsOnDDL(); } + @SuppressWarnings({ "unchecked" }) private void applyHibernateValidatorLegacyConstraintsOnDDL() { //TODO search for the method only once and cache it? Constructor validatorCtr = null; @@ -475,6 +472,7 @@ public class AnnotationConfiguration extends Configuration { } } + @SuppressWarnings({ "unchecked" }) private void applyBeanValidationConstraintsOnDDL() { BeanValidationActivator.applyDDL( ( Collection ) classes.values(), getProperties() ); } @@ -495,7 +493,7 @@ public class AnnotationConfiguration extends Configuration { // split FkSecondPass instances into primary key and non primary key FKs. // While doing so build a map of class names to FkSecondPass instances depending on this class. Map> isADependencyOf = new HashMap>(); - List endOfQueueFkSecondPasses = new ArrayList( fkSecondPasses.size() ); + List endOfQueueFkSecondPasses = new ArrayList( fkSecondPasses.size() ); for ( FkSecondPass sp : fkSecondPasses ) { if ( sp.isInPrimaryKey() ) { String referenceEntityName = sp.getReferencedEntityName(); @@ -512,7 +510,7 @@ public class AnnotationConfiguration extends Configuration { } // using the isADependencyOf map we order the FkSecondPass recursively instances into the right order for processing - List orderedFkSecondPasses = new ArrayList( fkSecondPasses.size() ); + List orderedFkSecondPasses = new ArrayList( fkSecondPasses.size() ); for ( String tableName : isADependencyOf.keySet() ) { buildRecursiveOrderedFkSecondPasses( orderedFkSecondPasses, isADependencyOf, tableName, tableName ); } @@ -525,7 +523,7 @@ public class AnnotationConfiguration extends Configuration { processEndOfQueue( endOfQueueFkSecondPasses ); } - private void processEndOfQueue(List endOfQueueFkSecondPasses) { + private void processEndOfQueue(List endOfQueueFkSecondPasses) { /* * If a second pass raises a recoverableException, queue it for next round * stop of no pass has to be processed or if the number of pass to processes @@ -535,10 +533,10 @@ public class AnnotationConfiguration extends Configuration { boolean stopProcess = false; RuntimeException originalException = null; while ( !stopProcess ) { - List failingSecondPasses = new ArrayList(); - Iterator it = endOfQueueFkSecondPasses.listIterator(); + List failingSecondPasses = new ArrayList(); + Iterator it = endOfQueueFkSecondPasses.listIterator(); while ( it.hasNext() ) { - final SecondPass pass = ( SecondPass ) it.next(); + final FkSecondPass pass = it.next(); try { pass.doSecondPass( classes ); } @@ -589,8 +587,10 @@ public class AnnotationConfiguration extends Configuration { * @param currentTable The current table name used to check for 'new' dependencies. */ private void buildRecursiveOrderedFkSecondPasses( - List orderedFkSecondPasses, - Map> isADependencyOf, String startTable, String currentTable) { + List orderedFkSecondPasses, + Map> isADependencyOf, + String startTable, + String currentTable) { Set dependencies = isADependencyOf.get( currentTable ); diff --git a/annotations/src/main/java/org/hibernate/cfg/BinderHelper.java b/core/src/main/java/org/hibernate/cfg/BinderHelper.java similarity index 99% rename from annotations/src/main/java/org/hibernate/cfg/BinderHelper.java rename to core/src/main/java/org/hibernate/cfg/BinderHelper.java index fde3316a71..45afa09604 100644 --- a/annotations/src/main/java/org/hibernate/cfg/BinderHelper.java +++ b/core/src/main/java/org/hibernate/cfg/BinderHelper.java @@ -62,7 +62,6 @@ import org.hibernate.mapping.Table; import org.hibernate.mapping.ToOne; import org.hibernate.mapping.Value; import org.hibernate.mapping.MappedSuperclass; -import org.hibernate.type.TypeFactory; import org.hibernate.util.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/annotations/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java b/core/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java rename to core/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java b/core/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java rename to core/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/ColumnsBuilder.java b/core/src/main/java/org/hibernate/cfg/ColumnsBuilder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/ColumnsBuilder.java rename to core/src/main/java/org/hibernate/cfg/ColumnsBuilder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java b/core/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java rename to core/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java b/core/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java similarity index 99% rename from annotations/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java rename to core/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java index f68c51dbb1..b902d0dbff 100644 --- a/annotations/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java +++ b/core/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * diff --git a/annotations/src/main/java/org/hibernate/cfg/CopyIdentifierComponentSecondPass.java b/core/src/main/java/org/hibernate/cfg/CopyIdentifierComponentSecondPass.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/CopyIdentifierComponentSecondPass.java rename to core/src/main/java/org/hibernate/cfg/CopyIdentifierComponentSecondPass.java diff --git a/annotations/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java b/core/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java rename to core/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java diff --git a/annotations/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java b/core/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java rename to core/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java diff --git a/annotations/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java b/core/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java rename to core/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java diff --git a/annotations/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java b/core/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java rename to core/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java diff --git a/annotations/src/main/java/org/hibernate/cfg/Ejb3Column.java b/core/src/main/java/org/hibernate/cfg/Ejb3Column.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/Ejb3Column.java rename to core/src/main/java/org/hibernate/cfg/Ejb3Column.java diff --git a/annotations/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java b/core/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java rename to core/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java diff --git a/annotations/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java b/core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java rename to core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java diff --git a/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java b/core/src/main/java/org/hibernate/cfg/ExtendedMappings.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java rename to core/src/main/java/org/hibernate/cfg/ExtendedMappings.java diff --git a/annotations/src/main/java/org/hibernate/cfg/FkSecondPass.java b/core/src/main/java/org/hibernate/cfg/FkSecondPass.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/FkSecondPass.java rename to core/src/main/java/org/hibernate/cfg/FkSecondPass.java diff --git a/annotations/src/main/java/org/hibernate/cfg/IndexColumn.java b/core/src/main/java/org/hibernate/cfg/IndexColumn.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/IndexColumn.java rename to core/src/main/java/org/hibernate/cfg/IndexColumn.java diff --git a/annotations/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java b/core/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java rename to core/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java diff --git a/annotations/src/main/java/org/hibernate/cfg/InheritanceState.java b/core/src/main/java/org/hibernate/cfg/InheritanceState.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/InheritanceState.java rename to core/src/main/java/org/hibernate/cfg/InheritanceState.java diff --git a/annotations/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java b/core/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java rename to core/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java diff --git a/annotations/src/main/java/org/hibernate/cfg/NotYetImplementedException.java b/core/src/main/java/org/hibernate/cfg/NotYetImplementedException.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/NotYetImplementedException.java rename to core/src/main/java/org/hibernate/cfg/NotYetImplementedException.java diff --git a/annotations/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java b/core/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java rename to core/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java diff --git a/annotations/src/main/java/org/hibernate/cfg/PkDrivenByDefaultMapsIdSecondPass.java b/core/src/main/java/org/hibernate/cfg/PkDrivenByDefaultMapsIdSecondPass.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/PkDrivenByDefaultMapsIdSecondPass.java rename to core/src/main/java/org/hibernate/cfg/PkDrivenByDefaultMapsIdSecondPass.java diff --git a/annotations/src/main/java/org/hibernate/cfg/PropertyContainer.java b/core/src/main/java/org/hibernate/cfg/PropertyContainer.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/PropertyContainer.java rename to core/src/main/java/org/hibernate/cfg/PropertyContainer.java diff --git a/annotations/src/main/java/org/hibernate/cfg/PropertyData.java b/core/src/main/java/org/hibernate/cfg/PropertyData.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/PropertyData.java rename to core/src/main/java/org/hibernate/cfg/PropertyData.java diff --git a/annotations/src/main/java/org/hibernate/cfg/PropertyHolder.java b/core/src/main/java/org/hibernate/cfg/PropertyHolder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/PropertyHolder.java rename to core/src/main/java/org/hibernate/cfg/PropertyHolder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java b/core/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java rename to core/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/PropertyInferredData.java b/core/src/main/java/org/hibernate/cfg/PropertyInferredData.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/PropertyInferredData.java rename to core/src/main/java/org/hibernate/cfg/PropertyInferredData.java diff --git a/annotations/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java b/core/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java rename to core/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java diff --git a/annotations/src/main/java/org/hibernate/cfg/RecoverableException.java b/core/src/main/java/org/hibernate/cfg/RecoverableException.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/RecoverableException.java rename to core/src/main/java/org/hibernate/cfg/RecoverableException.java diff --git a/annotations/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java b/core/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java rename to core/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java diff --git a/annotations/src/main/java/org/hibernate/cfg/SetSimpleValueTypeSecondPass.java b/core/src/main/java/org/hibernate/cfg/SetSimpleValueTypeSecondPass.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/SetSimpleValueTypeSecondPass.java rename to core/src/main/java/org/hibernate/cfg/SetSimpleValueTypeSecondPass.java diff --git a/annotations/src/main/java/org/hibernate/cfg/ToOneBinder.java b/core/src/main/java/org/hibernate/cfg/ToOneBinder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/ToOneBinder.java rename to core/src/main/java/org/hibernate/cfg/ToOneBinder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java b/core/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java rename to core/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java diff --git a/annotations/src/main/java/org/hibernate/cfg/UniqueConstraintHolder.java b/core/src/main/java/org/hibernate/cfg/UniqueConstraintHolder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/UniqueConstraintHolder.java rename to core/src/main/java/org/hibernate/cfg/UniqueConstraintHolder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java b/core/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java rename to core/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java diff --git a/annotations/src/main/java/org/hibernate/cfg/WrappedInferredData.java b/core/src/main/java/org/hibernate/cfg/WrappedInferredData.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/WrappedInferredData.java rename to core/src/main/java/org/hibernate/cfg/WrappedInferredData.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java b/core/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java rename to core/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/BagBinder.java b/core/src/main/java/org/hibernate/cfg/annotations/BagBinder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/BagBinder.java rename to core/src/main/java/org/hibernate/cfg/annotations/BagBinder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java b/core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java rename to core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/CustomizableColumns.java b/core/src/main/java/org/hibernate/cfg/annotations/CustomizableColumns.java similarity index 95% rename from annotations/src/main/java/org/hibernate/cfg/annotations/CustomizableColumns.java rename to core/src/main/java/org/hibernate/cfg/annotations/CustomizableColumns.java index 3763e98a1a..555355921d 100644 --- a/annotations/src/main/java/org/hibernate/cfg/annotations/CustomizableColumns.java +++ b/core/src/main/java/org/hibernate/cfg/annotations/CustomizableColumns.java @@ -1,7 +1,6 @@ package org.hibernate.cfg.annotations; import java.lang.annotation.Annotation; -import java.util.ArrayList; import javax.persistence.Column; import org.hibernate.annotations.Columns; diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java b/core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java rename to core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java b/core/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java rename to core/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/ListBinder.java b/core/src/main/java/org/hibernate/cfg/annotations/ListBinder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/ListBinder.java rename to core/src/main/java/org/hibernate/cfg/annotations/ListBinder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/MapBinder.java b/core/src/main/java/org/hibernate/cfg/annotations/MapBinder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/MapBinder.java rename to core/src/main/java/org/hibernate/cfg/annotations/MapBinder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/MapKeyColumnDelegator.java b/core/src/main/java/org/hibernate/cfg/annotations/MapKeyColumnDelegator.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/MapKeyColumnDelegator.java rename to core/src/main/java/org/hibernate/cfg/annotations/MapKeyColumnDelegator.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/MapKeyJoinColumnDelegator.java b/core/src/main/java/org/hibernate/cfg/annotations/MapKeyJoinColumnDelegator.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/MapKeyJoinColumnDelegator.java rename to core/src/main/java/org/hibernate/cfg/annotations/MapKeyJoinColumnDelegator.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/Nullability.java b/core/src/main/java/org/hibernate/cfg/annotations/Nullability.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/Nullability.java rename to core/src/main/java/org/hibernate/cfg/annotations/Nullability.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java b/core/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java rename to core/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java b/core/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java rename to core/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java b/core/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java rename to core/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java b/core/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java rename to core/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/SetBinder.java b/core/src/main/java/org/hibernate/cfg/annotations/SetBinder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/SetBinder.java rename to core/src/main/java/org/hibernate/cfg/annotations/SetBinder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java b/core/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java similarity index 99% rename from annotations/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java rename to core/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java index 78ce506038..5d404b43f6 100644 --- a/annotations/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java +++ b/core/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java @@ -154,8 +154,7 @@ public class SimpleValueBinder { + StringHelper.qualify( persistentClassName, propertyName ) ); } - break; - case TIMESTAMP: + break; case TIMESTAMP: type = isDate ? "timestamp" : "calendar"; break; default: diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/TableBinder.java b/core/src/main/java/org/hibernate/cfg/annotations/TableBinder.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/TableBinder.java rename to core/src/main/java/org/hibernate/cfg/annotations/TableBinder.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/Version.java b/core/src/main/java/org/hibernate/cfg/annotations/Version.java similarity index 80% rename from annotations/src/main/java/org/hibernate/cfg/annotations/Version.java rename to core/src/main/java/org/hibernate/cfg/annotations/Version.java index 8f9a096b9f..5fd1fc41c7 100644 --- a/annotations/src/main/java/org/hibernate/cfg/annotations/Version.java +++ b/core/src/main/java/org/hibernate/cfg/annotations/Version.java @@ -24,23 +24,14 @@ */ package org.hibernate.cfg.annotations; -import java.util.Date; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * @author Emmanuel Bernard + * @deprecated Use {@link org.hibernate.Version} instead */ +@Deprecated public class Version { - private static Logger log = LoggerFactory.getLogger( Version.class ); - public static String getVersionString() { - return "[WORKING]-1"; - } - - static { - log.info( "Hibernate Annotations {}", getVersionString() ); + return org.hibernate.Version.getVersionString(); } public static void touch() { diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/JPAMetadataProvider.java b/core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAMetadataProvider.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/reflection/JPAMetadataProvider.java rename to core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAMetadataProvider.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java b/core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java rename to core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java diff --git a/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java b/core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java similarity index 97% rename from annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java rename to core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java index bc1c9e50ae..1461bd8eb3 100644 --- a/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java +++ b/core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * diff --git a/annotations/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java b/core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java rename to core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java diff --git a/annotations/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java b/core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java rename to core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java diff --git a/annotations/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java b/core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java rename to core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java diff --git a/annotations/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java b/core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java rename to core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java diff --git a/annotations/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java b/core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java rename to core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java diff --git a/annotations/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java b/core/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java similarity index 100% rename from annotations/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java rename to core/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java diff --git a/annotations/src/main/java/org/hibernate/mapping/IdGenerator.java b/core/src/main/java/org/hibernate/mapping/IdGenerator.java similarity index 100% rename from annotations/src/main/java/org/hibernate/mapping/IdGenerator.java rename to core/src/main/java/org/hibernate/mapping/IdGenerator.java diff --git a/annotations/src/main/java/org/hibernate/mapping/SyntheticProperty.java b/core/src/main/java/org/hibernate/mapping/SyntheticProperty.java similarity index 100% rename from annotations/src/main/java/org/hibernate/mapping/SyntheticProperty.java rename to core/src/main/java/org/hibernate/mapping/SyntheticProperty.java diff --git a/annotations/src/main/java/org/hibernate/type/AbstractLobType.java b/core/src/main/java/org/hibernate/type/AbstractLobType.java similarity index 99% rename from annotations/src/main/java/org/hibernate/type/AbstractLobType.java rename to core/src/main/java/org/hibernate/type/AbstractLobType.java index 67d54f3e14..332ed75483 100644 --- a/annotations/src/main/java/org/hibernate/type/AbstractLobType.java +++ b/core/src/main/java/org/hibernate/type/AbstractLobType.java @@ -36,7 +36,9 @@ import org.hibernate.engine.SessionImplementor; /** * @author Emmanuel Bernard + * @deprecated */ +@Deprecated public abstract class AbstractLobType extends AbstractType implements Serializable { public boolean isDirty(Object old, Object current, boolean[] checkable, SessionImplementor session) throws HibernateException { diff --git a/annotations/src/main/java/org/hibernate/type/ByteArrayBlobType.java b/core/src/main/java/org/hibernate/type/ByteArrayBlobType.java similarity index 96% rename from annotations/src/main/java/org/hibernate/type/ByteArrayBlobType.java rename to core/src/main/java/org/hibernate/type/ByteArrayBlobType.java index 2373d64a94..151db46dc3 100644 --- a/annotations/src/main/java/org/hibernate/type/ByteArrayBlobType.java +++ b/core/src/main/java/org/hibernate/type/ByteArrayBlobType.java @@ -1,10 +1,10 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as * indicated by the @author tags or express copyright attribution * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * distributed under license by Red Hat Inc. * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU @@ -44,9 +44,8 @@ import org.hibernate.util.ArrayHelper; * Map a Byte[] into a Blob * Experimental * - * @deprecated replaced by Hibernate Core's {@link org.hibernate.type.WrappedMaterializedBlobType} - * * @author Emmanuel Bernard + * @deprecated replaced by {@link org.hibernate.type.WrappedMaterializedBlobType} */ @Deprecated public class ByteArrayBlobType extends AbstractLobType { diff --git a/core/src/main/java/org/hibernate/type/CharacterArrayClobType.java b/core/src/main/java/org/hibernate/type/CharacterArrayClobType.java new file mode 100644 index 0000000000..649135dd3e --- /dev/null +++ b/core/src/main/java/org/hibernate/type/CharacterArrayClobType.java @@ -0,0 +1,49 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.type; + +import org.hibernate.type.descriptor.java.CharacterArrayTypeDescriptor; +import org.hibernate.type.descriptor.sql.ClobTypeDescriptor; + +/** + * A type that maps between {@link java.sql.Types#CLOB CLOB} and {@link Character Character[]} + *

+ * Essentially a {@link MaterializedClobType} but represented as a Character[] in Java rather than String. + * + * @author Emmanuel Bernard + * @author Steve Ebersole + */ +public class CharacterArrayClobType extends AbstractSingleColumnStandardBasicType { + public static final CharacterArrayClobType INSTANCE = new CharacterArrayClobType(); + + public CharacterArrayClobType() { + super( ClobTypeDescriptor.INSTANCE, CharacterArrayTypeDescriptor.INSTANCE ); + } + + public String getName() { + // todo name these annotation types for addition to the registry + return null; + } + +} diff --git a/annotations/src/main/java/org/hibernate/type/EnumType.java b/core/src/main/java/org/hibernate/type/EnumType.java similarity index 100% rename from annotations/src/main/java/org/hibernate/type/EnumType.java rename to core/src/main/java/org/hibernate/type/EnumType.java diff --git a/annotations/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java b/core/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java similarity index 84% rename from annotations/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java rename to core/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java index c01eba1095..72a7ff3049 100644 --- a/annotations/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java +++ b/core/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java @@ -1,10 +1,10 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as * indicated by the @author tags or express copyright attribution * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * distributed under license by Red Hat Inc. * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU @@ -25,9 +25,9 @@ package org.hibernate.type; /** * Map a byte[] to a Blob - * @deprecated replaced by Hibernate Core's {@link org.hibernate.type.MaterializedBlobType} - * + * * @author Emmanuel Bernard + * @deprecated replaced by {@link org.hibernate.type.MaterializedBlobType} */ @Deprecated public class PrimitiveByteArrayBlobType extends ByteArrayBlobType { diff --git a/annotations/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java b/core/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java similarity index 60% rename from annotations/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java rename to core/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java index 4076d1ff80..d21bb1e498 100644 --- a/annotations/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java +++ b/core/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java @@ -1,10 +1,10 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as * indicated by the @author tags or express copyright attribution * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * distributed under license by Red Hat Inc. * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU @@ -23,14 +23,23 @@ */ package org.hibernate.type; +import org.hibernate.type.descriptor.java.PrimitiveCharacterArrayTypeDescriptor; +import org.hibernate.type.descriptor.sql.ClobTypeDescriptor; /** * Map a char[] to a Clob * * @author Emmanuel Bernard */ -public class PrimitiveCharacterArrayClobType extends CharacterArrayClobType { - public Class returnedClass() { - return char[].class; +public class PrimitiveCharacterArrayClobType extends AbstractSingleColumnStandardBasicType { + public static final CharacterArrayClobType INSTANCE = new CharacterArrayClobType(); + + public PrimitiveCharacterArrayClobType() { + super( ClobTypeDescriptor.INSTANCE, PrimitiveCharacterArrayTypeDescriptor.INSTANCE ); + } + + public String getName() { + // todo name these annotation types for addition to the registry + return null; } } diff --git a/annotations/src/main/java/org/hibernate/type/SerializableToBlobType.java b/core/src/main/java/org/hibernate/type/SerializableToBlobType.java similarity index 100% rename from annotations/src/main/java/org/hibernate/type/SerializableToBlobType.java rename to core/src/main/java/org/hibernate/type/SerializableToBlobType.java diff --git a/annotations/src/main/java/org/hibernate/type/StringClobType.java b/core/src/main/java/org/hibernate/type/StringClobType.java similarity index 93% rename from annotations/src/main/java/org/hibernate/type/StringClobType.java rename to core/src/main/java/org/hibernate/type/StringClobType.java index 861de1ec92..6926186538 100644 --- a/annotations/src/main/java/org/hibernate/type/StringClobType.java +++ b/core/src/main/java/org/hibernate/type/StringClobType.java @@ -1,10 +1,10 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as * indicated by the @author tags or express copyright attribution * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * distributed under license by Red Hat Inc. * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU @@ -37,9 +37,9 @@ import org.hibernate.usertype.UserType; /** * Map a String to a Clob - * @deprecated replaced by Hibernate Core's {@link org.hibernate.type.MaterializedClobType} - * + * * @author Emmanuel Bernard + * @deprecated replaced by {@link org.hibernate.type.MaterializedClobType} */ @Deprecated public class StringClobType implements UserType, Serializable { diff --git a/annotations/src/main/java/org/hibernate/type/WrappedMaterializedBlobType.java b/core/src/main/java/org/hibernate/type/WrappedMaterializedBlobType.java similarity index 100% rename from annotations/src/main/java/org/hibernate/type/WrappedMaterializedBlobType.java rename to core/src/main/java/org/hibernate/type/WrappedMaterializedBlobType.java diff --git a/annotations/src/main/resources/org/hibernate/ejb/orm_1_0.xsd b/core/src/main/resources/org/hibernate/ejb/orm_1_0.xsd similarity index 100% rename from annotations/src/main/resources/org/hibernate/ejb/orm_1_0.xsd rename to core/src/main/resources/org/hibernate/ejb/orm_1_0.xsd diff --git a/annotations/src/main/resources/org/hibernate/ejb/orm_2_0.xsd b/core/src/main/resources/org/hibernate/ejb/orm_2_0.xsd similarity index 100% rename from annotations/src/main/resources/org/hibernate/ejb/orm_2_0.xsd rename to core/src/main/resources/org/hibernate/ejb/orm_2_0.xsd diff --git a/distribution/pom.xml b/distribution/pom.xml index 0a9dd32204..b2614ac0b8 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -57,7 +57,6 @@ hibernate-core ${project.version} - - ${project.groupId} - hibernate-jmx - ${project.version} - ${project.groupId} hibernate-ehcache @@ -240,11 +234,6 @@ hibernate-proxool ${project.version} - - ${project.groupId} - hibernate-annotations - ${project.version} - ${project.groupId} hibernate-entitymanager diff --git a/entitymanager/pom.xml b/entitymanager/pom.xml index cc5d63f27a..0fe76a9c42 100644 --- a/entitymanager/pom.xml +++ b/entitymanager/pom.xml @@ -23,11 +23,6 @@ hibernate-core ${project.version} - - ${project.groupId} - hibernate-annotations - ${project.version} - cglib cglib diff --git a/envers/pom.xml b/envers/pom.xml index 283f648050..a5360e9373 100644 --- a/envers/pom.xml +++ b/envers/pom.xml @@ -76,10 +76,6 @@ org.hibernate hibernate-commons-annotations - - org.hibernate - hibernate-annotations - org.hibernate hibernate-entitymanager